libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GOB: Avoid a crash in the protection screen of Fascination (PC).

Browse Source 
When failing the protection check, the script of the PC version was writing on purpose everywhere in the memory to hang the computer. This resulted in a crash in Scummvm, fixed by this workaround. (Tested on the 256 Col version french and german)

svn-id: r52316
This commit is contained in:
Arnaud Boutonné 2010-08-24 06:25:08 +00:00
parent e93eaa0d95
commit a484a99e9f
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/gob/inter.h
View File

@ -432,6 +432,7 @@ protected:
void oFascin_playProtracker(OpGobParams &params);
bool oFascin_repeatUntil(OpFuncParams &params);
bool oFascin_assign(OpFuncParams &params);
bool oFascin_copySprite(OpFuncParams &params);
bool oFascin_keyFunc(OpFuncParams &params);

39
engines/gob/inter_fascin.cpp
View File

@ -88,6 +88,7 @@ void Inter_Fascination::setupOpcodesDraw() {
void Inter_Fascination::setupOpcodesFunc() {
Inter_v2::setupOpcodesFunc();
OPCODEFUNC(0x06, oFascin_repeatUntil);
OPCODEFUNC(0x09, oFascin_assign);
OPCODEFUNC(0x32, oFascin_copySprite);
}
@ -113,6 +114,43 @@ void Inter_Fascination::setupOpcodesGob() {
OPCODEGOB(1002, o2_stopProtracker);
}
bool Inter_Fascination::oFascin_repeatUntil(OpFuncParams &params) {
int16 size;
bool flag;
_nestLevel[0]++;
uint32 blockPos = _vm->_game->_script->pos();
do {
_vm->_game->_script->seek(blockPos);
size = _vm->_game->_script->peekUint16(2) + 2;
funcBlock(1);
_vm->_game->_script->seek(blockPos + size + 1);
flag = _vm->_game->_script->evalBoolResult();
// WORKAROUND: The script of the PC version of Fascination, when the protection check
// fails, writes on purpose everywhere in the memory in order to hang the computer.
// This results in a crash in Scummvm. This workaround avoids that crash.
if (_vm->getPlatform() == Common::kPlatformPC) {
if ((!scumm_stricmp(_vm->_game->_curTotFile, "INTRO1.TOT") && (blockPos == 3533)) ||
(!scumm_stricmp(_vm->_game->_curTotFile, "INTRO2.TOT") && (blockPos == 3519)))
_terminate = 1;
}
} while (!flag && !_break && !_terminate && !_vm->shouldQuit());
_nestLevel[0]--;
if (*_breakFromLevel > -1) {
_break = false;
*_breakFromLevel = -1;
}
return false;
}
bool Inter_Fascination::oFascin_assign(OpFuncParams &params) {
byte destType = _vm->_game->_script->peekByte();
int16 dest = _vm->_game->_script->readVarIndex();
@ -322,4 +360,5 @@ void Inter_Fascination::oFascin_setWinFlags() {
void Inter_Fascination::oFascin_playProtracker(OpGobParams &params) {
_vm->_sound->protrackerPlay("mod.extasy");
}
} // End of namespace Gob