Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/orxonox.cc

Timestamp:

Mar 18, 2005, 11:52:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/orxonox.cc (modified) (3 diffs)

orxonox/branches/levelloader/src/orxonox.cc

@@ -31 +31 @@
 #include "game_loader.h"
 #include <string.h>
-int verbose;
+int verbose = 4;
 
 using namespace std;
@@ -54 +54 @@
   if( resources != NULL) delete resources;
 }
-
 
 /** \brief this is a singleton class to prevent duplicates */
@@ -173 +172 @@
   // SDL_WM_SetIcon(SDL_Surface *icon, Uint8 *mask);  
 
-  // OpenGL stuff
-  glClearColor (0.0, 0.0, 0.0, 0.0);
-  glEnable (GL_DEPTH_TEST);
-   
   return 0;
 }