diff options
author | yinsimei | 2017-05-27 20:16:54 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2017-07-13 18:27:45 +0200 |
commit | 45dcfdfc0bad326800618d4d3edfd772d53c9fc6 (patch) | |
tree | 28ac6da0023fa94cb1c756ea77e50c1b2cbf9d6e /engines/sludge/objtypes.cpp | |
parent | f5b4cf680371b5b2098c766361b5efc6e0a68e91 (diff) | |
download | scummvm-rg350-45dcfdfc0bad326800618d4d3edfd772d53c9fc6.tar.gz scummvm-rg350-45dcfdfc0bad326800618d4d3edfd772d53c9fc6.tar.bz2 scummvm-rg350-45dcfdfc0bad326800618d4d3edfd772d53c9fc6.zip |
SLUDGE: Replace standard file reading functions by Common functions
Diffstat (limited to 'engines/sludge/objtypes.cpp')
-rw-r--r-- | engines/sludge/objtypes.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/engines/sludge/objtypes.cpp b/engines/sludge/objtypes.cpp index 58572b0f92..ba709777b4 100644 --- a/engines/sludge/objtypes.cpp +++ b/engines/sludge/objtypes.cpp @@ -50,24 +50,23 @@ objectType *findObjectType(int i) { } objectType *loadObjectType(int i) { -#if ALLOW_FILE int a, nameNum; objectType *newType = new objectType; if (checkNew(newType)) { if (openObjectSlice(i)) { nameNum = get2bytes(bigDataFile); - newType -> r = (byte) fgetc(bigDataFile); - newType -> g = (byte) fgetc(bigDataFile); - newType -> b = (byte) fgetc(bigDataFile); - newType -> speechGap = fgetc(bigDataFile); - newType -> walkSpeed = fgetc(bigDataFile); + newType -> r = (byte) getch(bigDataFile); + newType -> g = (byte) getch(bigDataFile); + newType -> b = (byte) getch(bigDataFile); + newType -> speechGap = getch(bigDataFile); + newType -> walkSpeed = getch(bigDataFile); newType -> wrapSpeech = get4bytes(bigDataFile); newType -> spinSpeed = get2bytes(bigDataFile); if (gameVersion >= VERSION(1, 6)) { // aaLoad - fgetc(bigDataFile); + getch(bigDataFile); getFloat(bigDataFile); getFloat(bigDataFile); } @@ -111,23 +110,21 @@ objectType *loadObjectType(int i) { return newType; } } -#endif + return NULL; } -#if ALLOW_FILE -objectType *loadObjectRef(FILE *fp) { - objectType *r = loadObjectType(get2bytes(fp)); +objectType *loadObjectRef(Common::SeekableReadStream *stream) { + objectType *r = loadObjectType(get2bytes(stream)); delete r -> screenName; - r -> screenName = readString(fp); + r -> screenName = readString(stream); return r; } -void saveObjectRef(objectType *r, FILE *fp) { - put2bytes(r -> objectNum, fp); - writeString(r -> screenName, fp); +void saveObjectRef(objectType *r, Common::WriteStream *stream) { + put2bytes(r -> objectNum, stream); + writeString(r -> screenName, stream); } -#endif int getCombinationFunction(int withThis, int thisObject) { int i, num = 0; |