Changeset 10023 in orxonox.OLD for branches/playability/src
- Timestamp:
- Dec 6, 2006, 4:47:06 PM (18 years ago)
- Location:
- branches/playability/src
- Files:
-
- 2 added
- 2 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/playability/src/defs/class_id_DEPRECATED.h
r10004 r10023 225 225 CL_FPS_LASER_RIFLE = 0x000003a8, 226 226 CL_BOOMERANG_GUN = 0x000003a9, 227 CL_SWARM_LAUNCHER = 0x000003aa, 227 228 228 229 // Projectiles -
branches/playability/src/util/hud.cc
r9965 r10023 175 175 weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1)); 176 176 weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6)); 177 // 177 //weapon->getEnergyWidget()->frontMaterial().setTransparency(.6); 178 178 this->weaponsWidgets.push_back(weapon->getEnergyWidget()); 179 179 } … … 190 190 weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1)); 191 191 weapon->getEnergyWidget()->setFrontColor(Color( .2,.5,.7,.6)); 192 // 192 //weapon->getEnergyWidget()->frontMaterial().setTransparency(.6); 193 193 this->weaponsWidgets.push_back(weapon->getEnergyWidget()); 194 194 } … … 236 236 237 237 std::list<OrxGui::GLGuiWidget*>::iterator weaponWidget; 238 Vector2D pos(0.3, . 9);238 Vector2D pos(0.3, .7); 239 239 for (weaponWidget = this->weaponsWidgets.begin(); weaponWidget != this->weaponsWidgets.end(); weaponWidget++, pos.x+=.2) 240 240 { -
branches/playability/src/world_entities/WorldEntities.am
r10004 r10023 40 40 world_entities/weapons/medium_blaster.cc \ 41 41 world_entities/weapons/heavy_blaster.cc \ 42 world_entities/weapons/swarm_ missile.cc \42 world_entities/weapons/swarm_launcher.cc \ 43 43 \ 44 44 world_entities/projectiles/bolt.cc \ … … 152 152 weapons/medium_blaster.h \ 153 153 weapons/heavy_blaster.h \ 154 weapons/swarm_ missile.h \154 weapons/swarm_launcher.h \ 155 155 \ 156 156 projectiles/bolt.h \ -
branches/playability/src/world_entities/player.cc
r9975 r10023 16 16 #include "player.h" 17 17 #include "playable.h" 18 #include "space_ships/space_ship.h" 18 19 19 20 #include "event_handler.h" … … 74 75 this->playable = playable; 75 76 this->_hud.setEnergyWidget(this->playable->getHealthWidget()); 76 this->_hud.setWeaponManager(&this->playable->getWeaponManager()); 77 /*if (dynamic_cast<SpaceShip*>(this->playable)) 78 this->_hud.setWeaponManager(&this->playable->getWeaponManager(), &dynamic_cast<SpaceShip*>(this->playable)->getWeaponManagerSecondary()); 79 else*/ 80 this->_hud.setWeaponManager(&this->playable->getWeaponManager()); 77 81 78 82 this->playable->setPlayer(this); -
branches/playability/src/world_entities/space_ships/space_ship.cc
r10022 r10023 26 26 #include "weapons/medium_blaster.h" 27 27 #include "weapons/heavy_blaster.h" 28 #include "weapons/swarm_ missile.h"28 #include "weapons/swarm_launcher.h" 29 29 #include "weapons/boomerang_gun.h" 30 30 #include "weapons/turret.h" … … 154 154 wpLeft2->setName("Medium Blaster Left"); 155 155 156 Weapon* wpRight3 = new HeavyBlaster ();156 /* Weapon* wpRight3 = new HeavyBlaster (); 157 157 wpRight3->setName("Heavy Blaster Right"); 158 158 Weapon* wpLeft3 = new HeavyBlaster (); 159 wpLeft3->setName("Heavy Blaster Left"); 160 161 Weapon* cannon = new Swarm Missile();162 cannon->setName("Swarm Missile");159 wpLeft3->setName("Heavy Blaster Left");*/ 160 161 Weapon* cannon = new SwarmLauncher(); 162 cannon->setName("SwarmLauncher"); 163 163 164 164 … … 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); 172 173 this->secWeaponMan.addWeapon( cannon, 0, 0);170 /* this->weaponMan.addWeapon( wpLeft3, 0, 4); 171 this->weaponMan.addWeapon( wpRight3, 0, 5);*/ 172 173 this->secWeaponMan.addWeapon( cannon, 1, 0); 174 174 175 175 this->weaponMan.changeWeaponConfig(0); 176 this->secWeaponMan.changeWeaponConfig(1); 176 177 177 178 wpRight1->requestAction(WA_ACTIVATE); … … 179 180 wpRight2->requestAction(WA_ACTIVATE); 180 181 wpLeft2->requestAction(WA_ACTIVATE); 181 wpRight3->requestAction(WA_ACTIVATE);182 wpLeft3->requestAction(WA_ACTIVATE); 182 /* wpRight3->requestAction(WA_ACTIVATE); 183 wpLeft3->requestAction(WA_ACTIVATE);*/ 183 184 184 185 cannon->requestAction(WA_ACTIVATE); … … 369 370 registerVar( new SynchronizeableFloat( &cameraLook, &cameraLook, "cameraLook", PERMISSION_OWNER ) ); 370 371 registerVar( new SynchronizeableFloat( &rotation, &rotation, "rotation", PERMISSION_OWNER ) ); 372 registerVar( new SynchronizeableBool( &bFire, &bFire, "bSecFire", PERMISSION_OWNER)); 371 373 372 374 registerVar( new SynchronizeableVector( &velocity, &velocity, "velocity", PERMISSION_MASTER_SERVER ) ); -
branches/playability/src/world_entities/space_ships/space_ship.h
r10022 r10023 89 89 short supportedPlaymodes; //!< What Playmodes are Supported in this Playable. 90 90 Playable::Playmode playmode; //!< The current playmode. 91 bool bSecFire;92 91 93 92 //ship atributes … … 135 134 bool bRollL; //!< rolling button pressed (left) 136 135 bool bRollR; //!< rolling button pressed (right) 136 bool bSecFire; //!< second fire button pressed 137 137 138 138 /* -
branches/playability/src/world_entities/weapons/weapon_manager.cc
r10004 r10023 481 481 if (tickWeapon != NULL) 482 482 { 483 //if (this->parent != NULL)484 483 //if (this->parent != NULL) 484 tickWeapon->toList(this->parentEntity->getOMListNumber()); 485 485 tickWeapon->requestAction(WA_ACTIVATE); 486 486 this->currentSlotConfig[i].position.activateNode();
Note: See TracChangeset
for help on using the changeset viewer.