[Planeshift-cvs] SF.net SVN: planeshift: [1488] stable/src

[<mg...@us...>]

Revision: 1488
          http://planeshift.svn.sourceforge.net/planeshift/?rev=1488&view=rev
Author:   mgist
Date:     2008-05-09 15:38:20 -0700 (Fri, 09 May 2008)

Log Message:
-----------
- Merged r1487 from trunk.

Modified Paths:
--------------
    stable/src/common/util/psxmlparser.cpp
    stable/src/server/bulkobjects/pscharacter.h
    stable/src/server/entitymanager.cpp

Modified: stable/src/common/util/psxmlparser.cpp
===================================================================
--- stable/src/common/util/psxmlparser.cpp	2008-05-09 22:37:05 UTC (rev 1487)
+++ stable/src/common/util/psxmlparser.cpp	2008-05-09 22:38:20 UTC (rev 1488)
@@ -306,7 +306,7 @@
     const char* error = doc->Parse(str);
     if ( error )
     {
-        Error3("Error in XML: %s\nString was: %s", error, str.GetData() );
+        Error3("Error in XML: %s\nString was: %s", error, str.GetDataSafe() );
         return NULL;
     }
     return doc;

Modified: stable/src/server/bulkobjects/pscharacter.h
===================================================================
--- stable/src/server/bulkobjects/pscharacter.h	2008-05-09 22:37:05 UTC (rev 1487)
+++ stable/src/server/bulkobjects/pscharacter.h	2008-05-09 22:38:20 UTC (rev 1488)
@@ -953,7 +953,7 @@
     bool IsPet() { return characterType == PSCHARACTER_TYPE_PET; };
     int GetFamiliarID() { return familiar_id; };
     void SetFamiliarID(int v);
-    const char *GetAnimalAffinity() { return animal_affinity.GetData(); };
+    const char *GetAnimalAffinity() { return animal_affinity.GetDataSafe(); };
     void SetAnimialAffinity( const char* v ) { animal_affinity = v; };
     int GetOwnerID() { return owner_id; };
     void SetOwnerID(int v) { owner_id = v; };

Modified: stable/src/server/entitymanager.cpp
===================================================================
--- stable/src/server/entitymanager.cpp	2008-05-09 22:37:05 UTC (rev 1487)
+++ stable/src/server/entitymanager.cpp	2008-05-09 22:38:20 UTC (rev 1488)
@@ -392,8 +392,8 @@
 
     if(!xmlDoc)
     {
-      csString msg;
-      msg.Format("Error parsing animal affinity for character %s!\n", charData->fullname.GetData());
+      csString msg("Error parsing animal affinity for character ");
+      msg.AppendFmt("%s!\n", charData->fullname.GetData());
       CS_ASSERT_MSG(msg.GetData(), xmlDoc != NULL);
     }
 	


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