Changeset 9979 in orxonox.OLD for branches/playability/src/world_entities

Timestamp:

Nov 29, 2006, 10:30:03 PM (17 years ago)

Author:

nicolasc

Message:

created hbolt.[cc,h], copied from laser, used in heavy blaster
included models

Location:

branches/playability/src/world_entities

Files:

• WorldEntities.am (modified) (1 diff)
• projectiles/bolt.cc (modified) (1 diff)
• projectiles/bolt.h (modified) (1 diff)
• projectiles/hbolt.cc (added)
• projectiles/hbolt.h (added)
• space_ships/space_ship.cc (modified) (1 diff)
• test_entity2.cc (modified) (3 diffs)
• weapons/heavy_blaster.cc (modified) (2 diffs)

branches/playability/src/world_entities/WorldEntities.am

@@ -42 +42 @@
                 \
                 world_entities/projectiles/bolt.cc \
+                world_entities/projectiles/hbolt.cc \
                 world_entities/projectiles/bomb.cc \
                 world_entities/projectiles/laser.cc \

branches/playability/src/world_entities/projectiles/bolt.cc

@@ -14 +14 @@
 
 */
+
+
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 

branches/playability/src/world_entities/projectiles/bolt.h

@@ -1 +1 @@
 /*!
- * @file laser.h
- * @brief a projectile, that is been shooted by a weapon
+ * @file bolt.h
+ * @brief light blaster bolt
 */
 

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -133 +133 @@
 
   //weapons:
-  Weapon* wpRight = new LightBlaster ();
+  Weapon* wpRight = new HeavyBlaster ();
   wpRight->setName("Blaster Right");
-  Weapon* wpLeft = new LightBlaster ();
+  Weapon* wpLeft = new HeavyBlaster ();
   wpLeft->setName("Blaster Left");
 

branches/playability/src/world_entities/test_entity2.cc

@@ -100 +100 @@
 {
 
+    glPushAttrib(GL_ENABLE_BIT);
+    glDisable(GL_LIGHTING);
 
     glPushMatrix();
@@ -113 +115 @@
 
 //PRINTF(0)("axis: %f\n", axis);
+
+
     glDisable(GL_TEXTURE_2D);
     this->material->select();
@@ -228 +232 @@
 
   glPopMatrix();
-//    glPopAttrib();
+  glPopAttrib();
 }
 

branches/playability/src/world_entities/weapons/heavy_blaster.cc

@@ -51 +51 @@
   
 
-  this->setStateDuration(WS_SHOOTING, 0.05);
+  this->setStateDuration(WS_SHOOTING, 0.5);
   this->setStateDuration(WS_RELOADING, 0);
   this->setStateDuration(WS_ACTIVATING, .5);
@@ -65 +65 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("RailProjectile");   // FIXME temp project type until the blaste class exist
+  this->setProjectileTypeC("HBolt");   // FIXME temp project type until the blaste class exist
   this->prepareProjectiles(100);