[Scummvm-git-logs] scummvm branch-2-3 -> a27ae485991e11b2161bef612996960e58d95fb9

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a27ae48599 GLK: AGT: Fix $ and quit $ substitutions


Commit: a27ae485991e11b2161bef612996960e58d95fb9
    https://github.com/scummvm/scummvm/commit/a27ae485991e11b2161bef612996960e58d95fb9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-08-28T17:05:07-07:00

Commit Message:
GLK: AGT: Fix $ and quit $ substitutions

Changed paths:
    engines/glk/agt/exec.cpp


diff --git a/engines/glk/agt/exec.cpp b/engines/glk/agt/exec.cpp
index 8073128c98..1eedede10c 100644
--- a/engines/glk/agt/exec.cpp
+++ b/engines/glk/agt/exec.cpp
@@ -358,6 +358,12 @@ static int wordcode_match(const char **pvarname, char *fill_buff,
 		return 1;
 	}
 
+	// WORKAROUND: $You$ substitution on win/lose message
+	if ((winflag || deadflag) && pronoun_mode && match_str(pvarname, "YOU$")) {
+		youme("I", "you");
+		return 1;
+	}
+
 	if (context == MSG_MAIN) return 0;
 
 	if (context == MSG_PARSE) {
@@ -383,7 +389,7 @@ static int wordcode_match(const char **pvarname, char *fill_buff,
 		just_seen_adj = get_adj(dobj_rec, fill_buff);
 		return 1;
 	}
-	if (match_str(pvarname, "PREP$"))
+	if (match_str(pvarname, "PREP$") || match_str(pvarname, "PREP_$"))
 		d2buff(prep);
 	if (match_str(pvarname, "N_PRO$"))
 		d2buff(it_pronoun(dobj, 0));