Changeset 9656 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

Location:

trunk/src/story_entities

Files:

• menu/game_menu.cc (modified) (1 diff)
• multi_player_world.cc (modified) (1 diff)

trunk/src/story_entities/menu/game_menu.cc

@@ -76 +76 @@
   if( this->dataTank)
     delete this->dataTank;
-  delete OrxGui::GLGuiHandler::getInstance( );
+  OrxGui::GLGuiHandler::deleteInstance( );
 }
 

trunk/src/story_entities/multi_player_world.cc

@@ -63 +63 @@
   if( this->dataTank)
     delete this->dataTank;
-  delete OrxGui::GLGuiHandler::getInstance( );
+  OrxGui::GLGuiHandler::deleteInstance( );
 }