Changeset 4217 in orxonox.OLD for orxonox/branches/movie_player/src/defs

Timestamp:

May 18, 2005, 11:27:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/movie_player: merged the trunk back into the movie_player
merged with command:
svn merge -r 4014:HEAD ../trunk/ movie_player/
no conflicts

Location:

orxonox/branches/movie_player/src/defs

Files:

• debug.h (modified) (1 diff)
• globals.h (copied) (copied from orxonox/trunk/src/defs/globals.h)
• stdincl.h (modified) (1 diff)

orxonox/branches/movie_player/src/defs/debug.h

@@ -59 +59 @@
 #define DEBUG_MODULE_PNODE              1
 #define DEBUG_MODULE_WORLD_ENTITY       0
-#define DEBUG_MODULE_COMMAND_NODE       0
+#define DEBUG_MODULE_COMMAND_NODE       4
 #define DEBUG_MODULE_GRAPHICS           0
-#define DEBUG_MODULE_LOAD               0
+#define DEBUG_MODULE_LOAD               2
 
 #define DEBUG_MODULE_IMPORTER           3

orxonox/branches/movie_player/src/defs/stdincl.h

@@ -25 +25 @@
 #include "error.h"
 #include "debug.h"
+#include "globals.h"
 
 #include "compiler.h"