Changeset 8677 in orxonox.OLD for branches/gui/src/lib

Timestamp:

Jun 21, 2006, 4:49:06 PM (18 years ago)

Author:

bensch

Message:

new gui implementing work

Location:

branches/gui/src/lib

Files:

• data/data_tank.h (modified) (1 diff)
• util/loading/game_loader.cc (modified) (7 diffs)

branches/gui/src/lib/data/data_tank.h

@@ -23 +23 @@
 
     /** initializes the DataTank to be able to load the data */
-    virtual ErrorMessage init() {}
+    virtual ErrorMessage init() { return ErrorMessage(); }
     /** loads the data into the DataTank @param root is the xml root parameter for for loadParams() connection */
-    virtual ErrorMessage loadData(const TiXmlElement* root = NULL) {}
+    virtual ErrorMessage loadData(const TiXmlElement* root = NULL) { return ErrorMessage(); }
     /** unloads the data again from the DataTank */
-    virtual ErrorMessage unloadData() {}
+    virtual ErrorMessage unloadData() { return ErrorMessage(); }
 };
 

branches/gui/src/lib/util/loading/game_loader.cc

@@ -73 +73 @@
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_NEXT_WORLD);
   this->subscribeEvent(ES_GAME, KeyMapper::PEV_PREVIOUS_WORLD);
+
+  return ErrorMessage();
 }
 
@@ -91 +93 @@
     this->currentCampaign = this->fileToCampaign(campaignName);
   }
+
+  return ErrorMessage();
 }
 
@@ -109 +113 @@
     this->currentCampaign = this->fileToCampaign(campaignName);
   }
+
+  return ErrorMessage();
 }
 
@@ -147 +153 @@
       }
   }
+
+  return ErrorMessage();
 }
 
@@ -160 +168 @@
     this->currentCampaign->start();
   }
+
+  return ErrorMessage();
 }
 
@@ -191 +201 @@
   if(this->currentCampaign != NULL)
     this->currentCampaign->pause();
+
+  return ErrorMessage();
 }
 
@@ -205 +217 @@
   if(this->currentCampaign != NULL)
     this->currentCampaign->resume();
+
+  return ErrorMessage();
 }