Changeset 10030 in orxonox.OLD for branches/playability/src
- Timestamp:
- Dec 6, 2006, 5:35:28 PM (18 years ago)
- Location:
- branches/playability/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/playability/src/util/hud.cc
r10023 r10030 236 236 237 237 std::list<OrxGui::GLGuiWidget*>::iterator weaponWidget; 238 Vector2D pos(0.3, . 7);238 Vector2D pos(0.3, .9); 239 239 for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++, pos.x+=.2) 240 240 { -
branches/playability/src/world_entities/player.cc
r10023 r10030 75 75 this->playable = playable; 76 76 this->_hud.setEnergyWidget(this->playable->getHealthWidget()); 77 /*if (dynamic_cast<SpaceShip*>(this->playable))77 if (dynamic_cast<SpaceShip*>(this->playable) != 0) 78 78 this->_hud.setWeaponManager(&this->playable->getWeaponManager(), &dynamic_cast<SpaceShip*>(this->playable)->getWeaponManagerSecondary()); 79 else */79 else 80 80 this->_hud.setWeaponManager(&this->playable->getWeaponManager()); 81 81 -
branches/playability/src/world_entities/space_ships/space_ship.cc
r10024 r10030 145 145 146 146 Weapon* wpRight1 = new LightBlaster (); 147 wpRight1->setName("Light Blaster Right");147 wpRight1->setName("LightBlaster"); 148 148 Weapon* wpLeft1 = new LightBlaster (); 149 wpLeft1->setName(" Medium Blaster Left");149 wpLeft1->setName("LightBlaster"); 150 150 151 151 Weapon* wpRight2 = new MediumBlaster (); 152 wpRight2->setName("Medium Blaster Right");152 wpRight2->setName("MediumBlaster"); 153 153 Weapon* wpLeft2 = new MediumBlaster (); 154 wpLeft2->setName("Medium Blaster Left");155 156 /*Weapon* wpRight3 = new HeavyBlaster ();157 wpRight3->setName("Heavy Blaster Right");154 wpLeft2->setName("MediumBlaster"); 155 156 Weapon* wpRight3 = new HeavyBlaster (); 157 wpRight3->setName("HeavyBlaster"); 158 158 Weapon* wpLeft3 = new HeavyBlaster (); 159 wpLeft3->setName("Heavy Blaster Left");*/159 wpLeft3->setName("HeavyBlaster"); 160 160 161 161 Weapon* cannon = new SwarmLauncher(); … … 168 168 this->weaponMan.addWeapon( wpLeft2, 0, 2); 169 169 this->weaponMan.addWeapon( wpRight2, 0, 3); 170 /*this->weaponMan.addWeapon( wpLeft3, 0, 4);171 this->weaponMan.addWeapon( wpRight3, 0, 5); */170 this->weaponMan.addWeapon( wpLeft3, 0, 4); 171 this->weaponMan.addWeapon( wpRight3, 0, 5); 172 172 173 173 this->secWeaponMan.addWeapon( cannon, 1, 0); … … 180 180 wpRight2->requestAction(WA_ACTIVATE); 181 181 wpLeft2->requestAction(WA_ACTIVATE); 182 /*wpRight3->requestAction(WA_ACTIVATE);183 wpLeft3->requestAction(WA_ACTIVATE); */182 wpRight3->requestAction(WA_ACTIVATE); 183 wpLeft3->requestAction(WA_ACTIVATE); 184 184 185 185 cannon->requestAction(WA_ACTIVATE); -
branches/playability/src/world_entities/space_ships/space_ship.h
r10023 r10030 56 56 virtual void process(const Event &event); 57 57 58 inline WeaponManager getWeaponManagerSecondary() { return this->secWeaponMan; };58 inline WeaponManager& getWeaponManagerSecondary() { return this->secWeaponMan; }; 59 59 60 60 //Functions for GUI -
branches/playability/src/world_entities/weapons/weapon.cc
r9998 r10030 516 516 if (this->soundBuffers[WA_SHOOT].loaded()) 517 517 this->soundSource->play(this->soundBuffers[WA_SHOOT]); 518 this->updateWidgets();519 518 // fire 520 519 this->energy -= this->minCharge; … … 522 521 // setting up for the next state 523 522 this->enterState(WS_SHOOTING); 523 this->updateWidgets(); 524 524 } 525 525 else // reload if we still have the charge
Note: See TracChangeset
for help on using the changeset viewer.