Changeset 9955 in orxonox.OLD

Timestamp:

Nov 24, 2006, 6:42:57 PM (17 years ago)

Author:

muellmic

Message:

fixed compiler error at SpaceShip::shield()

Location:

branches/playability/src/world_entities/space_ships

Files:

• spacecraft_2d_new.cc (modified) (22 diffs)
• spacecraft_2d_new.h (moved) (moved from branches/playability/src/world_entities/space_ships/spacecraft_2d_new) (2 diffs)

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

@@ -17 +17 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "spacecraft_2d.h"
+#include "spacecraft_2d_new.h"
 
 #include "weapons/weapon_manager.h"
@@ -39 +39 @@
 
 #include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Spacecraft2D, CL_SPACECRAFT_2D);
-CREATE_FACTORY(Spacecraft2D);
-
-CREATE_SCRIPTABLE_CLASS(Spacecraft2D,
+ObjectListDefinitionID(Spacecraft2Dnew, CL_SPACECRAFT_2D_new);
+CREATE_FACTORY(Spacecraft2Dnew);
+
+CREATE_SCRIPTABLE_CLASS(Spacecraft2Dnew,
                         addMethod("hasPlayer", Executor0ret<Playable, lua_State*,bool>(&Playable::hasPlayer))
                         //Coordinates
@@ -56 +56 @@
 /**
  * @brief loads a Spacecraft2D information from a specified file.
- * @param fileName the name of the File to load the spacecraft_2d from (absolute path)
+ * @param fileName the name of the File to load the spacecraft_2d_new from (absolute path)
  */
-Spacecraft2D::Spacecraft2D(const std::string& fileName)
+Spacecraft2Dnew::Spacecraft2Dnew(const std::string& fileName)
 {
   this->init();
@@ -65 +65 @@
   if(!doc.LoadFile())
   {
-    PRINTF(2)("Loading file %s failed for Spacecraft2D.\n", fileName.c_str());
+    PRINTF(2)("Loading file %s failed for Spacecraft2Dnew.\n", fileName.c_str());
     return;
   }
@@ -78 +78 @@
    @todo add more parameters to load
 */
-Spacecraft2D::Spacecraft2D(const TiXmlElement* root)
+Spacecraft2Dnew::Spacecraft2Dnew(const TiXmlElement* root)
 {
   this->init();
@@ -114 +114 @@
  * @brief destructs the spacecraft_2d, deletes alocated memory
  */
-Spacecraft2D::~Spacecraft2D ()
+Spacecraft2Dnew::~Spacecraft2Dnew ()
 {
   this->setPlayer(NULL);
@@ -124 +124 @@
  * @brief initializes a Spacecraft2D
  */
-void Spacecraft2D::init()
+void Spacecraft2Dnew::init()
 {
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
@@ -229 +229 @@
  * @param root the XML-element to load the Spaceship's properties from
  */
-void Spacecraft2D::loadParams(const TiXmlElement* root)
+void Spacecraft2Dnew::loadParams(const TiXmlElement* root)
 {
   Playable::loadParams(root);
@@ -238 +238 @@
 }
 
-void Spacecraft2D::setPlayDirection(const Quaternion& rot, float speed)
+void Spacecraft2Dnew::setPlayDirection(const Quaternion& rot, float speed)
 {
   this->direction = Quaternion (rot.getHeading(), Vector(0,1,0));
 }
 
-void Spacecraft2D::setTravelSpeed(float travelSpeed)
+void Spacecraft2Dnew::setTravelSpeed(float travelSpeed)
 {
   this->travelSpeed = travelSpeed;
@@ -249 +249 @@
 
 
-void Spacecraft2D::setTravelHeight(float travelHeight)
+void Spacecraft2Dnew::setTravelHeight(float travelHeight)
 {
   if (this->toTravelHeight == NULL)
@@ -257 +257 @@
 
 
-void Spacecraft2D::setTravelDistance(const Vector2D& distance)
+void Spacecraft2Dnew::setTravelDistance(const Vector2D& distance)
 {
   this->travelDistance = distance;
 }
 
-void Spacecraft2D::setTravelDistance(float x, float y)
+void Spacecraft2Dnew::setTravelDistance(float x, float y)
 {
   this->setTravelDistance(Vector2D(x, y));
@@ -269 +269 @@
 
 
-void Spacecraft2D::enter()
+void Spacecraft2Dnew::enter()
 {
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( true);
@@ -277 +277 @@
 }
 
-void Spacecraft2D::leave()
+void Spacecraft2Dnew::leave()
 {
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
@@ -285 +285 @@
 
 
-void Spacecraft2D::enterPlaymode(Playable::Playmode playmode)
+void Spacecraft2Dnew::enterPlaymode(Playable::Playmode playmode)
 {
   switch(playmode)
@@ -337 +337 @@
  * @brief effect that occurs after the Spacecraft2D is spawned
 */
-void Spacecraft2D::postSpawn ()
+void Spacecraft2Dnew::postSpawn ()
 {
   //setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
@@ -345 +345 @@
  * @brief the action occuring if the spacecraft_2d left the game
 */
-void Spacecraft2D::leftWorld ()
+void Spacecraft2Dnew::leftWorld ()
 {}
 
@@ -354 +354 @@
  * Implement behaviour like damage application or other miscellaneous collision stuff in this function
  */
-void Spacecraft2D::collidesWith(WorldEntity* entity, const Vector& location)
+void Spacecraft2Dnew::collidesWith(WorldEntity* entity, const Vector& location)
 {
   Playable::collidesWith(entity, location);
@@ -365 +365 @@
  * @param time The timespan passed since last update
 */
-void Spacecraft2D::tick (float dt)
+void Spacecraft2Dnew::tick (float dt)
 {
   //  this->debugNode(1);
@@ -382 +382 @@
  * @param time the timeslice since the last frame
 */
-void Spacecraft2D::movement (float dt)
+void Spacecraft2Dnew::movement (float dt)
 {
   Vector accel(0.0, 0.0, 0.0);
@@ -483 +483 @@
 
 
-void Spacecraft2D::draw() const
+void Spacecraft2Dnew::draw() const
 {
   WorldEntity::draw();
@@ -491 +491 @@
  * @todo switch statement ??
  */
-void Spacecraft2D::process(const Event &event)
+void Spacecraft2Dnew::process(const Event &event)
 {
   Playable::process(event);
@@ -505 +505 @@
   else if( event.type == EV_MOUSE_MOTION)
   {
-
-
-
     if (this->getPlaymode() == Playable::Full3D)
     {

branches/playability/src/world_entities/space_ships/spacecraft_2d_new.h

@@ -1 +1 @@
 
 /*!
- * @file spacecraft_2d.h
- * Implements the Control of a Spacecraft2D
+ * @file spacecraft_2d_new.h
+ * Implements the Control of a Spacecraft2D version 2 (PPS 3)
  */
 
-#ifndef _SPACECRAFT_2D_H
-#define _SPACECRAFT_2D_H
+#ifndef _SPACECRAFT_2D_NEW_H
+#define _SPACECRAFT_2D_NEW_H
 
 #include "playable.h"
@@ -14 +14 @@
 class ParticleSystem;
 
-class Spacecraft2D : public Playable
+class Spacecraft2Dnew : public Playable
 {
-  ObjectListDeclaration(Spacecraft2D);
+  ObjectListDeclaration(Spacecraft2Dnew);
   public:
-    Spacecraft2D(const std::string& fileName);
-    Spacecraft2D(const TiXmlElement* root = NULL);
-    virtual ~Spacecraft2D();
+    Spacecraft2Dnew(const std::string& fileName);
+    Spacecraft2Dnew(const TiXmlElement* root = NULL);
+    virtual ~Spacecraft2Dnew();
 
     virtual void loadParams(const TiXmlElement* root);