Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4178 in orxonox.OLD for orxonox/branches/physics/src/game_loader.h


Ignore:
Timestamp:
May 13, 2005, 11:16:33 PM (20 years ago)
Author:
bensch
Message:

orxonox/branches/physics: merged the Trunk into the physics Branche again:
merged with command:
svn merge ../trunk physics -r 3953:HEAD
no important conflicts

Location:
orxonox/branches/physics
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/physics

    • Property svn:externals

      •  

        old new  
        1 data http://svn.orxonox.ethz.ch/data
         1

  • orxonox/branches/physics/src/game_loader.h

    r3629 r4178  
    1010#include "story_def.h"
    1111#include "comincl.h"
     12
    1213
    1314//-----------------------------------------------------------------------------
    … …  
    5152  ErrorMessage loadDebugCampaign(Uint32 campaignID);
    5253 
     54  void registerFactory( Factory* factory);
     55  BaseObject* fabricate( TiXmlElement* data);
     56
    5357 private:
    5458  GameLoader ();
    … …  
    6064  Campaign* currentCampaign; //!> the current campaign playing
    6165 
    62   Campaign* fileToCampaign(char* name);
     66  Campaign* fileToCampaign(const char* name);
    6367
     68  Factory* first;
    6469};
    6570
Note: See TracChangeset for help on using the changeset viewer.