diff options
author | Kari Salminen | 2008-07-22 12:17:44 +0000 |
---|---|---|
committer | Kari Salminen | 2008-07-22 12:17:44 +0000 |
commit | a38234d6e6f564b3eb6ed7db63bd907fc1d695fb (patch) | |
tree | 6cc2defcb562c7f5027d79f656df965aabe1c5da /engines | |
parent | cc0f95ce744b4078b3399e196101c239b7b094c9 (diff) | |
download | scummvm-rg350-a38234d6e6f564b3eb6ed7db63bd907fc1d695fb.tar.gz scummvm-rg350-a38234d6e6f564b3eb6ed7db63bd907fc1d695fb.tar.bz2 scummvm-rg350-a38234d6e6f564b3eb6ed7db63bd907fc1d695fb.zip |
Fix CineSaveGameFormat enumeration's include order (Caused problems at least with GCC).
svn-id: r33196
Diffstat (limited to 'engines')
-rw-r--r-- | engines/cine/anim.h | 33 | ||||
-rw-r--r-- | engines/cine/various.h | 33 |
2 files changed, 33 insertions, 33 deletions
diff --git a/engines/cine/anim.h b/engines/cine/anim.h index f32a146e35..c04513149c 100644 --- a/engines/cine/anim.h +++ b/engines/cine/anim.h @@ -28,6 +28,39 @@ namespace Cine { +/** + * Cine engine's save game formats. + * Enumeration entries (Excluding the one used as an error) + * are sorted according to age (i.e. top one is oldest, last one newest etc). + * + * ANIMSIZE_UNKNOWN: + * - Animation data entry size is unknown (Used as an error). + * + * ANIMSIZE_23: + * - Animation data entry size is 23 bytes. + * - Used at least by 0.11.0 and 0.11.1 releases of ScummVM. + * - Introduced in revision 21772, stopped using in revision 31444. + * + * ANIMSIZE_30_PTRS_BROKEN: + * - Animation data entry size is 30 bytes. + * - Data and mask pointers in the saved structs are always NULL. + * - Introduced in revision 31453, stopped using in revision 32073. + * + * ANIMSIZE_30_PTRS_INTACT: + * - Animation data entry size is 30 bytes. + * - Data and mask pointers in the saved structs are intact, + * so you can test them for equality or inequality with NULL + * but don't try using them for anything else, it won't work. + * - Introduced in revision 31444, got broken in revision 31453, + * got fixed in revision 32073 and used after that. + */ +enum CineSaveGameFormat { + ANIMSIZE_UNKNOWN, + ANIMSIZE_23, + ANIMSIZE_30_PTRS_BROKEN, + ANIMSIZE_30_PTRS_INTACT +}; + struct AnimHeaderStruct { byte field_0; byte field_1; diff --git a/engines/cine/various.h b/engines/cine/various.h index 9507876307..840f1674a2 100644 --- a/engines/cine/various.h +++ b/engines/cine/various.h @@ -33,39 +33,6 @@ namespace Cine { -/** - * Cine engine's save game formats. - * Enumeration entries (Excluding the one used as an error) - * are sorted according to age (i.e. top one is oldest, last one newest etc). - * - * ANIMSIZE_UNKNOWN: - * - Animation data entry size is unknown (Used as an error). - * - * ANIMSIZE_23: - * - Animation data entry size is 23 bytes. - * - Used at least by 0.11.0 and 0.11.1 releases of ScummVM. - * - Introduced in revision 21772, stopped using in revision 31444. - * - * ANIMSIZE_30_PTRS_BROKEN: - * - Animation data entry size is 30 bytes. - * - Data and mask pointers in the saved structs are always NULL. - * - Introduced in revision 31453, stopped using in revision 32073. - * - * ANIMSIZE_30_PTRS_INTACT: - * - Animation data entry size is 30 bytes. - * - Data and mask pointers in the saved structs are intact, - * so you can test them for equality or inequality with NULL - * but don't try using them for anything else, it won't work. - * - Introduced in revision 31444, got broken in revision 31453, - * got fixed in revision 32073 and used after that. - */ -enum CineSaveGameFormat { - ANIMSIZE_UNKNOWN, - ANIMSIZE_23, - ANIMSIZE_30_PTRS_BROKEN, - ANIMSIZE_30_PTRS_INTACT -}; - void initLanguage(Common::Language lang); int16 makeMenuChoice(const CommandeType commandList[], uint16 height, uint16 X, uint16 Y, uint16 width, bool recheckValue = false); |