- Timestamp:
- May 2, 2009, 4:19:43 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/netp2/src/orxonox/objects/worldentities/pawns/Pawn.cc
r2836 r2949 39 39 #include "objects/worldentities/ParticleSpawner.h" 40 40 #include "objects/worldentities/ExplosionChunk.h" 41 #include "network/NetworkFunction.h" 41 42 42 43 namespace orxonox 43 44 { 44 45 CreateFactory(Pawn); 46 47 registerMemberNetworkFunction( Pawn, doFire ); 45 48 46 49 Pawn::Pawn(BaseObject* creator) : ControllableEntity(creator) … … 117 120 SUPER(Pawn, tick, dt); 118 121 119 if (this->weaponSystem_)120 {121 if (this->fire_ & WeaponMode::fire)122 this->weaponSystem_->fire(WeaponMode::fire);123 if (this->fire_ & WeaponMode::altFire)124 this->weaponSystem_->fire(WeaponMode::altFire);125 if (this->fire_ & WeaponMode::altFire2)126 this->weaponSystem_->fire(WeaponMode::altFire2);127 }128 this->fire_ = this->firehack_;129 this->firehack_ = 0x0;122 // if (this->weaponSystem_) 123 // { 124 // if (this->fire_ & WeaponMode::fire) 125 // this->weaponSystem_->fire(WeaponMode::fire); 126 // if (this->fire_ & WeaponMode::altFire) 127 // this->weaponSystem_->fire(WeaponMode::altFire); 128 // if (this->fire_ & WeaponMode::altFire2) 129 // this->weaponSystem_->fire(WeaponMode::altFire2); 130 // } 131 // this->fire_ = this->firehack_; 132 // this->firehack_ = 0x0; 130 133 131 134 if (Core::isMaster()) … … 256 259 void Pawn::fire(WeaponMode::Enum fireMode) 257 260 { 258 this->firehack_ |= fireMode; 261 doFire(fireMode); 262 } 263 264 void Pawn::doFire(uint8_t fireMode) 265 { 266 if(Core::isMaster()) 267 { 268 if (this->weaponSystem_) 269 this->weaponSystem_->fire((WeaponMode::Enum)fireMode); 270 } 271 else 272 { 273 callMemberNetworkFunction( Pawn, doFire, this->getObjectID(), 0, ((uint8_t)fireMode)); 274 if (this->weaponSystem_) 275 this->weaponSystem_->fire((WeaponMode::Enum)fireMode); 276 } 259 277 } 260 278
Note: See TracChangeset
for help on using the changeset viewer.