Changeset 9979 in orxonox.OLD for branches/playability/src/world_entities
- Timestamp:
- Nov 29, 2006, 10:30:03 PM (18 years ago)
- Location:
- branches/playability/src/world_entities
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/playability/src/world_entities/WorldEntities.am
r9978 r9979 42 42 \ 43 43 world_entities/projectiles/bolt.cc \ 44 world_entities/projectiles/hbolt.cc \ 44 45 world_entities/projectiles/bomb.cc \ 45 46 world_entities/projectiles/laser.cc \ -
branches/playability/src/world_entities/projectiles/bolt.cc
r9978 r9979 14 14 15 15 */ 16 17 16 18 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON 17 19 -
branches/playability/src/world_entities/projectiles/bolt.h
r9978 r9979 1 1 /*! 2 * @file laser.h3 * @brief a projectile, that is been shooted by a weapon2 * @file bolt.h 3 * @brief light blaster bolt 4 4 */ 5 5 -
branches/playability/src/world_entities/space_ships/space_ship.cc
r9975 r9979 133 133 134 134 //weapons: 135 Weapon* wpRight = new LightBlaster ();135 Weapon* wpRight = new HeavyBlaster (); 136 136 wpRight->setName("Blaster Right"); 137 Weapon* wpLeft = new LightBlaster ();137 Weapon* wpLeft = new HeavyBlaster (); 138 138 wpLeft->setName("Blaster Left"); 139 139 -
branches/playability/src/world_entities/test_entity2.cc
r9978 r9979 100 100 { 101 101 102 glPushAttrib(GL_ENABLE_BIT); 103 glDisable(GL_LIGHTING); 102 104 103 105 glPushMatrix(); … … 113 115 114 116 //PRINTF(0)("axis: %f\n", axis); 117 118 115 119 glDisable(GL_TEXTURE_2D); 116 120 this->material->select(); … … 228 232 229 233 glPopMatrix(); 230 //glPopAttrib();234 glPopAttrib(); 231 235 } 232 236 -
branches/playability/src/world_entities/weapons/heavy_blaster.cc
r9975 r9979 51 51 52 52 53 this->setStateDuration(WS_SHOOTING, 0. 05);53 this->setStateDuration(WS_SHOOTING, 0.5); 54 54 this->setStateDuration(WS_RELOADING, 0); 55 55 this->setStateDuration(WS_ACTIVATING, .5); … … 65 65 66 66 this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT); 67 this->setProjectileTypeC(" RailProjectile"); // FIXME temp project type until the blaste class exist67 this->setProjectileTypeC("HBolt"); // FIXME temp project type until the blaste class exist 68 68 this->prepareProjectiles(100); 69 69
Note: See TracChangeset
for help on using the changeset viewer.