Changeset 3746 in orxonox.OLD for orxonox/branches/levelloader/src/defs

Timestamp:

Apr 7, 2005, 3:54:49 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Merged trunk into branch… still not working though…

Location:

orxonox/branches/levelloader/src/defs

Files:

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

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

@@ -59 +59 @@
 #define DEBUG_MODULE_ORXONOX            0
 #define DEBUG_MODULE_WORLD              0
-#define DEBUG_MODULE_PNODE              2
+#define DEBUG_MODULE_PNODE              3
 #define DEBUG_MODULE_WORLD_ENTITY       0
 #define DEBUG_MODULE_COMMAND_NODE       0
+#define DEBUG_MODULE_GRAPHICS           0
+#define DEBUG_MODULE_LOAD               0
 
 #define DEBUG_MODULE_IMPORTER           0
 #define DEBUG_MODULE_TRACK_MANAGER      0
-#define DEBUG_MODULE_LIGHT              3
-#define DEBUG_MODULE_PLAYER             0
+#define DEBUG_MODULE_GARBAGE_COLLECTOR  0
+#define DEBUG_MODULE_LIGHT              0
+#define DEBUG_MODULE_PLAYER             3
 #define DEBUG_MODULE_MATH               0
 

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

@@ -9 +9 @@
 #define _STDINCL_H
                 
-#define null 0   //!< null
-
 typedef unsigned char byte;
 
@@ -23 +21 @@
 
 #include <assert.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28 +27 @@
 #include "glincl.h"
 
-#include "error.h"
-#include "debug.h"
 
 // MATH //
@@ -39 +36 @@
 #include "list_template.h"
 #include "message_structures.h"
-#include "orxonox.h"
 #include "data_tank.h"
 #include "base_object.h"
 #include "factory.h"
+#include "debug.h"
 
 #define CREATE_FACTORY(x) \