Changeset 7788 for code/branches/presentation2/src/libraries/network/GamestateHandler.cc

Timestamp:

Dec 21, 2010, 6:09:09 PM (15 years ago)

Author:

scheusso

Message:

merged network5 into presentation2 branch (untested)

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• src/libraries/network/GamestateHandler.cc (modified) (2 diffs)

code/branches/presentation2/src/libraries/network/GamestateHandler.cc

@@ -32 +32 @@
 namespace orxonox {
 
-GamestateHandler *GamestateHandler::instance_=0;
+// GamestateHandler *GamestateHandler::instance_=0;
 
 GamestateHandler::GamestateHandler()
 {
-  assert(instance_==0);
-  instance_=this;
 }
 
@@ -43 +41 @@
 GamestateHandler::~GamestateHandler()
 {
-  instance_=0;
 }