Changeset 10485 in orxonox.OLD for branches

Timestamp:

Jan 29, 2007, 5:45:42 PM (18 years ago)

Author:

nicolasc

Message:

2nd weapon anim fix

Location:

branches/playability/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (1 diff)
• weapons/heavy_blaster.cc (modified) (1 diff)
• weapons/medium_blaster.cc (modified) (2 diffs)

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

@@ -215 +215 @@
   this->weaponMan.changeWeaponConfig(0);
   this->secWeaponMan.changeWeaponConfig(0);
+
 
   curWeaponPrimary    = 0;

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

@@ -229 +229 @@
   glPushMatrix();
     glTranslatef (this->objComp[0][0]->getAbsCoor().x, this->objComp[0][0]->getAbsCoor().y, this->objComp[0][0]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(1);
+    static_cast<StaticModel*>(this->getModel())->draw(2);
   glPopMatrix();
 
   glPushMatrix();
     glTranslatef (this->objComp[1][0]->getAbsCoor().x, this->objComp[1][0]->getAbsCoor().y, this->objComp[1][0]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(2);
+    static_cast<StaticModel*>(this->getModel())->draw(3);
   glPopMatrix();
 

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

@@ -158 +158 @@
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
 
-  static_cast<StaticModel*>(this->getModel())->draw(2);
+  static_cast<StaticModel*>(this->getModel())->draw(0);
 
   glPushMatrix();
@@ -167 +167 @@
   glPushMatrix();
     glTranslatef (this->objComp[0][1]->getAbsCoor().x, this->objComp[0][1]->getAbsCoor().y, this->objComp[0][1]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(0);
+    static_cast<StaticModel*>(this->getModel())->draw(2);
   glPopMatrix();