Changeset 6139 in orxonox.OLD for trunk/src/util/loading/game_loader.h

Timestamp:

Dec 16, 2005, 6:45:32 PM (20 years ago)

Author:

patrick

Message:

trunk: merged branche network with trunk using command: svn merge -r5999:HEAD, conflicts resolved in favor of the trunk bla

File:

• trunk/src/util/loading/game_loader.h (modified) (4 diffs)

trunk/src/util/loading/game_loader.h

@@ -40 +40 @@
 {
 
+
  public:
   ~GameLoader ();
@@ -46 +47 @@
 
   ErrorMessage init();
-  ErrorMessage loadCampaign(const char* name);
   ErrorMessage start();
   void stop();
@@ -53 +53 @@
   ErrorMessage destroy();
 
+  ErrorMessage loadCampaign(const char* name);
+  ErrorMessage loadDebugCampaign(Uint32 campaignID);
+  ErrorMessage loadNetworkCampaign(const char* fileName);
+
   void nextLevel();
   void previousLevel();
 
-  /** \brief a world command to send to the GameLoader @param cmd the command */
-  bool worldCommand(Command* cmd);
-  ErrorMessage loadDebugCampaign(Uint32 campaignID);
+  void process(const Event &event);
 
-  void process(const Event &event);
 
  private:
@@ -66 +67 @@
 
   Campaign* fileToCampaign(const char* name);
+  Campaign* fileToNetworkCampaign(const char* fileName);
+
 
  private: