Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6093 in orxonox.OLD for branches/network


Ignore:
Timestamp:
Dec 14, 2005, 1:10:45 AM (19 years ago)
Author:
patrick
Message:

network: branche comiles again

Location:
branches/network/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/network/src/lib/sound/sound_engine.cc

    r5996 r6093  
    290290  // INITIALIZING THE DEVICE:
    291291
    292 #ifdef AL_VERSION_1_1
     292
    293293  ALubyte deviceName[] =
    294 #else
    295   ALCchar deviceName[] =
    296 #endif
    297294
    298295#ifdef __WIN32__
  • branches/network/src/story_entities/network_world.cc

    r6085 r6093  
    1717#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD
    1818
    19 #include "world.h"
     19#include "network_world.h"
    2020
    2121#include "shell_command.h"
     
    7575
    7676
    77 SHELL_COMMAND(speed, NetworkWorld, setSpeed);
    78 SHELL_COMMAND(togglePNodeVisibility, NetworkWorld, togglePNodeVisibility);
    79 SHELL_COMMAND(toggleBVVisibility, NetworkWorld, toggleBVVisibility);
     77//SHELL_COMMAND(speed, NetworkWorld, setSpeed);
     78//SHELL_COMMAND(togglePNodeVisibility, NetworkWorld, togglePNodeVisibility);
     79//SHELL_COMMAND(toggleBVVisibility, NetworkWorld, toggleBVVisibility);
    8080
    8181using namespace std;
    8282
    8383//! This creates a Factory to fabricate a NetworkWorld
    84 CREATE_FACTORY(NetworkWorld, CL_WORLD);
     84//CREATE_FACTORY(NetworkWorld, CL_WORLD);
    8585
    8686NetworkWorld::NetworkWorld(const TiXmlElement* root)
  • branches/network/src/world_entities/spawning_point.cc

    r6088 r6093  
    1717#include "spawning_point.h"
    1818#include "load_param.h"
    19 
     19#include "factory.h"
     20#include "compiler.h"
     21#include "world.h" /* only temp. until the object manager is implemented*/
    2022
    2123/**
    2224 *  standard constructor
    2325 */
    24 SpawningPoint::SpawningPoint (const Vector& absCoordinate, const World* world)
    25     : WorldEntity(absCoodrinate)
     26SpawningPoint::SpawningPoint (World* world, const Vector& absCoordinate)
    2627{
    2728  this->world = world;
     
    3738 */
    3839SpawningPoint::SpawningPoint (const Vector& position, float frequency,
    39                               float seed, int classID, const World* world)
    40     : WorldEntity(position)
     40                              float seed, ClassID classID, World* world)
    4141{
    4242  this->frequency = frequency;
     
    8383
    8484  /* now load the seed */
    85   LoadParam(root, "classid", this, SpawningPoint, setSpawningEntity)
     85/*  LoadParam(root, "classid", this, SpawningPoint, setSpawningEntity)
    8686      .describe("sets the class id of the entity to spawn")
    87       .defaultValues(1, CL_WORLD_ENTITY);
     87      .defaultValues(1, CL_WORLD_ENTITY);*/
    8888}
    8989
     
    9797            this->frequency, this->seed);
    9898  BaseObject* spawningEntity = Factory::fabricate(this->classID);
    99   if( LIKELY(this->world != NULL))
     99  if( likely(this->world != NULL))
    100100    this->world->spawn(dynamic_cast<WorldEntity*>(spawningEntity));
    101101}
  • branches/network/src/world_entities/spawning_point.h

    r6088 r6093  
    1717
    1818  public:
    19     SpawningPoint (const Vector& absCoordinate = Vector(0.0, 0.0, 0.0), const World* world);
    20     SpawningPoint (const Vector& position, float frequency, float seed, int classID, const World* world);
     19    SpawningPoint (World* world, const Vector& absCoordinate = Vector(0.0, 0.0, 0.0));
     20    SpawningPoint (const Vector& position, float frequency, float seed, ClassID classID, World* world);
    2121    virtual ~SpawningPoint ();
    2222    void init();
     
    2525
    2626    /**  sets the entity that is going to be spawned by this point @param classID: the id from the class_id.h file */
    27     void SpawningPoint::setSpawningEntity(int classID) { this->classID = classID; }
     27    void SpawningPoint::setSpawningEntity(ClassID classID) { this->classID = classID; }
    2828    /** sets the frequency with which the point is going to spawn entities (1/sec) @param frequency: the frequency */
    2929    void SpawningPoint::setSpawningFrequency(float frequency) { this->frequency = frequency; }
     
    4040    float                countDown;                      //!< the timer that counts down until the next spawn
    4141    float                seed;                           //!< the random seed of the position
    42     int                  classID;                        //!< the classid of the entity to spawn
    43 
     42    ClassID              classID;                        //!< the classid of the entity to spawn
     43    World*               world;                          //!< reference to the world it belongs to (or in the future: the object manager)
    4444
    4545};
Note: See TracChangeset for help on using the changeset viewer.