diff options
author | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
---|---|---|
committer | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
commit | d5ed8b1901b88e361a2a420a9daf586f6089a36b (patch) | |
tree | d19e4dd7baf33b7447d69d8ad8d3c25732a69698 /engines/cine/saveload.cpp | |
parent | ff51a7661d7a2cb296b987edfc3d81727160e627 (diff) | |
parent | 8808393b3a3428df2946d7967e52aba084c8ffe5 (diff) | |
download | scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.gz scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.bz2 scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.zip |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
AUTHORS
Diffstat (limited to 'engines/cine/saveload.cpp')
-rw-r--r-- | engines/cine/saveload.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp index 20952eea52..51d2c1f6be 100644 --- a/engines/cine/saveload.cpp +++ b/engines/cine/saveload.cpp @@ -1002,7 +1002,7 @@ void loadResourcesFromSave(Common::SeekableReadStream &fHandle, enum CineSaveGam const int entrySize = ((saveGameFormat == ANIMSIZE_23) ? 23 : 30); const int fileStartPos = fHandle.pos(); - for(int resourceIndex=0; resourceIndex<NUM_MAX_ANIMDATA; resourceIndex++) { + for (int resourceIndex = 0; resourceIndex < NUM_MAX_ANIMDATA; resourceIndex++) { // Seek to the start of the current animation's entry fHandle.seek(fileStartPos + resourceIndex * entrySize); // Read in the current animation entry |