ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

DIRECTOR: Lingo: Smoother tests handling

Browse Source
This commit is contained in:
Eugene Sandulenko
2016-08-03 23:40:36 +02:00
parent 847b1c0a03
commit fa4c1710d1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/director/lingo/lingo.cpp
+5 -3
View File
@@ -140,7 +140,7 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) {
begin = end + 1;
}
_hadError = false;
_hadError = true; // HACK: This is for preventing test execution
parse(begin);
} else {
parse(code);
@@ -148,7 +148,7 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) {
code1(STOP);
}
if (_currentScript->size())
if (_currentScript->size() && !_hadError)
Common::hexdump((byte *)&_currentScript->front(), _currentScript->size() * sizeof(inst));
}
@@ -158,6 +158,8 @@ void Lingo::executeScript(ScriptType type, uint16 id) {
return;
}
debug(2, "Executing script type: %d, id: %d", type, id);
_currentScript = _scripts[type][id];
_pc = 0;
_returning = false;
@@ -322,7 +324,7 @@ void Lingo::runTests() {
stream->read(script, size);
warning("Executing file %s of size %d", m.getName().c_str(), size);
warning("Compiling file %s of size %d, id: %d", m.getName().c_str(), size, counter);
_hadError = false;
addCode(script, kMovieScript, counter);