[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.3,1.4 rnc_deco.cpp,1.4,1.5
Pawel Kolodziejski
aquadran at users.sourceforge.net
Wed Mar 5 14:22:13 CET 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv21367
Modified Files:
disk.cpp rnc_deco.cpp
Log Message:
fixed compilation for VC6
Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- disk.cpp 5 Mar 2003 22:13:40 -0000 1.3
+++ disk.cpp 5 Mar 2003 22:21:23 -0000 1.4
@@ -30,7 +30,7 @@
#define no_of_files_cd 5200
#define max_files_in_list 60
-uint32 UnpackM1(void *, void *, uint16);
+int UnpackM1(void *, void *, uint16);
const char *data_file_name = "sky.dsk";
const char *dinner_file_name = "sky.dnr";
Index: rnc_deco.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rnc_deco.cpp 5 Mar 2003 21:50:41 -0000 1.4
+++ rnc_deco.cpp 5 Mar 2003 22:21:24 -0000 1.5
@@ -131,7 +131,7 @@
remBits = ROR((uint16)(((1 << amount) - 1) & newBitBuffh), amount);
bit_buffh = newBitBuffh >> amount;
bit_buffl = (newBitBuffl >> amount) | remBits;
- bit_count = newBitCount;
+ bit_count = (uint8)newBitCount;
return returnVal;
More information about the Scummvm-git-logs
mailing list