Changeset 7338 in orxonox.OLD for trunk/src/world_entities/playable.cc

Timestamp:

Apr 19, 2006, 1:25:07 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: some Playable-stuff

File:

• trunk/src/world_entities/playable.cc (modified) (14 diffs)

trunk/src/world_entities/playable.cc

@@ -39 +39 @@
 
 Playable::Playable()
-  : weaponMan(this)
+    : weaponMan(this),
+    supportedPlaymodes(Playable::Full3D),
+    playmode(Playable::Full3D)
 {
   this->setClassID(CL_PLAYABLE, "Playable");
@@ -90 +92 @@
   this->weaponMan.removeWeapon(weapon);
 
-    this->weaponConfigChanged();
+  this->weaponConfigChanged();
 }
 
@@ -97 +99 @@
 {
   this->weaponMan.nextWeaponConfig();
-    this->weaponConfigChanged();
+  this->weaponConfigChanged();
 }
 
@@ -104 +106 @@
 {
   this->weaponMan.previousWeaponConfig();
-    this->weaponConfigChanged();
+  this->weaponConfigChanged();
 }
 
@@ -119 +121 @@
  */
 void Playable::setCameraMode(unsigned int cameraMode)
-{
-
+{}
+
+/**
+ * @brief sets the Playmode
+ * @param playmode the Playmode
+ * @returns true on success, false otherwise
+ */
+bool Playable::setPlayMode(Playable::Playmode playmode)
+{
+  if (!this->playmodeSupported(playmode))
+    return false;
+  else
+    this->playmode = playmode;
 }
 
@@ -155 +168 @@
   if( this->getOwner() % 2 == 0)
   {
-//     this->toList(OM_GROUP_00);
+    //     this->toList(OM_GROUP_00);
     this->setAbsCoor(213.37, 57.71, -47.98);
     this->setAbsDir(0, 0, 1, 0);
@@ -161 +174 @@
   else
   { // red team
-//     this->toList(OM_GROUP_01);
+    //     this->toList(OM_GROUP_01);
     this->setAbsCoor(-314.450, 40.701, 83.554);
     this->setAbsDir(1.0, -0.015, -0.012, 0.011);
@@ -179 +192 @@
   {
     PRINTF(0)("Playable dies\n");
-  // only if this is the spaceship of the player
+    // only if this is the spaceship of the player
     if (State::isOnline())
     {
@@ -185 +198 @@
         State::getGameRules()->onPlayerDeath();
 
-//     this->toList(OM_GROUP_05);
-  //HACK: moves the entity to an unknown place far far away: in the future, GameRules will look for that
+      //     this->toList(OM_GROUP_05);
+      //HACK: moves the entity to an unknown place far far away: in the future, GameRules will look for that
       this->setAbsCoor(-2000.0, -2000.0, -2000.0);
 
-  //explosion hack
+      //explosion hack
 
     }
@@ -216 +229 @@
     // unsubscibe all events.
     EventHandler* evh = EventHandler::getInstance();
-    std::list<int>::iterator ev;
+    std::vector<int>::iterator ev;
     for (ev = this->events.begin(); ev != events.end(); ev++)
       evh->unsubscribe( ES_GAME, (*ev));
@@ -242 +255 @@
     /*EventHandler*/
     EventHandler* evh = EventHandler::getInstance();
-    std::list<int>::iterator ev;
+    std::vector<int>::iterator ev;
     for (ev = this->events.begin(); ev != events.end(); ev++)
       evh->subscribe(player, ES_GAME, (*ev));
@@ -256 +269 @@
 bool Playable::pickup(PowerUp* powerUp)
 {
-  if(powerUp->isA(CL_WEAPON_POWER_UP)) {
+  if(powerUp->isA(CL_WEAPON_POWER_UP))
+  {
     return dynamic_cast<WeaponPowerUp*>(powerUp)->process(&this->getWeaponManager());
   }
-  else if(powerUp->isA(CL_PARAM_POWER_UP)) {
+  else if(powerUp->isA(CL_PARAM_POWER_UP))
+  {
     ParamPowerUp* ppu = dynamic_cast<ParamPowerUp*>(powerUp);
-    switch(ppu->getType()) {
+    switch(ppu->getType())
+    {
       case POWERUP_PARAM_HEALTH:
         this->increaseHealth(ppu->getValue());
@@ -291 +307 @@
 void Playable::unregisterEvent(int eventType)
 {
-  this->events.remove(eventType);
+  std::vector<int>::iterator rmEvent = std::find(this->events.begin(), this->events.end(), eventType);
+  this->events.erase(rmEvent);
 
   if (this->currentPlayer != NULL)
@@ -338 +355 @@
 
 void  Playable::detachCamera()
-{
-}
+{}
 
 #define DATA_FLAGS    1