[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.647.2.4,1.647.2.5
kirben
kirben at users.sourceforge.net
Tue Oct 25 22:41:58 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19457/scumm
Modified Files:
Tag: branch-0-8-0
scumm.h
Log Message:
Ooops, copied wrong file.
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.647.2.4
retrieving revision 1.647.2.5
diff -u -d -r1.647.2.4 -r1.647.2.5
--- scumm.h 26 Oct 2005 05:34:03 -0000 1.647.2.4
+++ scumm.h 26 Oct 2005 05:40:24 -0000 1.647.2.5
@@ -160,13 +160,6 @@
DEBUG_SMUSH = 1 << 10 // Track SMUSH
};
-/**
- * Internal header for any memory block allocated by the resource manager.
- *
- * @todo Hide MemBlkHeader; no code outside the resource manager should
- * have to use it, ever. Currently script code needs it to detect whether
- * some scripts have moved (in fetchScriptByte()).
- */
struct MemBlkHeader {
uint32 size;
};
@@ -174,6 +167,38 @@
struct VerbSlot;
struct ObjectData;
+struct V2MouseoverBox {
+ Common::Rect rect;
+ byte color;
+ byte hicolor;
+};
+
+enum ResTypes {
+ rtFirst = 1,
+ rtRoom = 1,
+ rtScript = 2,
+ rtCostume = 3,
+ rtSound = 4,
+ rtInventory = 5,
+ rtCharset = 6,
+ rtString = 7,
+ rtVerb = 8,
+ rtActorName = 9,
+ rtBuffer = 10,
+ rtScaleTable = 11,
+ rtTemp = 12,
+ rtFlObject = 13,
+ rtMatrix = 14,
+ rtBox = 15,
+ rtObjectName = 16,
+ rtRoomScripts = 17,
+ rtRoomImage = 18,
+ rtImage = 19,
+ rtTalkie = 20,
+ rtLast = 20,
+ rtNumTypes = 21
+};
+
enum {
LIGHTMODE_dark = 0,
LIGHTMODE_actor_base = 1,
@@ -266,6 +291,11 @@
WIO_FLOBJECT = 4
};
+struct LangIndexNode {
+ char tag[12+1];
+ int32 offset;
+};
+
struct AuxBlock {
bool visible;
Common::Rect r;
@@ -282,39 +312,12 @@
int subIndex;
};
-// TODO: Rename InfoStuff to something more descriptive
struct InfoStuff {
uint32 date;
uint16 time;
uint32 playtime;
};
-enum ResTypes {
- rtFirst = 1,
- rtRoom = 1,
- rtScript = 2,
- rtCostume = 3,
- rtSound = 4,
- rtInventory = 5,
- rtCharset = 6,
- rtString = 7,
- rtVerb = 8,
- rtActorName = 9,
- rtBuffer = 10,
- rtScaleTable = 11,
- rtTemp = 12,
- rtFlObject = 13,
- rtMatrix = 14,
- rtBox = 15,
- rtObjectName = 16,
- rtRoomScripts = 17,
- rtRoomImage = 18,
- rtImage = 19,
- rtTalkie = 20,
- rtLast = 20,
- rtNumTypes = 21
-};
-
class ResourceManager {
friend class ScummDebugger;
friend class ScummEngine;
@@ -327,9 +330,7 @@
uint32 tags[rtNumTypes];
const char *name[rtNumTypes];
byte **address[rtNumTypes];
-protected:
byte *flags[rtNumTypes];
-public:
byte *roomno[rtNumTypes];
uint32 *roomoffs[rtNumTypes];
uint32 *globsize[rtNumTypes];
@@ -346,20 +347,17 @@
void freeResources();
+ bool validateResource(const char *str, int type, int index) const;
bool isResourceLoaded(int type, int index) const;
void lock(int type, int i);
void unlock(int type, int i);
- bool isLocked(int type, int i) const;
void setResourceCounter(int type, int index, byte flag);
void increaseResourceCounter();
void resourceStats();
void expireResources(uint32 size);
-
-protected:
- bool validateResource(const char *str, int type, int index) const;
};
class ScummEngine : public Engine {
@@ -581,7 +579,7 @@
bool saveState(int slot, bool compat);
bool loadState(int slot, bool compat);
- virtual void saveOrLoad(Serializer *s);
+ virtual void saveOrLoad(Serializer *s, uint32 savegameVersion);
void saveLoadResource(Serializer *ser, int type, int index); // "Obsolete"
void saveResource(Serializer *ser, int type, int index);
void loadResource(Serializer *ser, int type, int index);
More information about the Scummvm-git-logs
mailing list