diff options
| author | Kari Salminen | 2007-08-14 13:36:03 +0000 |
|---|---|---|
| committer | Kari Salminen | 2007-08-14 13:36:03 +0000 |
| commit | e888aa1217acc8da8b49ef44da4d71dd1df71e27 (patch) | |
| tree | db9305b14db6061f389d8542e6b085c08b32da3b | |
| parent | f55c8407b0bb2ad20c984ed6c3254e6438e6f939 (diff) | |
| download | scummvm-rg350-e888aa1217acc8da8b49ef44da4d71dd1df71e27.tar.gz scummvm-rg350-e888aa1217acc8da8b49ef44da4d71dd1df71e27.tar.bz2 scummvm-rg350-e888aa1217acc8da8b49ef44da4d71dd1df71e27.zip | |
Shuffled around AgiGameID's declaration and an include to get stuff hopefully working now with GCC too.
svn-id: r28616
| -rw-r--r-- | engines/agi/agi.h | 40 | ||||
| -rw-r--r-- | engines/agi/sound.h | 3 |
2 files changed, 21 insertions, 22 deletions
diff --git a/engines/agi/agi.h b/engines/agi/agi.h index f37b61478e..72682ab0c2 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -88,6 +88,26 @@ typedef signed int Err; #define ADD_PIC 1 #define ADD_VIEW 2 +enum AgiGameID { + GID_AGIDEMO, + GID_BC, + GID_DDP, + GID_GOLDRUSH, + GID_KQ1, + GID_KQ2, + GID_KQ3, + GID_KQ4, + GID_LSL1, + GID_MH1, + GID_MH2, + GID_MIXEDUP, + GID_PQ1, + GID_SQ1, + GID_SQ2, + GID_XMASCARD, + GID_FANMADE // TODO: Should this be extended to include all fanmade games? +}; + } // End of namespace Agi /* AGI resources */ @@ -116,26 +136,6 @@ enum AgiGameFeatures { GF_ESCPAUSE = (1 << 8) }; -enum AgiGameID { - GID_AGIDEMO, - GID_BC, - GID_DDP, - GID_GOLDRUSH, - GID_KQ1, - GID_KQ2, - GID_KQ3, - GID_KQ4, - GID_LSL1, - GID_MH1, - GID_MH2, - GID_MIXEDUP, - GID_PQ1, - GID_SQ1, - GID_SQ2, - GID_XMASCARD, - GID_FANMADE // TODO: Should this be extended to include all fanmade games? -}; - struct AGIGameDescription; enum { diff --git a/engines/agi/sound.h b/engines/agi/sound.h index ba40e979c3..b2201a3f67 100644 --- a/engines/agi/sound.h +++ b/engines/agi/sound.h @@ -26,13 +26,12 @@ #ifndef AGI_SOUND_H #define AGI_SOUND_H +#include "agi/agi.h" #include "sound/audiostream.h" #include "sound/mixer.h" namespace Agi { -enum AgiGameID; // Forward declaration because agi.h has this but includes sound.h first - #define BUFFER_SIZE 410 #define SOUND_EMU_NONE 0 |