[Scummvm-cvs-logs] SF.net SVN: scummvm:[33196] scummvm/trunk/engines/cine
buddha_ at users.sourceforge.net
buddha_ at users.sourceforge.net
Tue Jul 22 14:17:45 CEST 2008
Revision: 33196
http://scummvm.svn.sourceforge.net/scummvm/?rev=33196&view=rev
Author: buddha_
Date: 2008-07-22 12:17:44 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Fix CineSaveGameFormat enumeration's include order (Caused problems at least with GCC).
Modified Paths:
--------------
scummvm/trunk/engines/cine/anim.h
scummvm/trunk/engines/cine/various.h
Modified: scummvm/trunk/engines/cine/anim.h
===================================================================
--- scummvm/trunk/engines/cine/anim.h 2008-07-22 12:07:03 UTC (rev 33195)
+++ scummvm/trunk/engines/cine/anim.h 2008-07-22 12:17:44 UTC (rev 33196)
@@ -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;
Modified: scummvm/trunk/engines/cine/various.h
===================================================================
--- scummvm/trunk/engines/cine/various.h 2008-07-22 12:07:03 UTC (rev 33195)
+++ scummvm/trunk/engines/cine/various.h 2008-07-22 12:17:44 UTC (rev 33196)
@@ -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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list