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

Timestamp:

Feb 2, 2006, 4:09:46 PM (19 years ago)

Author:

bensch

Message:

trunk: rename of setControllable

Location:

trunk/src/story_entities

Files:

• game_world_data.cc (modified) (1 diff)
• multi_player_world_data.cc (modified) (3 diffs)

trunk/src/story_entities/game_world_data.cc

@@ -230 +230 @@
   {
     playable = dynamic_cast<Playable*>(playableList->front());
-    this->localPlayer->setControllable(playable);
+    this->localPlayer->setPlayable(playable);
   }
 

trunk/src/story_entities/multi_player_world_data.cc

@@ -179 +179 @@
       {
         playable = dynamic_cast<Playable*>(playableList->front());
-        this->localPlayer->setControllable(playable);
+        this->localPlayer->setPlayable(playable);
       }
     }
@@ -250 +250 @@
   {
     playable = dynamic_cast<Playable*>(playableList->front());
-    this->localPlayer->disconnectControllable();
-    this->localPlayer->setControllable(playable);
+    this->localPlayer->disconnectPlayable();
+    this->localPlayer->setPlayable(playable);
     this->toggle = !this->toggle;
   }
@@ -257 +257 @@
   {
     playable = dynamic_cast<Playable*>(playableList->back());
-    this->localPlayer->disconnectControllable();
-    this->localPlayer->setControllable(playable);
+    this->localPlayer->disconnectPlayable();
+    this->localPlayer->setPlayable(playable);
     this->toggle = !this->toggle;
   }
 
 
-  Playable* pl = this->localPlayer->getControllable();
+  Playable* pl = this->localPlayer->getPlayable();
   PRINTF(0)("The current regisered playable is hid: %i\n", pl->getUniqueID());