Changeset 3214 for code/trunk/src/orxonox/objects

Timestamp:

Jun 23, 2009, 6:02:25 PM (15 years ago)

Author:

scheusso

Message:

merged netp5 back to trunk

Location:

code/trunk/src/orxonox/objects/worldentities/pawns

Files:

• Pawn.cc (modified) (3 diffs)
• Pawn.h (modified) (1 diff)

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -59 +59 @@
         PawnManager::touch();
         this->bAlive_ = true;
-        this->fire_ = 0x0;
-        this->firehack_ = 0x0;
         this->bReload_ = false;
 
@@ -122 +120 @@
         registerVariable(this->health_,        variableDirection::toclient);
         registerVariable(this->initialHealth_, variableDirection::toclient);
-        registerVariable(this->fire_,          variableDirection::toserver);
         registerVariable(this->bReload_,       variableDirection::toserver);
     }
@@ -130 +127 @@
         SUPER(Pawn, tick, dt);
 
-//        if (this->weaponSystem_ && GameMode::isMaster())
-//        {
-//            for (unsigned int firemode = 0; firemode < WeaponSystem::MAX_FIRE_MODES; firemode++)
-//                if (this->fire_ & WeaponSystem::getFiremodeMask(firemode))
-//                    this->weaponSystem_->fire(firemode);
-//
-//            if (this->bReload_)
-//                this->weaponSystem_->reload();
-//        }
-//
-//        this->fire_ = this->firehack_;
-//        this->firehack_ = 0x0;
         this->bReload_ = false;
 

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -137 +137 @@
 
             WeaponSystem* weaponSystem_;
-            unsigned int fire_;
-            unsigned int firehack_;
             bool bReload_;