Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 20, 2005, 12:42:37 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/levelLoader.tmp: some merges

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/levelLoader.tmp/src/game_loader.h

    r3629 r3903  
    99//#include "stdincl.h"
    1010#include "story_def.h"
     11#include "factory.h"
    1112#include "comincl.h"
     13#include "error.h"
    1214
    1315//-----------------------------------------------------------------------------
     
    5153  ErrorMessage loadDebugCampaign(Uint32 campaignID);
    5254 
     55  void registerFactory( Factory* factory);
     56  BaseObject* fabricate( TiXmlElement* data);
     57 
    5358 private:
    5459  GameLoader ();
     
    6267  Campaign* fileToCampaign(char* name);
    6368
     69  Factory* first;
    6470};
    6571
Note: See TracChangeset for help on using the changeset viewer.