Changeset 9877 in orxonox.OLD for trunk

Timestamp:

Oct 3, 2006, 3:23:56 PM (18 years ago)

Author:

bensch

Message:

orxonox compiles in Windows again… but it does not run anymore

Location:

trunk/src

Files:

• lib/collision_detection/cd_engine.cc (modified) (1 diff)
• lib/network/network_log.cc (modified) (1 diff)
• util/signal_handler.h (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)

trunk/src/lib/collision_detection/cd_engine.cc

@@ -25 +25 @@
 // #include "player.h"
 
-#include "spatial_separation.h"
+//#include "spatial_separation.h"
 #include "quadtree.h"
-#include "quadtree_node.h"
+//#include "quadtree_node.h"
 
 #include "bsp_manager.h"

trunk/src/lib/network/network_log.cc

@@ -16 +16 @@
 #include "network_log.h"
 #include <cassert>
-
+#include <stdarg.h>
 /**
  *  the singleton reference to this class

trunk/src/util/signal_handler.h

@@ -63 +63 @@
  public:
    inline static SignalHandler* getInstance() { if (!SignalHandler::singletonRef) SignalHandler::singletonRef = new SignalHandler(); return SignalHandler::singletonRef; };
-  void doCatch( std::string appName ) {};
+   void doCatch( const std::string & appName, const std::string & fileName ) {};
   void dontCatch() {};
   void registerCallback( SignalCallback cb, void * someData ) {};

trunk/src/world_entities/terrain.cc

@@ -244 +244 @@
 
   /* THIS IS ONLY FOR DEBUGGING INFORMATION */
-  if (this->ssp != NULL)
-    this->ssp->drawQuadtree();
+  //  if (this->ssp != NULL)
+  //    this->ssp->drawQuadtree();
 }