Changeset 5819 in orxonox.OLD for trunk/src/util

Timestamp:

Nov 29, 2005, 11:07:43 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches world_entities to trunk again
merged with command
svn merge -r5795:HEAD branches/world_entities/ trunk/
no conflicts (what a wonder)

Location:

trunk/src/util/loading

Files:

• game_loader.cc (modified) (1 diff)
• game_loader.h (modified) (1 diff)

trunk/src/util/loading/game_loader.cc

@@ -357 +357 @@
     }
 
-  PRINTF(2)("Fabricate failed, TiXmlElement did not contain a value\n");
+  PRINTF(2)("Fabricate failed, TiElement did not contain a value\n");
 
   return NULL;

trunk/src/util/loading/game_loader.h

@@ -12 +12 @@
 #include "event_listener.h"
 
+#include "error.h"
 
 //-----------------------------------------------------------------------------