diff options
| author | D G Turner | 2012-10-12 17:03:32 +0100 |
|---|---|---|
| committer | D G Turner | 2012-10-12 17:03:32 +0100 |
| commit | 151b7beb47ec4b964862d6779bd48e3a33482bbd (patch) | |
| tree | 867717c5266d0908d95edd82560599be20a4ede9 /engines/agi/op_cmd.cpp | |
| parent | 80af0e239473f85c49cc2da3c848dfcde41d4a37 (diff) | |
| parent | 2b55837650c4229dc3d75b660cecfc7a3292e5e0 (diff) | |
| download | scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.gz scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.bz2 scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.zip | |
Merge branch 'master' into teenagentRefactor
Conflicts:
engines/teenagent/callbacks.cpp
Diffstat (limited to 'engines/agi/op_cmd.cpp')
| -rw-r--r-- | engines/agi/op_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp index 7e04328a67..5334407eb8 100644 --- a/engines/agi/op_cmd.cpp +++ b/engines/agi/op_cmd.cpp @@ -1146,7 +1146,7 @@ void cmdFollowEgo(AgiGame *state, uint8 *p) { vt.parm1 = p1 > vt.stepSize ? p1 : vt.stepSize; vt.parm2 = p2; vt.parm3 = 0xff; - + if (getVersion() < 0x2000) { _v[p2] = 0; vt.flags |= fUpdate | fAnimated; @@ -1270,7 +1270,7 @@ void cmdVersion(AgiGame *state, uint8 *p) { // no Sierra as it wraps textbox Common::String verMsg = TITLE " v%s"; - + int ver = getVersion(); int maj = (ver >> 12) & 0xf; int min = ver & 0xfff; @@ -1839,7 +1839,7 @@ int AgiEngine::runLogic(int n) { // ip = 2; // warning("running logic %d\n", n); // } - + if (_game.exitAllLogics) break; } |