Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3222 in orxonox.OLD


Ignore:
Timestamp:
Dec 19, 2004, 11:04:22 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: Error → ErrorMessage

Location:
orxonox/trunk/src
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/campaign.cc

    r3221 r3222  
    3434
    3535
    36 Error Campaign::init()
     36ErrorMessage Campaign::init()
    3737{
    3838  this->isInit = true;
    … …  
    7373
    7474
    75 Error Campaign::start()
     75ErrorMessage Campaign::start()
    7676{
    7777  this->start(0);
    7878}
    7979
    80 Error Campaign::start(int storyID = 0)
     80ErrorMessage Campaign::start(int storyID = 0)
    8181{
    8282  printf("World::start() - starting new StoryEntity Nr:%i\n", storyID);
    83   Error errorCode;
     83  ErrorMessage errorCode;
    8484  if( !this->isInit) return errorCode;
    8585  if( storyID == WORLD_ID_GAMEEND) return errorCode;
    … …  
    113113}
    114114
    115 Error Campaign::stop()
     115ErrorMessage Campaign::stop()
    116116{
    117117  this->running = false;
    … …  
    124124}
    125125
    126 Error Campaign::pause()
     126ErrorMessage Campaign::pause()
    127127{
    128128  if(this->currentEntity != NULL)
    … …  
    131131
    132132
    133 Error Campaign::resume()
     133ErrorMessage Campaign::resume()
    134134{
    135135  if(this->currentEntity != NULL)

  • orxonox/trunk/src/campaign.h

    r3220 r3222  
    1717  StoryEntity* currentEntity;
    1818
    19   virtual Error init();
    20   virtual Error start();
    21   virtual Error start(int storyID);
    22   virtual Error stop();
    23   virtual Error pause();
    24   virtual Error resume();
     19  virtual ErrorMessage init();
     20  virtual ErrorMessage start();
     21  virtual ErrorMessage start(int storyID);
     22  virtual ErrorMessage stop();
     23  virtual ErrorMessage pause();
     24  virtual ErrorMessage resume();
    2525
    2626  virtual void destroy();

  • orxonox/trunk/src/error.h

    r2644 r3222  
    5454  char* message;
    5555  char* location;
    56 } Error;
     56} ErrorMessage;

  • orxonox/trunk/src/game_loader.cc

    r3220 r3222  
    5050
    5151
    52 Error GameLoader::init()
     52ErrorMessage GameLoader::init()
    5353{
    5454  if(this->currentCampaign != NULL)
    … …  
    5757
    5858
    59 Error GameLoader::loadCampaign(char* name)
     59ErrorMessage GameLoader::loadCampaign(char* name)
    6060{
    61   Error errorCode;
     61  ErrorMessage errorCode;
    6262 
    6363  this->currentCampaign = this->fileToCampaign(name);
    6464}
    6565
    66 Error GameLoader::loadDebugCampaign(Uint32 campaignID)
     66ErrorMessage GameLoader::loadDebugCampaign(Uint32 campaignID)
    6767{
    6868  switch(campaignID)
    … …  
    8787}
    8888
    89 Error GameLoader::start()
     89ErrorMessage GameLoader::start()
    9090{
    9191  if(this->currentCampaign != NULL)
    … …  
    9494
    9595
    96 Error GameLoader::stop()
     96ErrorMessage GameLoader::stop()
    9797{
    9898  if(this->currentCampaign != NULL)
    … …  
    102102
    103103
    104 Error GameLoader::pause()
     104ErrorMessage GameLoader::pause()
    105105{
    106106  this->isPaused = true;
    … …  
    110110
    111111
    112 Error GameLoader::resume()
     112ErrorMessage GameLoader::resume()
    113113{
    114114  this->isPaused = false;
    … …  
    117117}
    118118
    119 Error GameLoader::free()
     119ErrorMessage GameLoader::free()
    120120{}
    121121

  • orxonox/trunk/src/game_loader.h

    r2636 r3222  
    2020  static GameLoader* getInstance();
    2121
    22   Error init();
    23   Error loadCampaign(char* name);
    24   Error start();
    25   Error stop();
    26   Error pause();
    27   Error resume();
    28   Error free();
     22  ErrorMessage init();
     23  ErrorMessage loadCampaign(char* name);
     24  ErrorMessage start();
     25  ErrorMessage stop();
     26  ErrorMessage pause();
     27  ErrorMessage resume();
     28  ErrorMessage free();
    2929
    3030  void nextLevel();
    … …  
    3232
    3333  bool worldCommand(Command* cmd);
    34   Error loadDebugCampaign(Uint32 campaignID);
     34  ErrorMessage loadDebugCampaign(Uint32 campaignID);
    3535 
    3636 private:

  • orxonox/trunk/src/story_entity.cc

    r3221 r3222  
    3535    this shifts the initialisation work before the execution - very important...
    3636*/
    37 Error StoryEntity::init()
     37ErrorMessage StoryEntity::init()
    3838{}
    3939
    … …  
    9393    storyID.
    9494*/
    95 Error StoryEntity::start(int storyID)
     95ErrorMessage StoryEntity::start(int storyID)
    9696{}
    9797
    … …  
    101101    \returns error code if this action has caused a error   
    102102*/
    103 Error StoryEntity::start()
     103ErrorMessage StoryEntity::start()
    104104{}
    105105
    … …  
    115115    hehehe, all seen... :)
    116116*/
    117 Error StoryEntity::stop()
     117ErrorMessage StoryEntity::stop()
    118118{}
    119119
    … …  
    125125    this pauses the current entity or passes this call forth to the running entity.
    126126*/
    127 Error StoryEntity::pause()
     127ErrorMessage StoryEntity::pause()
    128128{}
    129129
    … …  
    135135    this resumess the current entity or passes this call forth to the running entity.
    136136*/
    137 Error StoryEntity::resume()
     137ErrorMessage StoryEntity::resume()
    138138{}
    139139

  • orxonox/trunk/src/story_entity.h

    r3221 r3222  
    2121  bool isPaused; //! is true if the entity is paused
    2222
    23   virtual Error init();
    24   virtual Error start(int storyID);
    25   virtual Error start();
    26   virtual Error stop();
    27   virtual Error pause();
    28   virtual Error resume();
     23  virtual ErrorMessage init();
     24  virtual ErrorMessage start(int storyID);
     25  virtual ErrorMessage start();
     26  virtual ErrorMessage stop();
     27  virtual ErrorMessage pause();
     28  virtual ErrorMessage resume();
    2929
    3030  virtual void load();

  • orxonox/trunk/src/world.cc

    r3221 r3222  
    7575    \brief initialize the world before use.
    7676*/
    77 Error World::init()
     77ErrorMessage World::init()
    7878{
    7979  this->bPause = false;
    … …  
    8383}
    8484
    85 Error World::start()
     85ErrorMessage World::start()
    8686{
    8787  printf("World::start() - starting current World: nr %i\n", this->debugWorldNr);
    … …  
    9191}
    9292
    93 Error World::stop()
     93ErrorMessage World::stop()
    9494{
    9595  printf("World::stop() - got stop signal\n");
    … …  
    9797}
    9898
    99 Error World::pause()
     99ErrorMessage World::pause()
    100100{
    101101  this->isPaused = true;
    102102}
    103103
    104 Error World::resume()
     104ErrorMessage World::resume()
    105105{
    106106  this->isPaused = false;

  • orxonox/trunk/src/world.h

    r3221 r3222  
    2929    T* spawn(Placement* plc, WorldEntity* owner);
    3030 
    31   virtual Error init();
    32   virtual Error start();
    33   virtual Error stop();
    34   virtual Error pause();
    35   virtual Error resume();
     31  virtual ErrorMessage init();
     32  virtual ErrorMessage start();
     33  virtual ErrorMessage stop();
     34  virtual ErrorMessage pause();
     35  virtual ErrorMessage resume();
    3636
    3737  virtual void load();
Note: See TracChangeset for help on using the changeset viewer.