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

Timestamp:

Jul 4, 2006, 11:18:41 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Presentation back

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (2 diffs)
• menu/game_menu.cc (modified) (5 diffs)
• multi_player_world.cc (modified) (2 diffs)

trunk/src/story_entities/game_world.cc

@@ -64 +64 @@
 using namespace std;
 
+#include "script_class.h"
+CREATE_SCRIPTABLE_CLASS(GameWorld, CL_GAME_WORLD,
+                        addMethod("setPlaymode", ExecutorLua1<GameWorld,const std::string&>(&GameWorld::setPlaymode))
+                       );
 
 SHELL_COMMAND(speed, GameWorld, setSpeed) ->describe("set the Speed of the Level");
@@ -336 +340 @@
       this->dataTank->localPlayer->getPlayable()->setPlaymode(playmode))
   {
-    PRINTF(3)("Set Playmode to %d:%s\n", playmode, Playable::playmodeToString(playmode).c_str());
+    PRINTF(4)("Set Playmode to %d:%s\n", playmode, Playable::playmodeToString(playmode).c_str());
   }
   else
   {
-    PRINTF(1)("Unable to set Playmode %d:'%s'\n", playmode, Playable::playmodeToString(playmode).c_str());
+    PRINTF(2)("Unable to set Playmode %d:'%s'\n", playmode, Playable::playmodeToString(playmode).c_str());
   }
 }

trunk/src/story_entities/menu/game_menu.cc

@@ -236 +236 @@
   if (this->networkBox == NULL)
   {
-    this->networkBox = new OrxGui::GLGuiBox();
+    this->networkBox = new OrxGui::GLGuiBox( OrxGui::Horizontal );
     {
+      OrxGui::GLGuiBox * box = new OrxGui::GLGuiBox();
+      
       OrxGui::GLGuiButton* clientButton = new OrxGui::GLGuiPushButton("Client");
-      networkBox->pack(clientButton);
+      box->pack(clientButton);
       clientButton->connect(SIGNAL(clientButton, released), this, SLOT(GameMenu, showClientMenu));
 
       OrxGui::GLGuiButton* serverButton = new OrxGui::GLGuiPushButton("Server");
-      networkBox->pack(serverButton);
+      box->pack(serverButton);
       serverButton->connect(SIGNAL(serverButton, released), this, SLOT(GameMenu, showServerMenu));
-
-
+      
+      networkBox->pack( box );
     }
   }
@@ -511 +513 @@
   if ( this->serverNetworkBox )
   {
-    delete this->serverNetworkBox;
-    this->serverNetworkBox = NULL;
+    this->networkBox->unpack( this->serverNetworkBox );
+    this->serverNetworkBox->hideAll();
+    //delete this->serverNetworkBox;
+    //this->serverNetworkBox = NULL;
   }
   
@@ -535 +539 @@
   }
   
+  this->networkBox->pack( this->clientNetworkBox );
+  
   this->clientNetworkBox->showAll();
   
-  this->clientNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
+  //this->clientNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
 }
 
@@ -547 +553 @@
   if ( this->clientNetworkBox )
   {
-    delete this->clientNetworkBox;
-    this->clientNetworkBox = NULL;
+    this->networkBox->unpack( this->clientNetworkBox );
+    this->clientNetworkBox->hideAll();
+    //delete this->clientNetworkBox;
+    //this->clientNetworkBox = NULL;
   }
   
@@ -569 +577 @@
   }
   
+  this->networkBox->pack( this->serverNetworkBox );
+  
   this->serverNetworkBox->showAll();
   
-  this->serverNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
+  //this->serverNetworkBox->setAbsCoor2D( 300.0f, 100.0f );
 }
 

trunk/src/story_entities/multi_player_world.cc

@@ -129 +129 @@
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
     this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
+
+
+
+    // ground collision detection: BSP Model
+  CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_GROUP_00));
+  CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_GROUP_01));
+  CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_PLAYERS));
 }
 
@@ -153 +160 @@
 
   State::setOnline( false );
-  
+
   return ErrorMessage();
 }