Changeset 4338 in orxonox.OLD for orxonox/trunk/src/story_entities/world.h

Timestamp:

May 27, 2005, 9:16:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/physics back to the trunk
merged with command
svn merge -r 3866:HEAD . ../../trunk/
many conflict that i tried to resolv
@patrick: i hope i did not interfere with your stuff :/

File:

• orxonox/trunk/src/story_entities/world.h (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.h

@@ -37 +37 @@
   static WorldInterface* getInstance();
   void init(World* world);
+  inline World* getCurrentWorld(void) {return this->worldReference;}
   tList<WorldEntity>* getEntityList();
 
@@ -93 +94 @@
   void setPath( const char* name);
 
+  inline Camera* getLocalCamera(void) {return this->localCamera;}
+
  private:
   void constuctorInit(char* name, int worldID);