diff options
author | krzys-h <krzys_h@interia.pl> | 2013-04-13 11:44:16 +0200 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2013-04-13 11:44:16 +0200 |
commit | ebffda717b1b633baba7a313267505614f89f26e (patch) | |
tree | 58450559d64938e2d98af4bdf746ffd7fb91e995 /src/object/robotmain.h | |
parent | 69e52e5f24d3e02dde20bda5ee322697bafc92c8 (diff) | |
download | colobot-ebffda717b1b633baba7a313267505614f89f26e.tar.gz colobot-ebffda717b1b633baba7a313267505614f89f26e.tar.bz2 colobot-ebffda717b1b633baba7a313267505614f89f26e.zip |
Implemented AudioChange (partially)
There is some issues due to #173
Issue #172
Diffstat (limited to 'src/object/robotmain.h')
-rw-r--r-- | src/object/robotmain.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/object/robotmain.h b/src/object/robotmain.h index fc62072..d3b18bc 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -99,13 +99,25 @@ struct EndTake Math::Vector pos; float dist; ObjectType type; - int min; // wins if> + int min; // wins if > int max; // wins if < int lost; // lost if <= bool immediat; char message[100]; }; +struct AudioChange +{ + Math::Vector pos; + float dist; + ObjectType type; + int min; // change if > + int max; // change if < + char music[100]; + bool repeat; + bool changed; +}; + const int MAXNEWSCRIPTNAME = 20; @@ -248,6 +260,7 @@ public: void ResetObject(); void ResetCreate(); + void UpdateAudio(bool frame); Error CheckEndMission(bool frame); void CheckEndMessage(const char* message); int GetObligatoryToken(); @@ -522,6 +535,9 @@ protected: long m_endTakeResearch; float m_endTakeWinDelay; float m_endTakeLostDelay; + + int m_audioChangeTotal; + AudioChange m_audioChange[10]; int m_obligatoryTotal; char m_obligatoryToken[100][20]; |