[Scummvm-cvs-logs] SF.net SVN: scummvm: [24098] scummvm/branches/branch-0-9-0/engines/simon
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Tue Oct 3 15:40:11 CEST 2006
Revision: 24098
http://svn.sourceforge.net/scummvm/?rev=24098&view=rev
Author: kirben
Date: 2006-10-03 06:40:05 -0700 (Tue, 03 Oct 2006)
Log Message:
-----------
Fix bugs in VGA resource manager
Modified Paths:
--------------
scummvm/branches/branch-0-9-0/engines/simon/res.cpp
scummvm/branches/branch-0-9-0/engines/simon/simon.cpp
Modified: scummvm/branches/branch-0-9-0/engines/simon/res.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/simon/res.cpp 2006-10-03 13:20:23 UTC (rev 24097)
+++ scummvm/branches/branch-0-9-0/engines/simon/res.cpp 2006-10-03 13:40:05 UTC (rev 24098)
@@ -721,6 +721,7 @@
}
in.close();
} else {
+ id += (type - 1);
offs = _gameOffsetsPtr[id];
dstSize = _gameOffsetsPtr[id + 1] - offs;
Modified: scummvm/branches/branch-0-9-0/engines/simon/simon.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/simon/simon.cpp 2006-10-03 13:20:23 UTC (rev 24097)
+++ scummvm/branches/branch-0-9-0/engines/simon/simon.cpp 2006-10-03 13:40:05 UTC (rev 24098)
@@ -1279,12 +1279,12 @@
if (vpe->vgaFile1 != NULL)
return;
+ vpe->vgaFile2 = loadVGAFile(vga_res * 2, 2, size);
+ vpe->vgaFile2End = vpe->vgaFile2 + size;
+
vpe->vgaFile1 = loadVGAFile(vga_res * 2, 1, size);
vpe->vgaFile1End = vpe->vgaFile1 + size;
- vpe->vgaFile2 = loadVGAFile(vga_res * 2 + 1, 2, size);
- vpe->vgaFile2End = vpe->vgaFile2 + size;
-
vpe->sfxFile = NULL;
if (getGameType() == GType_FF && getPlatform() == Common::kPlatformWindows) {
vpe->sfxFile = loadVGAFile(vga_res * 2, 3, size);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list