diff options
| author | Matthew Hoops | 2011-05-03 17:17:27 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-03 17:25:41 -0400 |
| commit | 9cb600099f4c29298707787cafad2741a1cd6686 (patch) | |
| tree | fb1930fa56b611317831d66442cba19b18d2e57a /engines/cine/saveload.cpp | |
| parent | 3b2283daf850605ca897002afbafe44489c35473 (diff) | |
| parent | 95a6098f672191dc0792bd4f9bfa18706bbe8e3a (diff) | |
| download | scummvm-rg350-9cb600099f4c29298707787cafad2741a1cd6686.tar.gz scummvm-rg350-9cb600099f4c29298707787cafad2741a1cd6686.tar.bz2 scummvm-rg350-9cb600099f4c29298707787cafad2741a1cd6686.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/cine/saveload.cpp')
| -rw-r--r-- | engines/cine/saveload.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp index fd426be66a..1fc2a8b2fd 100644 --- a/engines/cine/saveload.cpp +++ b/engines/cine/saveload.cpp @@ -25,6 +25,7 @@ #include "common/debug.h" #include "common/savefile.h" +#include "common/textconsole.h" #include "cine/cine.h" #include "cine/bg_list.h" @@ -996,9 +997,8 @@ void CineEngine::makeSave(char *saveFileName) { * at a time. */ void loadResourcesFromSave(Common::SeekableReadStream &fHandle, enum CineSaveGameFormat saveGameFormat) { - int16 currentAnim, foundFileIdx, frame; + int16 currentAnim, foundFileIdx; char *animName, part[256], name[10]; - uint16 width, height, bpp, var1; strcpy(part, currentPartName); @@ -1012,10 +1012,10 @@ void loadResourcesFromSave(Common::SeekableReadStream &fHandle, enum CineSaveGam // Seek to the start of the current animation's entry fHandle.seek(fileStartPos + currentAnim * entrySize); // Read in the current animation entry - width = fHandle.readUint16BE(); - var1 = fHandle.readUint16BE(); - bpp = fHandle.readUint16BE(); - height = fHandle.readUint16BE(); + fHandle.readUint16BE(); // width + fHandle.readUint16BE(); + fHandle.readUint16BE(); // bpp + fHandle.readUint16BE(); // height bool validPtr = false; // Handle variables only present in animation entries of size 30 @@ -1025,7 +1025,7 @@ void loadResourcesFromSave(Common::SeekableReadStream &fHandle, enum CineSaveGam } foundFileIdx = fHandle.readSint16BE(); - frame = fHandle.readSint16BE(); + fHandle.readSint16BE(); // frame fHandle.read(name, 10); // Handle variables only present in animation entries of size 23 |