Changeset 3750 in orxonox.OLD for orxonox/trunk/src/world_entities/player.cc

Timestamp:

Apr 7, 2005, 7:37:25 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: made some sattelite object just for fun and to show on the convention tomarrow

File:

• orxonox/trunk/src/world_entities/player.cc (modified) (2 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -46 +46 @@
   */
   this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
+  //this->model = (Model*)ResourceManager::getInstance()->load("models/weapon_packet.obj", OBJ, RP_CAMPAIGN);
   travelSpeed = 15.0;
   velocity = new Vector();
@@ -147 +148 @@
   this->model->draw();
   glPopMatrix();
+
+  this->activeWeapon->draw();
 }