Changeset 5881 in orxonox.OLD for branches

Timestamp:

Dec 3, 2005, 1:26:03 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/spaceshipcontroll: simple world-interactivity

Location:

branches/spaceshipcontrol/src

Files:

• story_entities/world.cc (modified) (2 diffs)
• world_entities/playable.cc (modified) (2 diffs)
• world_entities/player.cc (modified) (3 diffs)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)

branches/spaceshipcontrol/src/story_entities/world.cc

@@ -316 +316 @@
           if( created != NULL) this->spawn( created);
           // if we load a 'Player' we use it as localPlayer
+
           //todo do this more elegant
-          if( element->Value() != NULL && !strcmp( element->Value(), "Player"))
-          {
-            localPlayer = (Player*) created;
-          }
           if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) sky = (SkyBox*) created;
           if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
@@ -362 +359 @@
   /* GENERIC LOADING PROCESS FINISHED */
 
+
+  // Create a Player
+  this->localPlayer = new Player();
+  list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
+  if (playableList != NULL)
+  {
+    Playable* playable = dynamic_cast<Playable*>(playableList->front());
+    if (playable != NULL)
+      this->localPlayer->setControllable(playable);
+  }
   // bind input
   EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_UP);

branches/spaceshipcontrol/src/world_entities/playable.cc

@@ -15 +15 @@
 
 #include "weapons/weapon_manager.h"
+
 #include "playable.h"
 #include "event_handler.h"
@@ -27 +28 @@
 Playable::~Playable()
 {
-
+  delete this->weaponMan;
 }
 

branches/spaceshipcontrol/src/world_entities/player.cc

@@ -49 +49 @@
   PRINTF(4)("PLAYER INIT\n");
 
+  this->controllable = NULL;
 }
 
@@ -55 +56 @@
 void Player::process(const Event &event)
 {
-  this->controllable->process(event);
+  if (likely(this->controllable != NULL))
+    this->controllable->process(event);
 }
 
@@ -62 +64 @@
  {
 
-   this->controllable = controllable;
+   this->controllable = controllalble;
    this->controllable->subscribeEvents(this);
 

branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc

@@ -40 +40 @@
 SpaceShip::SpaceShip()
 {
-        this->init();
+  this->init();
 }