polserver-commits

[Polserver-commits] SF.net SVN: polserver:[400] trunk/pol-core/pol/uobject.cpp

[<ds...@us...>]

Revision: 400
          http://polserver.svn.sourceforge.net/polserver/?rev=400&view=rev
Author:   dsourc
Date:     2011-12-02 15:07:26 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
1 more fix for graphic problem

Modified Paths:
--------------
    trunk/pol-core/pol/uobject.cpp

Modified: trunk/pol-core/pol/uobject.cpp
===================================================================
--- trunk/pol-core/pol/uobject.cpp	2011-12-02 14:43:28 UTC (rev 399)
+++ trunk/pol-core/pol/uobject.cpp	2011-12-02 15:07:26 UTC (rev 400)
@@ -271,7 +271,7 @@
     name_ = elem.remove_string( "NAME", "" );
 
     // serial, objtype extracted by caller
-    u16 graphic = elem.remove_ushort( "GRAPHIC", static_cast<u16>(objtype_) );
+    graphic = elem.remove_ushort( "GRAPHIC", static_cast<u16>(objtype_) );
     if (graphic > (config.max_tile_id))
         graphic = GRAPHIC_NODRAW;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Polserver-commits] SF.net SVN: polserver:[580] trunk/pol-core/pol/uobject.cpp

[<tu...@us...>]

Revision: 580
          http://polserver.svn.sourceforge.net/polserver/?rev=580&view=rev
Author:   turley
Date:     2012-10-01 17:44:39 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
Secured realm property read during worldload

Modified Paths:
--------------
    trunk/pol-core/pol/uobject.cpp

Modified: trunk/pol-core/pol/uobject.cpp
===================================================================
--- trunk/pol-core/pol/uobject.cpp	2012-09-29 11:10:32 UTC (rev 579)
+++ trunk/pol-core/pol/uobject.cpp	2012-10-01 17:44:39 UTC (rev 580)
@@ -280,7 +280,14 @@
     color = elem.remove_ushort( "COLOR", 0 );
    
 
-	realm = find_realm( elem.remove_string("Realm", "britannia") );
+	string realmstr = elem.remove_string("Realm", "britannia");
+	realm = find_realm( realmstr );
+	if (!realm)
+	{
+		cerr << classname() << " '" << name() << "' (0x" << hex << serial << dec << "): "
+			<< "has an invalid realm property '" << realmstr << "'." << endl;
+		throw runtime_error( "Data integrity error" );
+	}
     x = elem.remove_ushort( "X" );
 	y = elem.remove_ushort( "Y" );
 	z = static_cast<s8>(elem.remove_int( "Z" ));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Polserver-commits] SF.net SVN: polserver:[690] trunk/pol-core/pol/uobject.cpp

[<roz...@us...>]

Revision: 690
          http://sourceforge.net/p/polserver/code/690
Author:   rozenblit
Date:     2013-09-21 23:16:41 +0000 (Sat, 21 Sep 2013)
Log Message:
-----------
Who thinks CProps are important? Ooops... better save them :D

Modified Paths:
--------------
    trunk/pol-core/pol/uobject.cpp

Modified: trunk/pol-core/pol/uobject.cpp
===================================================================
--- trunk/pol-core/pol/uobject.cpp	2013-09-21 21:37:14 UTC (rev 689)
+++ trunk/pol-core/pol/uobject.cpp	2013-09-21 23:16:41 UTC (rev 690)
@@ -261,15 +261,14 @@
 		writer << "\tRealm\tbritannia" << pf_endl;
 	else
 		writer << "\tRealm\t" << realm->name() << pf_endl;
+
+   proplist_.printProperties(writer);
 }
 
 void UObject::printProperties( ostream& os ) const
 {
    fmt::Writer writer;
-
-   this->printProperties(writer);
-   proplist_.printProperties(writer);
-
+   printProperties(writer);
    os << writer.c_str();
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Polserver-commits] SF.net SVN: polserver:[822] trunk/pol-core/pol/uobject.cpp

[<tu...@us...>]

Revision: 822
          http://sourceforge.net/p/polserver/code/822
Author:   turley
Date:     2014-06-14 08:28:30 +0000 (Sat, 14 Jun 2014)
Log Message:
-----------
made compiler happy

Modified Paths:
--------------
    trunk/pol-core/pol/uobject.cpp

Modified: trunk/pol-core/pol/uobject.cpp
===================================================================
--- trunk/pol-core/pol/uobject.cpp	2014-06-14 08:23:53 UTC (rev 821)
+++ trunk/pol-core/pol/uobject.cpp	2014-06-14 08:28:30 UTC (rev 822)
@@ -112,10 +112,7 @@
     size_t UObject::estimatedSize() const
     {
       size_t size = sizeof(UObject) + name_.capacity() + proplist_.estimatedSize();
-      for ( const auto& prop : dynmap )
-      {
-        size += sizeof(unsigned short)+sizeof( boost::any ) * 2 + ( sizeof(void*)* 3 + 1 ) / 2;
-      }
+      size += dynmap.size() * (sizeof( unsigned short ) + sizeof( boost::any ) * 2 + ( sizeof(void*)* 3 + 1 ) / 2);
       return size;
     }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.