diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2013-06-16 21:39:21 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2013-06-16 21:54:36 +0200 |
commit | 7874aca10ce6da823f88e8aabe4a0ea6431cc480 (patch) | |
tree | 6ab2e5e4dd0dcb4263701ca44a1edf08b0f101f7 /src/object/robotmain.h | |
parent | 7cf88118885699a23daa4768285d512fc06d5a2a (diff) | |
download | colobot-7874aca10ce6da823f88e8aabe4a0ea6431cc480.tar.gz colobot-7874aca10ce6da823f88e8aabe4a0ea6431cc480.tar.bz2 colobot-7874aca10ce6da823f88e8aabe4a0ea6431cc480.zip |
Enhanced logging, option to auto-start mission
* added logging of application events
* changed debug mode flag to independent debug modes
* added option to auto-start mission (load a mission immediately
after startup)
* removed "enum value out of range" prints
* some refactoring
Diffstat (limited to 'src/object/robotmain.h')
-rw-r--r-- | src/object/robotmain.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/object/robotmain.h b/src/object/robotmain.h index a75509d..04efea7 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -199,6 +199,9 @@ public: Ui::CInterface* GetInterface(); Ui::CDisplayText* GetDisplayText(); + //! Caused the given mission to be loaded immediately after start + void LoadSceneOnStart(const std::string& name, int rank); + void CreateIni(); //! Sets the default input bindings (key and axes) @@ -226,7 +229,7 @@ public: void ResetKeyStates(); void ChangePhase(Phase phase); - bool EventProcess(Event &event); + bool ProcessEvent(Event &event); bool CreateShortcuts(); void ScenePerso(); |