From ec9a03964c9054a4e5a5406bd25e3c586df0dfaa Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Tue, 29 Apr 2008 15:12:09 +0000 Subject: - Renamed ScriptInterpreter -> EMCInterpreter - Renamed ScriptState -> EMCState, ScriptData -> EMCData - Removed 'Script' from function names inside EMCInterpreter - Fixed KyraEngine::readSettings and KyraEngine::writeSettings for kyra3 svn-id: r31773 --- engines/kyra/gui_v1.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'engines/kyra/gui_v1.cpp') diff --git a/engines/kyra/gui_v1.cpp b/engines/kyra/gui_v1.cpp index e5800832cb..e5a0c42281 100644 --- a/engines/kyra/gui_v1.cpp +++ b/engines/kyra/gui_v1.cpp @@ -119,15 +119,15 @@ int KyraEngine_v1::buttonAmuletCallback(Button *caller) { drawJewelsFadeOutStart(); drawJewelsFadeOutEnd(jewel); - _scriptInterpreter->initScript(_scriptClick, _scriptClickData); - _scriptClick->regs[3] = 0; - _scriptClick->regs[6] = jewel; - _scriptInterpreter->startScript(_scriptClick, 4); + _emc->init(&_scriptClick, &_scriptClickData); + _scriptClick.regs[3] = 0; + _scriptClick.regs[6] = jewel; + _emc->start(&_scriptClick, 4); - while (_scriptInterpreter->validScript(_scriptClick)) - _scriptInterpreter->runScript(_scriptClick); + while (_emc->isValid(&_scriptClick)) + _emc->run(&_scriptClick); - if (_scriptClick->regs[3]) + if (_scriptClick.regs[3]) return 1; _unkAmuletVar = 1; -- cgit v1.2.3