[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.390,2.391 script_v100he.cpp,2.64,2.65 script_v90he.cpp,2.159,2.160 sprite_he.cpp,1.58,1.59

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Feb 25 12:20:36 CET 2005


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

Modified Files:
	gfx.cpp script_v100he.cpp script_v90he.cpp sprite_he.cpp 
Log Message:
fixed compilation for emsvc4

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.390
retrieving revision 2.391
diff -u -d -r2.390 -r2.391
--- gfx.cpp	22 Feb 2005 18:24:00 -0000	2.390
+++ gfx.cpp	25 Feb 2005 20:14:57 -0000	2.391
@@ -578,7 +578,7 @@
 void Gdi::ditherHerc(byte *src, byte *hercbuf, int srcPitch, int *x, int *y, int *width, int *height) const {
 	byte *srcptr, *dstptr;
 	int xo = *x, yo = *y, widtho = *width, heighto = *height;
-	int idx1, idx2, dsty = 0;
+	int idx1, idx2, dsty = 0, y1;
 	static const byte cgaDither[2][2][16] = {
 		{{0, 1, 0, 1, 2, 2, 0, 0, 3, 1, 3, 1, 3, 2, 1, 3},
 		 {0, 0, 1, 1, 0, 2, 2, 3, 0, 3, 1, 1, 3, 3, 1, 3}},
@@ -586,7 +586,7 @@
 		 {0, 1, 0, 1, 2, 2, 0, 0, 3, 1, 1, 1, 3, 2, 1, 3}}};
 
 	// calculate dsty
-	for (int y1 = 0; y1 < yo; y1++) {
+	for (y1 = 0; y1 < yo; y1++) {
 		dsty += 2;
 		if (y1 % 4 == 3)
 			dsty--;
@@ -596,7 +596,7 @@
 	*width *= 2;
 	*height = 0;
 
-	for (int y1 = 0; y1 < heighto;) {
+	for (y1 = 0; y1 < heighto;) {
 		srcptr = src + y1 * srcPitch;
 		dstptr = hercbuf + dsty * Common::kHercW + xo * 2;
 

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.64
retrieving revision 2.65
diff -u -d -r2.64 -r2.65
--- script_v100he.cpp	25 Feb 2005 15:19:03 -0000	2.64
+++ script_v100he.cpp	25 Feb 2005 20:15:00 -0000	2.65
@@ -1582,7 +1582,8 @@
 
 void ScummEngine_v100he::o100_setSpriteInfo() {
 	int args[16];
-	int spriteId, n, tmp[2];
+	int spriteId, n;
+	int32 tmp[2];
 	static int storedFields[2];
 	byte string[80];
 

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.159
retrieving revision 2.160
diff -u -d -r2.159 -r2.160
--- script_v90he.cpp	25 Feb 2005 15:19:03 -0000	2.159
+++ script_v90he.cpp	25 Feb 2005 20:15:01 -0000	2.160
@@ -955,7 +955,8 @@
 
 void ScummEngine_v90he::o90_setSpriteInfo() {
 	int args[16];
-	int spriteId, tmp[2];
+	int spriteId;
+	int32 tmp[2];
 	static int storedFields[2];
 	int n;
 

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- sprite_he.cpp	25 Feb 2005 15:19:03 -0000	1.58
+++ sprite_he.cpp	25 Feb 2005 20:15:01 -0000	1.59
@@ -1227,7 +1227,7 @@
 	int res_id, res_state;
 	Common::Rect *bboxPtr;
 	int rot_angle, zoom;
-	int w, h;
+	int32 w, h;
 	WizParameters wiz;
 
 	if (!_numSpritesToProcess)





More information about the Scummvm-git-logs mailing list