[Scummvm-cvs-logs] CVS: scummvm/scumm bundle.cpp,1.43,1.44 resource.cpp,1.109,1.110 string.cpp,1.149,1.150

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Jul 19 07:27:09 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv4794/scumm

Modified Files:
	bundle.cpp resource.cpp string.cpp 
Log Message:
added vc7 files and fixed warnings. vc6 is no longer supported by me

Index: bundle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bundle.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- bundle.cpp	27 Jun 2003 00:10:17 -0000	1.43
+++ bundle.cpp	19 Jul 2003 14:26:25 -0000	1.44
@@ -874,7 +874,7 @@
 
 				while (left--) {
 					curTableEntry = _destImcTable[curTablePos];
-					decompTable = curTableEntry - 2;
+					decompTable = (byte)(curTableEntry - 2);
 					bitMask = 2 << decompTable;
 					readPos = src + (tableEntrySum >> 3);
 					

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- resource.cpp	19 Jul 2003 11:49:05 -0000	1.109
+++ resource.cpp	19 Jul 2003 14:26:25 -0000	1.110
@@ -1141,10 +1141,10 @@
 		*ptr++ = 480 & 0xFF;
 
 		memcpy(ptr, "MTrk", 4); ptr += 4;
-		*ptr++ = ((sizeof(OLD256_MIDI_HACK) + size + 7) >> 24) & 0xFF;
-		*ptr++ = ((sizeof(OLD256_MIDI_HACK) + size + 7) >> 16) & 0xFF;
-		*ptr++ = ((sizeof(OLD256_MIDI_HACK) + size + 7) >>  8) & 0xFF;
-		*ptr++ = ((sizeof(OLD256_MIDI_HACK) + size + 7)      ) & 0xFF;
+		*ptr++ = (byte)(((sizeof(OLD256_MIDI_HACK) + size + 7) >> 24) & 0xFF);
+		*ptr++ = (byte)(((sizeof(OLD256_MIDI_HACK) + size + 7) >> 16) & 0xFF);
+		*ptr++ = (byte)(((sizeof(OLD256_MIDI_HACK) + size + 7) >>  8) & 0xFF);
+		*ptr++ = (byte)(((sizeof(OLD256_MIDI_HACK) + size + 7)      ) & 0xFF);
 
 		// Conver the ticks into a MIDI tempo. 
 		dw = (500000 * 256) / ticks;

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- string.cpp	15 Jul 2003 22:21:30 -0000	1.149
+++ string.cpp	19 Jul 2003 14:26:25 -0000	1.150
@@ -101,7 +101,7 @@
 
 			if (VAR(VAR_V5_TALK_STRING_Y) < 0) {
 				s = (a->scaley * (int)VAR(VAR_V5_TALK_STRING_Y)) / 0xFF;
-				_string[0].ypos = ((VAR(VAR_V5_TALK_STRING_Y) - s) >> 1) + s - a->elevation + a->y;
+				_string[0].ypos = (int)(((VAR(VAR_V5_TALK_STRING_Y) - s) >> 1) + s - a->elevation + a->y);
 			} else {
 				_string[0].ypos = (int)VAR(VAR_V5_TALK_STRING_Y);
 			}





More information about the Scummvm-git-logs mailing list