aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_v2.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2008-03-26 21:52:28 +0000
committerJohannes Schickel2008-03-26 21:52:28 +0000
commitdb1b4f0e140ba667ac1a1b0aa3f2ca2d110027db (patch)
tree6b0d7a2af80b58868e199dcf9feb1110b9790a3e /engines/kyra/kyra_v2.cpp
parentf919b26875033c41186b840b97752c72cab68f7f (diff)
downloadscummvm-rg350-db1b4f0e140ba667ac1a1b0aa3f2ca2d110027db.tar.gz
scummvm-rg350-db1b4f0e140ba667ac1a1b0aa3f2ca2d110027db.tar.bz2
scummvm-rg350-db1b4f0e140ba667ac1a1b0aa3f2ca2d110027db.zip
- reworked skip flag handling in some places again
- hopefully fixed tons of warnings related to stackPosString svn-id: r31253
Diffstat (limited to 'engines/kyra/kyra_v2.cpp')
-rw-r--r--engines/kyra/kyra_v2.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index 42209d34c3..3c1014a94b 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -1573,7 +1573,7 @@ void KyraEngine_v2::processNewShapes(int unk1, int unk2) {
resetSkipFlag();
- while (_scriptInterpreter->validScript(&_temporaryScriptState) && !skipFlag()) {
+ while (_scriptInterpreter->validScript(&_temporaryScriptState)) {
_temporaryScriptExecBit = false;
while (_scriptInterpreter->validScript(&_temporaryScriptState) && !_temporaryScriptExecBit)
_scriptInterpreter->runScript(&_temporaryScriptState);