aboutsummaryrefslogtreecommitdiff
path: root/scumm/resource.h
diff options
context:
space:
mode:
authorMax Horn2004-11-27 13:13:41 +0000
committerMax Horn2004-11-27 13:13:41 +0000
commit90e3fa96a33b9ba78130c5a319611e12827f088b (patch)
tree86a7465af9767dff1dbb42d28aae98d83b3b8bac /scumm/resource.h
parentdce059eebf0d329de2d8a142782c366cfb11eaed (diff)
downloadscummvm-rg350-90e3fa96a33b9ba78130c5a319611e12827f088b.tar.gz
scummvm-rg350-90e3fa96a33b9ba78130c5a319611e12827f088b.tar.bz2
scummvm-rg350-90e3fa96a33b9ba78130c5a319611e12827f088b.zip
Make Array stuff part of the V6 engine class (note: it's a bit confusing to have two different ArrayHeader structs, maybe we should rename them?)
svn-id: r15909
Diffstat (limited to 'scumm/resource.h')
-rw-r--r--scumm/resource.h24
1 files changed, 0 insertions, 24 deletions
diff --git a/scumm/resource.h b/scumm/resource.h
index 968f700f97..6f8e708086 100644
--- a/scumm/resource.h
+++ b/scumm/resource.h
@@ -23,30 +23,6 @@
namespace Scumm {
-enum ArrayType {
- kBitArray = 1,
- kNibbleArray = 2,
- kByteArray = 3,
- kStringArray = 4,
- kIntArray = 5,
- kDwordArray = 6
-};
-
-#if !defined(__GNUC__)
- #pragma START_PACK_STRUCTS
-#endif
-
-struct ArrayHeader {
- int16 dim1;
- int16 type;
- int16 dim2;
- byte data[1];
-} GCC_PACK;
-
-#if !defined(__GNUC__)
- #pragma END_PACK_STRUCTS
-#endif
-
enum {
OF_OWNER_MASK = 0x0F,
OF_STATE_MASK = 0xF0,