Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/world_entities/environment.h

Timestamp:

Mar 18, 2005, 11:52:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/world_entities/environment.h (modified) (1 diff)

orxonox/branches/levelloader/src/world_entities/environment.h

@@ -9 +9 @@
   friend class World;
 
- private:
-  float xCor;
-  float yCor;
-  float zCor;
-
-  float mountainTest[10][10];
-
  public:
   Environment ();
   Environment (TiXmlElement* root);
-  ~Environment ();
-
+  virtual ~Environment ();
   
   virtual void tick (float time);
-  virtual void hit (WorldEntity* weapon, Vector loc);
+  virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void destroy ();
   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);