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

Timestamp:

Jan 11, 2006, 9:58:22 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the network branche into the trunk

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (1 diff)
• game_world.h (modified) (2 diffs)
• multi_player_world.cc (modified) (3 diffs)
• multi_player_world.h (modified) (1 diff)
• multi_player_world_data.cc (modified) (5 diffs)
• multi_player_world_data.h (modified) (2 diffs)

trunk/src/story_entities/game_world.cc

@@ -131 +131 @@
   this->shell = new Shell();
 
+  State::setCurrentStoryEntity(dynamic_cast<StoryEntity*>(this));
   this->dataTank->init();
 }

trunk/src/story_entities/game_world.h

@@ -9 +9 @@
 
 #include "story_entity.h"
-
+#include "game_world_data.h"
 
 class TiXmlElement;
@@ -56 +56 @@
 
 
+    inline void setSky(WorldEntity* sky) { this->dataTank->sky = sky; }
+
+
   protected:
     /* world - running functions */

trunk/src/story_entities/multi_player_world.cc

@@ -21 +21 @@
 #include "factory.h"
 #include "load_param.h"
+#include "shell_command.h"
 
 #include "network_manager.h"
@@ -26 +27 @@
 
 using namespace std;
+
+
+//! Register a command to print some multiplayer world infos
+SHELL_COMMAND(debug, MultiPlayerWorld, debug);
 
 
@@ -79 +84 @@
 }
 
+
+/**
+ * some debug ouptut - shell command
+ */
+void MultiPlayerWorld::debug()
+{
+  ((MultiPlayerWorldData*)this->dataTank)->debug();
+}

trunk/src/story_entities/multi_player_world.h

@@ -27 +27 @@
   void loadParams(const TiXmlElement* root);
 
+  void debug();
+
   protected:
     virtual void synchronize();

trunk/src/story_entities/multi_player_world_data.cc

@@ -50 +50 @@
 
 
+
 using namespace std;
 
@@ -58 +59 @@
 MultiPlayerWorldData::MultiPlayerWorldData()
     : GameWorldData()
-{}
+{
+  this->toggle = false;
+}
 
 
@@ -157 +160 @@
         }
       }
-      /* clients only spawn the SpaceShip */
-      /// FIXME it is not said to be a SpaceShip
-      else if( !strcmp( element->Value(), "SpaceShip"))
-      {
-        BaseObject* created = Factory::fabricate(element);
-        if( created != NULL )
-          PRINTF(1)("Created a %s: %s (%8.u)\n", created->getClassName(), created->getName(), created->getLeafClassID());
-        else
-          PRINTF(1)("NetworkWorld: could not create this entity\n");
-      }
       element = element->NextSiblingElement();
+
 
       glmis->step();
@@ -173 +167 @@
     }
 
-
-    /* create a Player */
-    this->localPlayer = new Player();
-    Playable* playable;
-    const list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
-    if (playableList != NULL)
-    {
-      playable = dynamic_cast<Playable*>(playableList->front());
-      this->localPlayer->setControllable(playable);
+    if( NetworkManager::getInstance()->isGameServer())
+    {
+      this->localPlayer = new Player();
+      State::setPlayer(this->localPlayer);
+
+      Playable* playable;
+      const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
+      assert( playableList != NULL);
+
+      if (playableList != NULL)
+      {
+        playable = dynamic_cast<Playable*>(playableList->front());
+        this->localPlayer->setControllable(playable);
+      }
+    }
+    else
+    {
+      /* create a Player */
+      this->localPlayer = new Player();
+      State::setPlayer(this->localPlayer);
     }
 
@@ -221 +226 @@
 }
 
+
+/**
+ * some debug output
+ */
+void MultiPlayerWorldData::debug()
+{
+  PRINT(0)("==================================================\n");
+  Playable* playable;
+  const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
+  assert(playableList != NULL);
+  std::list<BaseObject*>::const_iterator entity;
+
+
+
+  for (entity = playableList->begin(); entity != playableList->end(); entity++)
+  {
+    Playable* p = dynamic_cast<Playable*>(*entity);
+    PRINTF(0)("Got a playable, class: %s, name: %s, uid: %i\n", (*entity)->getClassName(), (*entity)->getName(), p->getUniqueID());
+  }
+
+
+  if( this->toggle)
+  {
+    playable = dynamic_cast<Playable*>(playableList->front());
+    this->localPlayer->disconnectControllable();
+    this->localPlayer->setControllable(playable);
+    this->toggle = !this->toggle;
+  }
+  else
+  {
+    playable = dynamic_cast<Playable*>(playableList->back());
+    this->localPlayer->disconnectControllable();
+    this->localPlayer->setControllable(playable);
+    this->toggle = !this->toggle;
+  }
+
+
+
+  PNode* cam = State::getCameraTarget();
+  PRINT(0)("Camera has target - class: %s, name: %s, uid: %i\n", cam->getClassName(), cam->getName(), cam->getUniqueID());
+
+  PRINT(0)("==================================================\n");
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/story_entities/multi_player_world_data.h

@@ -24 +24 @@
     virtual ErrorMessage init();
 
+    void debug();
+
 
   protected:
@@ -33 +35 @@
     virtual ErrorMessage unloadWorldEntities();
     virtual ErrorMessage unloadScene();
+
+  private:
+    bool toggle;
 };