Changeset 3583 in orxonox.OLD for orxonox/trunk/src/world_entities/weapon.cc

Timestamp:

Mar 16, 2005, 11:08:33 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: some changes in the character_attributes, projectile and weapon.

File:

• orxonox/trunk/src/world_entities/weapon.cc (modified) (6 diffs)

orxonox/trunk/src/world_entities/weapon.cc

@@ -33 +33 @@
 */
 Weapon::Weapon () : WorldEntity()
-{
-  this->model = new OBJModel("");
-}
+{}
 
 
@@ -55 +53 @@
 */
 void Weapon::enable()
-{}
+{
+  this->enabled = true;
+}
 
 
@@ -66 +66 @@
 */
 void Weapon::disable()
-{}
+{
+  this->enabled = false;
+}
 
 
@@ -78 +80 @@
 */
 bool Weapon::isEnabled()
-{}
+{
+  return this->enabled;
+}
 
 
@@ -133 +137 @@
 {}
 
-
-/**
-   \brief this sets the energy of a weapon
-   \param amount of energy
-
-   a weapon has a limited amount of energy, this means a limited amount of shoots
-*/
-void Weapon::setWeaponEnergy(int energy)
-{}
-
-/**
-   \brief adds weapon energy
-   \param amount of energy
-   \returns amount of energy, that is over the energy limit
-
-   this can be used for energy-power up for example. There is a limited amount of energy
-   a weapon can have. so if you want to add more, than it supports, the rest will
-   be returned from this weapon.
-*/
-int Weapon::addWeaponEnergy(int addEnergy)
-{}
-
-/**
-   \brief removes weapon energy
-   \param amount of enery
-
-   this is the case, when ther should be some sort of energy loss in the weapon
-   system. propably wont be the case but usefull to have
-*/
-void Weapon::substractWeaponEnergy(int subEnergy)
-{}
-
-/**
-   \brief gets the amount of energy of a weapon (= ammo)
-*/
-int Weapon::getWeaponEnergy()
+/**
+   \brief sets a weapon idle time
+   \param idle time in ms
+
+   a weapon idle time is the time spend after a shoot until the weapon can
+   shoot again
+*/
+void Weapon::setWeaponIdleTime(float time)
+{}
+
+/**
+   \brief gets the weapon idle time
+   \returns idle time in ms
+
+   a weapon idle time is the time spend after a shoot until the weapon can
+   shoot again
+*/
+float Weapon::getWeaponIdleTime(void)
+{}
+
+/**
+   \brief checks if the idle time is elapsed
+   \return true if time is elapsed
+
+   a weapon idle time is the time spend after a shoot until the weapon can
+   shoot again
+*/
+bool Weapon::hasWeaponIdleTimeElapsed(void)
 {}
 
@@ -211 +207 @@
 
 /**
+   \brief is called, when there is no fire button pressed
+*/
+void Weapon::weaponIdle()
+{}
+
+
+/**
    \brief this will draw the weapon
 */
 void Weapon::draw () 
-{
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-
-  float matrix[4][4];
-  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  this->getAbsDir().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-  this->model->draw();
-
-  glPopMatrix();
-}
-
+{}
+