Changeset 5972 in orxonox.OLD for branches

Timestamp:

Dec 7, 2005, 4:59:24 PM (19 years ago)

Author:

patrick

Message:

network: started renice work on the game_load, making it network friendly:D

Location:

branches/network/src

Files:

• orxonox.cc (modified) (4 diffs)
• orxonox.h (modified) (1 diff)
• util/loading/game_loader.cc (modified) (13 diffs)
• util/loading/game_loader.h (modified) (4 diffs)

branches/network/src/orxonox.cc

@@ -83 +83 @@
 
   /* this way, there is no network enabled: */
-  this->clientName = NULL;
+  this->serverName = NULL;
   this->port = -1;
 
@@ -190 +190 @@
   this->argv = argv;
 
-  this->clientName = name;
+  this->serverName = name;
   this->port = port;
 
@@ -278 +278 @@
   PRINT(3)("> Initializing networking\n");
 
-  if( this->clientName != NULL) // we are a client
-    NetworkManager::getInstance()->establishConnection(this->clientName, port);
+  if( this->serverName != NULL) // we are a client
+    NetworkManager::getInstance()->establishConnection(this->serverName, port);
   else if( this->port > 0)      // we are a server
     NetworkManager::getInstance()->createServer(port);
@@ -351 +351 @@
 
   this->gameLoader = GameLoader::getInstance();
-  this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");
+  
+  if( this->port == -1 || this->serverName != NULL)
+    this->gameLoader->loadNetworkCampaign("worlds/DefaultNetworkCampaign.oxc");
+  else
+    this->gameLoader->loadCampaign("worlds/DefaultCampaign.oxc");
+  
   //  this->gameLoader->loadDebugCampaign(DEBUG_CAMPAIGN_0);
   this->gameLoader->init();

branches/network/src/orxonox.h

@@ -53 +53 @@
   char**            argv;                    //!< Values of th Arguments of orxonox.
 
-  const char*       clientName;              //!< Name of the Orxonox client if == NULL -> server
+  const char*       serverName;              //!< Name of the Orxonox client if == NULL -> server
   int               port;                    //!< number of the network port of the server/client if == -1 no network
 };

branches/network/src/util/loading/game_loader.cc

