Changeset 6093 in orxonox.OLD

Timestamp:

Dec 14, 2005, 1:10:45 AM (18 years ago)

Author:

patrick

Message:

network: branche comiles again

Location:

branches/network/src

Files:

• lib/sound/sound_engine.cc (modified) (1 diff)
• story_entities/network_world.cc (modified) (2 diffs)
• world_entities/spawning_point.cc (modified) (4 diffs)
• world_entities/spawning_point.h (modified) (3 diffs)

branches/network/src/lib/sound/sound_engine.cc

@@ -290 +290 @@
   // INITIALIZING THE DEVICE:
 
-#ifdef AL_VERSION_1_1
+
   ALubyte deviceName[] =
-#else
-  ALCchar deviceName[] =
-#endif
 
 #ifdef __WIN32__

branches/network/src/story_entities/network_world.cc

@@ -17 +17 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD
 
-#include "world.h"
+#include "network_world.h"
 
 #include "shell_command.h"
@@ -75 +75 @@
 
 
-SHELL_COMMAND(speed, NetworkWorld, setSpeed);
-SHELL_COMMAND(togglePNodeVisibility, NetworkWorld, togglePNodeVisibility);
-SHELL_COMMAND(toggleBVVisibility, NetworkWorld, toggleBVVisibility);
+//SHELL_COMMAND(speed, NetworkWorld, setSpeed);
+//SHELL_COMMAND(togglePNodeVisibility, NetworkWorld, togglePNodeVisibility);
+//SHELL_COMMAND(toggleBVVisibility, NetworkWorld, toggleBVVisibility);
 
 using namespace std;
 
 //! This creates a Factory to fabricate a NetworkWorld
-CREATE_FACTORY(NetworkWorld, CL_WORLD);
+//CREATE_FACTORY(NetworkWorld, CL_WORLD);
 
 NetworkWorld::NetworkWorld(const TiXmlElement* root)

branches/network/src/world_entities/spawning_point.cc

@@ -17 +17 @@
 #include "spawning_point.h"
 #include "load_param.h"
-
+#include "factory.h"
+#include "compiler.h"
+#include "world.h" /* only temp. until the object manager is implemented*/
 
 /**
  *  standard constructor
  */
-SpawningPoint::SpawningPoint (const Vector& absCoordinate, const World* world)
-    : WorldEntity(absCoodrinate)
+SpawningPoint::SpawningPoint (World* world, const Vector& absCoordinate)
 {
   this->world = world;
@@ -37 +38 @@
  */
 SpawningPoint::SpawningPoint (const Vector& position, float frequency,
-                              float seed, int classID, const World* world)
-    : WorldEntity(position)
+                              float seed, ClassID classID, World* world)
 {
   this->frequency = frequency;
@@ -83 +83 @@
 
   /* now load the seed */
-  LoadParam(root, "classid", this, SpawningPoint, setSpawningEntity)
+/*  LoadParam(root, "classid", this, SpawningPoint, setSpawningEntity)
       .describe("sets the class id of the entity to spawn")
-      .defaultValues(1, CL_WORLD_ENTITY);
+      .defaultValues(1, CL_WORLD_ENTITY);*/
 }
 
@@ -97 +97 @@
             this->frequency, this->seed);
   BaseObject* spawningEntity = Factory::fabricate(this->classID);
-  if( LIKELY(this->world != NULL))
+  if( likely(this->world != NULL))
     this->world->spawn(dynamic_cast<WorldEntity*>(spawningEntity));
 }

branches/network/src/world_entities/spawning_point.h

@@ -17 +17 @@
 
   public:
-    SpawningPoint (const Vector& absCoordinate = Vector(0.0, 0.0, 0.0), const World* world);
-    SpawningPoint (const Vector& position, float frequency, float seed, int classID, const World* world);
+    SpawningPoint (World* world, const Vector& absCoordinate = Vector(0.0, 0.0, 0.0));
+    SpawningPoint (const Vector& position, float frequency, float seed, ClassID classID, World* world);
     virtual ~SpawningPoint ();
     void init();
@@ -25 +25 @@
 
     /**  sets the entity that is going to be spawned by this point @param classID: the id from the class_id.h file */
-    void SpawningPoint::setSpawningEntity(int classID) { this->classID = classID; }
+    void SpawningPoint::setSpawningEntity(ClassID classID) { this->classID = classID; }
     /** sets the frequency with which the point is going to spawn entities (1/sec) @param frequency: the frequency */
     void SpawningPoint::setSpawningFrequency(float frequency) { this->frequency = frequency; }
@@ -40 +40 @@
     float                countDown;                      //!< the timer that counts down until the next spawn
     float                seed;                           //!< the random seed of the position
-    int                  classID;                        //!< the classid of the entity to spawn
-
+    ClassID              classID;                        //!< the classid of the entity to spawn
+    World*               world;                          //!< reference to the world it belongs to (or in the future: the object manager)
 
 };