[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.647.2.3,1.647.2.4 scumm.cpp,1.603.2.12,1.603.2.13

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17889/scumm

Modified Files:
      Tag: branch-0-8-0
	scumm.h scumm.cpp 
Log Message:

Add Macintosh version of Baseball2003 & Soccer2004
Add missing Pajama Sam 1 demo
Remove duplicate entry.


Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.647.2.3
retrieving revision 1.647.2.4
diff -u -d -r1.647.2.3 -r1.647.2.4
--- scumm.h	21 Oct 2005 12:11:10 -0000	1.647.2.3
+++ scumm.h	26 Oct 2005 05:34:03 -0000	1.647.2.4
@@ -160,6 +160,13 @@
 	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;
 };
@@ -167,38 +174,6 @@
 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,
@@ -291,11 +266,6 @@
 	WIO_FLOBJECT = 4
 };
 
-struct LangIndexNode {
-	char tag[12+1];
-	int32 offset;
-};
-
 struct AuxBlock {
 	bool visible;
 	Common::Rect r;
@@ -312,12 +282,39 @@
 	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;
@@ -330,7 +327,9 @@
 	uint32 tags[rtNumTypes];
 	const char *name[rtNumTypes];
 	byte **address[rtNumTypes];
+protected:
 	byte *flags[rtNumTypes];
+public:
 	byte *roomno[rtNumTypes];
 	uint32 *roomoffs[rtNumTypes];
 	uint32 *globsize[rtNumTypes];
@@ -347,17 +346,20 @@
 
 	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 {
@@ -579,7 +581,7 @@
 
 	bool saveState(int slot, bool compat);
 	bool loadState(int slot, bool compat);
-	virtual void saveOrLoad(Serializer *s, uint32 savegameVersion);
+	virtual void saveOrLoad(Serializer *s);
 	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);

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.603.2.12
retrieving revision 1.603.2.13
diff -u -d -r1.603.2.12 -r1.603.2.13
--- scumm.cpp	26 Oct 2005 02:13:09 -0000	1.603.2.12
+++ scumm.cpp	26 Oct 2005 05:34:04 -0000	1.603.2.13
@@ -717,6 +717,7 @@
 	{ "baseball2001", "Baseball 2001 Demo", kGenMac },
 	{ "baseball2001", "Baseball 2001", kGenMac },
 	{ "baseball2001", "baseball 2001", kGenPC },
+	{ "Baseball2003", "Baseball 2003", kGenMac },
 	{ "basketball", "Basketball", kGenMac },
 	{ "BluesABCTimeDemo", "BluesABCTimeDemo", kGenMac },
 	{ "chase", "Cheese Chase", kGenMac },
@@ -768,6 +769,7 @@
 	{ "mustard", "Mustard", kGenMac },
 	{ "pajama", "Pajama Sam", kGenMac },
 	{ "pajama", "PajamaNHD", kGenPC },
+	{ "pajama", "PJS-DEMO", kGenPC },
 	{ "pajama", "SAMDEMO", kGenPC },
 	{ "pajama", "SAMDEMO", kGenMac }, // FR Mac demo
 	{ "pajama2", "Pajama Sam 2", kGenMac },
@@ -787,7 +789,6 @@
 	{ "pjgames", "PJGames", kGenMac },
 	{ "puttcircus", "circdemo", kGenPC },
 	{ "puttcircus", "Putt Circus Demo", kGenMac },
-	{ "puttcircus", "Putt Circus Demo", kGenMac },
 	{ "puttcircus", "Putt Circus", kGenMac },
 	{ "puttmoon", "moondemo", kGenPC },
 	{ "puttmoon", "Putt-Putt Moon Demo", kGenMacNoParens },
@@ -819,6 +820,7 @@
 	{ "puttzoo", "Zoo Demo", kGenMac },
 	{ "SamsFunShop", "Sam's FunShop", kGenMac },
 	{ "soccer", "Soccer", kGenMac },
+	{ "Soccer2004", "Soccer 2004", kGenMac },
 	{ "socks", "SockWorks", kGenMac },
 	{ "spyfox", "FoxDemo", kGenMac },
 	{ "spyfox", "foxdemo", kGenPC},