Changeset 1994 in orxonox.OLD for orxonox/branches/dave/core/world.h

Timestamp:

Jun 21, 2004, 12:39:11 AM (20 years ago)

Author:

dave

Message:

orxonox/branches/dave:[test the Shit]

File:

• orxonox/branches/dave/core/world.h (modified) (3 diffs)

orxonox/branches/dave/core/world.h

@@ -6 +6 @@
 
 #include <stdlib.h>
+#include <cmath>
+
 
 #include "npc.h"
 #include "player.h"
 #include "environment.h"
+#include "shoot_laser.h"
+#include "shoot_rocket.h"
 #include "stdincl.h"
+#include "data_tank.h"
 
 class World {
@@ -17 +22 @@
   World ();
   ~World ();
+
+  float primitiveMove;
 
   /* for easier use: map the first two player here */
@@ -47 +54 @@
   envList* lastEnv;
 
+
+
+
   bool addPlayer(Player* player);
   bool removePlayer(Player* player);
   Player* getLocalPlayer();
-
   bool addNPC(NPC* npc);
   bool removeNPC(NPC* npc);
-
   bool addEnv(Environment* env);
 
-  void drawWorld(void);
+  void drawWorld(float Zahl1, float Zahl2);
   void initEnvironement(void);
+  void setWorldStep(float step);
   void updateWorld(void);
+  void detectCollision(void);
   void testThaTest(void);
 
  private:
   float surface[120][120];
+  float step;