libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change to int32 for safety.

Browse Source 
svn-id: r20383
This commit is contained in:
Travis Howell 2006-02-05 00:50:03 +00:00
parent df3d553e32
commit 937a5f8af5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/intern_he.h
View File

@ -262,7 +262,7 @@ protected:
void copyArrayHelper(ArrayHeader *ah, int idx2, int idx1, int len1, byte **data, int *size, int *num); void copyArrayHelper(ArrayHeader *ah, int idx2, int idx1, int len1, byte **data, int *size, int *num);
virtual int setupStringArray(int size); virtual int setupStringArray(int size);
int readFileToArray(int slot, int32 size); int readFileToArray(int slot, int32 size);
void writeFileFromArray(int slot, int resID); void writeFileFromArray(int slot, int32 resID);
virtual void decodeParseString(int a, int b); virtual void decodeParseString(int a, int b);
void decodeScriptString(byte *dst, bool scriptString = false); void decodeScriptString(byte *dst, bool scriptString = false);

4
scumm/script_v100he.cpp
View File

@ -765,7 +765,7 @@ void ScummEngine_v100he::o100_dim2dimArray() {
void ScummEngine_v100he::o100_dimArray() { void ScummEngine_v100he::o100_dimArray() {
int data; int data;
int subOp = fetchScriptByte(); byte subOp = fetchScriptByte();
switch (subOp) { switch (subOp) {
case 41: // SO_BIT_ARRAY case 41: // SO_BIT_ARRAY
@ -2853,7 +2853,7 @@ void ScummEngine_v100he::o100_getSpriteInfo() {
void ScummEngine_v100he::o100_getVideoData() { void ScummEngine_v100he::o100_getVideoData() {
// Uses Bink video // Uses Bink video
int subOp = fetchScriptByte(); byte subOp = fetchScriptByte();
subOp -= 26; subOp -= 26;
switch (subOp) { switch (subOp) {

4
scumm/script_v72he.cpp
View File

@ -1851,7 +1851,7 @@ void ScummEngine_v72he::o72_readFile() {
debug(1, "o72_readFile: slot %d, subOp %d val %d", slot, subOp, val); debug(1, "o72_readFile: slot %d, subOp %d val %d", slot, subOp, val);
} }
void ScummEngine_v72he::writeFileFromArray(int slot, int resID) { void ScummEngine_v72he::writeFileFromArray(int slot, int32 resID) {
ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, resID); ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, resID);
int32 size = (FROM_LE_32(ah->dim1end) - FROM_LE_32(ah->dim1start) + 1) * int32 size = (FROM_LE_32(ah->dim1end) - FROM_LE_32(ah->dim1start) + 1) *
(FROM_LE_32(ah->dim2end) - FROM_LE_32(ah->dim2start) + 1); (FROM_LE_32(ah->dim2end) - FROM_LE_32(ah->dim2start) + 1);
@ -1860,7 +1860,7 @@ void ScummEngine_v72he::writeFileFromArray(int slot, int resID) {
} }
void ScummEngine_v72he::o72_writeFile() { void ScummEngine_v72he::o72_writeFile() {
int resID = pop(); int32 resID = pop();
int slot = pop(); int slot = pop();
byte subOp = fetchScriptByte(); byte subOp = fetchScriptByte();