mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-31 07:53:36 +00:00
Change to int32 for safety.
svn-id: r20383
This commit is contained in:
parent
df3d553e32
commit
937a5f8af5
@ -262,7 +262,7 @@ protected:
|
||||
void copyArrayHelper(ArrayHeader *ah, int idx2, int idx1, int len1, byte **data, int *size, int *num);
|
||||
virtual int setupStringArray(int 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);
|
||||
void decodeScriptString(byte *dst, bool scriptString = false);
|
||||
|
@ -765,7 +765,7 @@ void ScummEngine_v100he::o100_dim2dimArray() {
|
||||
void ScummEngine_v100he::o100_dimArray() {
|
||||
int data;
|
||||
|
||||
int subOp = fetchScriptByte();
|
||||
byte subOp = fetchScriptByte();
|
||||
|
||||
switch (subOp) {
|
||||
case 41: // SO_BIT_ARRAY
|
||||
@ -2853,7 +2853,7 @@ void ScummEngine_v100he::o100_getSpriteInfo() {
|
||||
|
||||
void ScummEngine_v100he::o100_getVideoData() {
|
||||
// Uses Bink video
|
||||
int subOp = fetchScriptByte();
|
||||
byte subOp = fetchScriptByte();
|
||||
subOp -= 26;
|
||||
|
||||
switch (subOp) {
|
||||
|
@ -1851,7 +1851,7 @@ void ScummEngine_v72he::o72_readFile() {
|
||||
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);
|
||||
int32 size = (FROM_LE_32(ah->dim1end) - FROM_LE_32(ah->dim1start) + 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() {
|
||||
int resID = pop();
|
||||
int32 resID = pop();
|
||||
int slot = pop();
|
||||
byte subOp = fetchScriptByte();
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user