Changeset 5427 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Oct 24, 2005, 6:06:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some minor include stuff

Location:

trunk/src/world_entities

Files:

• npc.cc (modified) (2 diffs)
• npc2.cc (modified) (1 diff)
• test_entity.cc (modified) (1 diff)
• test_entity.h (modified) (1 diff)

trunk/src/world_entities/npc.cc

@@ -23 +23 @@
 #include "state.h"
 #include "list.h"
+#include "stdlibincl.h"
 
 using namespace std;
@@ -33 +34 @@
   this->loadModelWithScale("models/ships/bolido.obj", 2);
 
-  this->randomRotAxis = VECTOR_RAND(1);
+  this->randomRotAxis =  VECTOR_RAND(1);
 }
 

trunk/src/world_entities/npc2.cc

@@ -24 +24 @@
 #include "state.h"
 #include "list.h"
+#include "stdlibincl.h"
 
 using namespace std;

trunk/src/world_entities/test_entity.cc

@@ -78 +78 @@
 
 
-void TestEntity::collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags) {}
 
 

trunk/src/world_entities/test_entity.h

@@ -24 +24 @@
   virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void destroy ();
-  virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
   virtual void collidesWith(WorldEntity* entity, const Vector& location);
   virtual void draw ();