[Scummvm-cvs-logs] CVS: scummvm/scumm script_v90he.cpp,2.208,2.209
Gregory Montoir
cyx at users.sourceforge.net
Sat Apr 2 09:30:28 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush chunk.cpp,1.33,1.34
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.111,1.112 isomap.cpp,1.41,1.42 scene.cpp,1.94,1.95 scene.h,1.48,1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21919/scumm
Modified Files:
script_v90he.cpp
Log Message:
forgot casts
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.208
retrieving revision 2.209
diff -u -d -r2.208 -r2.209
--- script_v90he.cpp 2 Apr 2005 17:19:44 -0000 2.208
+++ script_v90he.cpp 2 Apr 2005 17:29:53 -0000 2.209
@@ -1992,26 +1992,26 @@
}
static int compareIntArray(const void *a, const void *b) {
- int va = READ_LE_UINT16((const uint8 *)a + sortArrayOffset * 2);
- int vb = READ_LE_UINT16((const uint8 *)b + sortArrayOffset * 2);
+ int va = (int16)READ_LE_UINT16((const uint8 *)a + sortArrayOffset * 2);
+ int vb = (int16)READ_LE_UINT16((const uint8 *)b + sortArrayOffset * 2);
return va - vb;
}
static int compareIntArrayReverse(const void *a, const void *b) {
- int va = READ_LE_UINT16((const uint8 *)a + sortArrayOffset * 2);
- int vb = READ_LE_UINT16((const uint8 *)b + sortArrayOffset * 2);
+ int va = (int16)READ_LE_UINT16((const uint8 *)a + sortArrayOffset * 2);
+ int vb = (int16)READ_LE_UINT16((const uint8 *)b + sortArrayOffset * 2);
return vb - va;
}
static int compareDwordArray(const void *a, const void *b) {
- int va = READ_LE_UINT32((const uint8 *)a + sortArrayOffset * 4);
- int vb = READ_LE_UINT32((const uint8 *)b + sortArrayOffset * 4);
+ int va = (int32)READ_LE_UINT32((const uint8 *)a + sortArrayOffset * 4);
+ int vb = (int32)READ_LE_UINT32((const uint8 *)b + sortArrayOffset * 4);
return va - vb;
}
static int compareDwordArrayReverse(const void *a, const void *b) {
- int va = READ_LE_UINT32((const uint8 *)a + sortArrayOffset * 4);
- int vb = READ_LE_UINT32((const uint8 *)b + sortArrayOffset * 4);
+ int va = (int32)READ_LE_UINT32((const uint8 *)a + sortArrayOffset * 4);
+ int vb = (int32)READ_LE_UINT32((const uint8 *)b + sortArrayOffset * 4);
return vb - va;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush chunk.cpp,1.33,1.34
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.111,1.112 isomap.cpp,1.41,1.42 scene.cpp,1.94,1.95 scene.h,1.48,1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list