[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.281,2.282 script_v6he.cpp,2.128,2.129

[Max Horn]

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

Modified Files:
	intern.h script_v6he.cpp 
Log Message:
Turned some methods into static functions

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.281
retrieving revision 2.282
diff -u -d -r2.281 -r2.282
--- intern.h	2 Oct 2004 01:40:34 -0000	2.281
+++ intern.h	2 Oct 2004 22:23:59 -0000	2.282
@@ -553,16 +553,6 @@
 		OpcodeProcv60he proc;
 		const char *desc;
 	};
-	struct vsUnpackCtx {
-		uint8 size;
-		uint8 type;
-		uint8 b;
-		uint8 *ptr;
-	};
-	struct vsPackCtx {
-		int size;
-		uint8 buf[256];
-	};
 
 	const OpcodeEntryv60he *_opcodesv60he;
 
@@ -584,10 +574,7 @@
 	void writeFileFromArray(int slot, int resID);
 	int virtScreenSave(byte *dst, int x1, int y1, int x2, int y2);
 	int virtScreenSavePack(byte *dst, byte *src, int len, int unk);
-	void virtScreenSavePackBuf(vsPackCtx *ctx, uint8 *&dst, int len);
-	void virtScreenSavePackByte(vsPackCtx *ctx, uint8 *&dst, int len, uint8 b);
 	void virtScreenLoad(int resIdx, int x1, int y1, int x2, int y2);
-	uint8 virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data);
 	void seekFilePos(int slot, int offset, int mode);
 	virtual void decodeParseString(int a, int b);
 	void swapObjects(int object1, int object2);

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.128
retrieving revision 2.129
diff -u -d -r2.128 -r2.129
--- script_v6he.cpp	28 Sep 2004 19:28:58 -0000	2.128
+++ script_v6he.cpp	2 Oct 2004 22:23:59 -0000	2.129
@@ -40,6 +40,22 @@
 
 namespace Scumm {
 
+struct vsUnpackCtx {
+	uint8 size;
+	uint8 type;
+	uint8 b;
+	uint8 *ptr;
+};
+
+struct vsPackCtx {
+	int size;
+	uint8 buf[256];
+};
+
+static void virtScreenSavePackBuf(vsPackCtx *ctx, uint8 *&dst, int len);
+static void virtScreenSavePackByte(vsPackCtx *ctx, uint8 *&dst, int len, uint8 b);
+static uint8 virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data);
+
 // Compatibility notes:
 //
 // FBEAR (fbear, fbeardemo)
@@ -832,7 +848,7 @@
 	markRectAsDirty(kMainVirtScreen, x1, x2, y1, y2 + 1); // XXX , 0x4000);
 }
 
-uint8 ScummEngine_v60he::virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data) {
+uint8 virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data) {
 	uint8 decByte;
 	if (data != 0) {
 		ctx->type = 0;
@@ -965,7 +981,7 @@
 	return ctx.size;
 }
 
-void ScummEngine_v60he::virtScreenSavePackBuf(vsPackCtx *ctx, uint8 *&dst, int len) {
+void virtScreenSavePackBuf(vsPackCtx *ctx, uint8 *&dst, int len) {
 	if (dst) {
 		*dst++ = (len - 1) * 2;
 	}
@@ -979,7 +995,7 @@
 	}
 }
 
-void ScummEngine_v60he::virtScreenSavePackByte(vsPackCtx *ctx, uint8 *&dst, int len, uint8 b) {
+void virtScreenSavePackByte(vsPackCtx *ctx, uint8 *&dst, int len, uint8 b) {
 	if (dst) {
 		*dst++ = ((len - 1) * 2) | 1;
 	}