@@ -46 +46 @@
 /**
  *  simple constructor
-*/
+ */
 GameLoader::GameLoader ()
 {
@@ -55 +55 @@
 
 
+
 /**
  *  simple deconstructor
-*/
+ */
 GameLoader::~GameLoader ()
 {
@@ -66 +67 @@
 
 
-/**
- *  this class is a singleton class
- * @returns an instance of itself
-
-   if you are unsure about singleton classes, check the theory out on the internet :)
-*/
-GameLoader* GameLoader::getInstance()
-{
-  if(singletonRef == NULL)
-    singletonRef = new GameLoader();
-  return singletonRef;
-}
 
 /**
  *  initializes the GameLoader
-*/
+ */
 ErrorMessage GameLoader::init()
 {
@@ -96 +85 @@
 
 
+
 /**
  *  reads a campaign definition file into a campaign class
  * @param fileName to be loaded
  * @returns the loaded campaign
-
-   this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
-*/
+ *
+ * this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
+ */
 ErrorMessage GameLoader::loadCampaign(const char* fileName)
 {
@@ -117 +107 @@
 }
 
+
+
+/**
+ *  reads a campaign definition file into a campaign class
+ * @param fileName to be loaded
+ * @returns the loaded campaign
+ *
+ * this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
+ */
+ErrorMessage loadNetworkCampaign(const char* name)
+{}
+
+
+
 /**
  *  loads a debug campaign for test purposes only.
  * @param campaignID the identifier of the campaign.
  * @returns error message if not able to do so.
-*/
+ */
 ErrorMessage GameLoader::loadDebugCampaign(Uint32 campaignID)
 {
@@ -156 +160 @@
 
 /**
-  *  starts the current entity
-  * @returns error code if this action has caused a error
-*/
+ *  starts the current entity
+ * @returns error code if this action has caused a error
+ */
 ErrorMessage GameLoader::start()
 {
@@ -167 +171 @@
 
 /**
-  *  stops the current entity
-  * @returns error code if this action has caused a error
-
-    ATTENTION: this function shouldn't call other functions, or if so, they must return
-    after finishing. If you ignore or forget to do so, the current entity is not able to
-    terminate and it will run in the background or the ressources can't be freed or even
-    worse: are freed and the program will end in a segmentation fault!
-    hehehe, have ya seen it... :)
-*/
+ *  stops the current entity
+ * @returns error code if this action has caused a error
+ *
+ * ATTENTION: this function shouldn't call other functions, or if so, they must return
+ * after finishing. If you ignore or forget to do so, the current entity is not able to
+ * terminate and it will run in the background or the ressources can't be freed or even
+ * worse: are freed and the program will end in a segmentation fault!
+ * hehehe, have dja seen it... :)
+ */
 void GameLoader::stop()
 {
@@ -184 +188 @@
 
 /**
-  *  pause the current entity
-  * @returns error code if this action has caused a error
-
-    this pauses the current entity or passes this call forth to the running entity.
-*/
+ *  pause the current entity
+ * @returns error code if this action has caused a error
+ *
+ * this pauses the current entity or passes this call forth to the running entity.
+ */
 ErrorMessage GameLoader::pause()
 {
@@ -198 +202 @@
 
 /**
-  *  resumes a pause
-  * @returns error code if this action has caused a error
-
-    this resumess the current entity or passes this call forth to the running entity.
-*/
+ *  resumes a pause
+ * @returns error code if this action has caused a error
+ *
+ * this resumess the current entity or passes this call forth to the running entity.
+ */
 ErrorMessage GameLoader::resume()
 {
@@ -224 +228 @@
  * @param fileName to be loaded
  * @returns the loaded campaign
-
-   this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
-*/
+ *
+ * this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
+ */
 Campaign* GameLoader::fileToCampaign(const char* fileName)
 {
@@ -312 +316 @@
 
 /**
-  \brief this changes to the next level
-*/
+ *  this changes to the next level
+ */
 void GameLoader::nextLevel()
 {
@@ -322 +326 @@
 
 /**
-  \brief change to the previous level - not implemented
-
-  this propably useless
-*/
+ *  change to the previous level - not implemented
+ *
+ * this propably useless
+ */
 void GameLoader::previousLevel()
 {
@@ -335 +339 @@
  *  load a StoryEntity
  * @param element a XMLElement containing all the needed info
-*/
+ */
 BaseObject* GameLoader::fabricate(const TiXmlElement* element)
 {

branches/network/src/util/loading/game_loader.h

@@ -40 +40 @@
 {
 
+  
  public:
   ~GameLoader ();
 
-  static GameLoader* getInstance();
+  /**  this class is a singleton class @returns an instance of itself  */
+  static GameLoader* getInstance() { if(singletonRef == NULL) singletonRef = new GameLoader();  return singletonRef; }
 
   ErrorMessage init();
-  ErrorMessage loadCampaign(const char* name);
   ErrorMessage start();
   void stop();
@@ -56 +57 @@
   void previousLevel();
 
-  /** \brief a world command to send to the GameLoader @param cmd the command */
-  bool worldCommand(Command* cmd);
   ErrorMessage loadDebugCampaign(Uint32 campaignID);
+  ErrorMessage loadCampaign(const char* name);
+  ErrorMessage loadNetworkCampaign(const char* name);
+  
 
   void registerFactory( Factory* factory );
@@ -65 +67 @@
   void process(const Event &event);
 
+  
  private:
   GameLoader ();
@@ -70 +73 @@
   Campaign* fileToCampaign(const char* name);
 
+  
  private:
   static GameLoader*     singletonRef;         //!< The singleton-reference to this object