[Scummvm-git-logs] scummvm master -> 23bc483ab7be8bf0097c77c71d2a811e8e59b3db
waltervn
walter at vanniftrik-it.nl
Thu Feb 23 00:27:33 CET 2017
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
69ae262bf2 ADL: Add comments to hires6 direction opcode
23bc483ab7 ADL: Fix hires6 room description printing
Commit: 69ae262bf2001c35ad72263ce95177fd98b128e6
https://github.com/scummvm/scummvm/commit/69ae262bf2001c35ad72263ce95177fd98b128e6
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2017-02-22T23:17:41+01:00
Commit Message:
ADL: Add comments to hires6 direction opcode
Changed paths:
engines/adl/hires6.cpp
diff --git a/engines/adl/hires6.cpp b/engines/adl/hires6.cpp
index b3b66f6..42860ba 100644
--- a/engines/adl/hires6.cpp
+++ b/engines/adl/hires6.cpp
@@ -167,6 +167,7 @@ int HiRes6Engine::o_goDirection(ScriptEnv &e) {
byte room = getCurRoom().connections[D];
if (room == 0) {
+ // Don't penalize invalid directions at escapable Garthim encounter
if (getVar(33) == 2)
setVar(34, getVar(34) + 1);
@@ -176,6 +177,7 @@ int HiRes6Engine::o_goDirection(ScriptEnv &e) {
switchRoom(room);
+ // Escapes an escapable Garthim encounter by going to a different room
if (getVar(33) == 2) {
printMessage(102);
setVar(33, 0);
Commit: 23bc483ab7be8bf0097c77c71d2a811e8e59b3db
https://github.com/scummvm/scummvm/commit/23bc483ab7be8bf0097c77c71d2a811e8e59b3db
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2017-02-22T23:17:41+01:00
Commit Message:
ADL: Fix hires6 room description printing
Changed paths:
engines/adl/hires6.cpp
diff --git a/engines/adl/hires6.cpp b/engines/adl/hires6.cpp
index 42860ba..fa243e3 100644
--- a/engines/adl/hires6.cpp
+++ b/engines/adl/hires6.cpp
@@ -453,9 +453,12 @@ void HiRes6Engine::printString(const Common::String &str) {
if (getVar(2) == 0xff) {
if (getVar(26) == 0) {
// This checks for special room description string " "
- if (str.size() != 1 || APPLECHAR(str[0]) != APPLECHAR(' '))
- return AdlEngine_v5::printString(s);
- setVar(2, 160);
+ if (str.size() == 1 && APPLECHAR(str[0]) == APPLECHAR(' ')) {
+ setVar(2, 160);
+ } else {
+ AdlEngine_v5::printString(s);
+ setVar(2, 1);
+ }
} else if (getVar(26) == 0xff) {
// Storing the room number in a variable allows for range comparisons
setVar(26, _state.room);
More information about the Scummvm-git-logs
mailing list