[Scummvm-git-logs] scummvm master -> e51cafd8c20bf04ea285770c1f485108bd3b23ae
bluegr
noreply at scummvm.org
Mon Aug 5 16:05:24 UTC 2024
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:
e51cafd8c2 JANITORIAL: GLK: Fix supress typos in vars/code
Commit: e51cafd8c20bf04ea285770c1f485108bd3b23ae
https://github.com/scummvm/scummvm/commit/e51cafd8c20bf04ea285770c1f485108bd3b23ae
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-08-05T19:05:21+03:00
Commit Message:
JANITORIAL: GLK: Fix supress typos in vars/code
Changed paths:
engines/glk/agt/exec.h
engines/glk/agt/metacommand.cpp
engines/glk/agt/runverb.cpp
engines/glk/agt/vars.cpp
diff --git a/engines/glk/agt/exec.h b/engines/glk/agt/exec.h
index 8e43688bde4..7985a687f82 100644
--- a/engines/glk/agt/exec.h
+++ b/engines/glk/agt/exec.h
@@ -56,7 +56,7 @@ global uchar do_disambig; /* 0= execution
/* Flags used during turn execution */
global rbool beforecmd; /* Only used by 1.8x games */
-global rbool supress_debug; /* Causes debugging info to _not_ be printed
+global rbool suppress_debug; /* Causes debugging info to _not_ be printed
even if debugging is on; used by disambiguator
and to suppress ANY commands */
global rbool was_metaverb; /* Was the verb that just executed a metaverb? */
diff --git a/engines/glk/agt/metacommand.cpp b/engines/glk/agt/metacommand.cpp
index 2da099411b9..72e7e006261 100644
--- a/engines/glk/agt/metacommand.cpp
+++ b/engines/glk/agt/metacommand.cpp
@@ -340,14 +340,14 @@ static rbool decode_args(int ip_, op_rec *oprec) {
writeln(oprec->errmsg);
return 0;
}
- if (DEBUG_AGT_CMD && !supress_debug) {
+ if (DEBUG_AGT_CMD && !suppress_debug) {
if (oprec->negate) { /* Output NOT */
debug_cmd_out(ip_, 108, 0, 0, 0);
ip_++;
}
}
- if (DEBUG_AGT_CMD && !supress_debug)
+ if (DEBUG_AGT_CMD && !suppress_debug)
debug_cmd_out(ip_, oprec->op, oprec->arg1, oprec->arg2, oprec->optype);
/* This checks and translates the arguments */
@@ -358,7 +358,7 @@ static rbool decode_args(int ip_, op_rec *oprec) {
if (grammar_arg && oprec->op <= MAX_COND)
return 0;
if (!PURE_ERROR) {
- if (DEBUG_AGT_CMD && !supress_debug) debugout("\n");
+ if (DEBUG_AGT_CMD && !suppress_debug) debugout("\n");
writeln("GAME ERROR: Invalid argument to metacommand token.");
}
return 0;
@@ -520,7 +520,7 @@ static int run_metacommand(int cnum, int *redir_offset)
if (restart) /* finish up Return from subroutine */
pop_subcall(&cnum, &ip_, &fail_addr);
- if (DEBUG_AGT_CMD && !supress_debug) {
+ if (DEBUG_AGT_CMD && !suppress_debug) {
debug_head(cnum);
if (restart) debugout(" (Resuming after subroutine)\n");
}
@@ -587,7 +587,7 @@ static int run_metacommand(int cnum, int *redir_offset)
/* -------- Commands that need to be handled specially -------------- */
if (currop.op == 109) { /* OR */
- if (DEBUG_AGT_CMD && !supress_debug) debug_newline(op, 0);
+ if (DEBUG_AGT_CMD && !suppress_debug) debug_newline(op, 0);
continue; /* OR: skip further processing */
}
@@ -597,25 +597,25 @@ static int run_metacommand(int cnum, int *redir_offset)
return 2;
}
subcall_arg = currop.arg1;
- if (DEBUG_AGT_CMD && !supress_debug) debugout("--> Call\n");
+ if (DEBUG_AGT_CMD && !suppress_debug) debugout("--> Call\n");
return 4;
}
if (currop.op == 1038) { /* Return */
restart = 1;
- if (DEBUG_AGT_CMD && !supress_debug) debugout("--> Return\n");
+ if (DEBUG_AGT_CMD && !suppress_debug) debugout("--> Return\n");
return 5;
}
if (currop.op == 1149) { /* Goto */
ip_ = currop.arg1;
- if (DEBUG_AGT_CMD && !supress_debug) debugout("\n");
+ if (DEBUG_AGT_CMD && !suppress_debug) debugout("\n");
continue;
}
if (currop.op == 1150) { /* OnFailGoto */
fail_addr = currop.arg1;
- if (DEBUG_AGT_CMD && !supress_debug) debugout("\n");
+ if (DEBUG_AGT_CMD && !suppress_debug) debugout("\n");
continue;
}
@@ -624,24 +624,24 @@ static int run_metacommand(int cnum, int *redir_offset)
/* ---------- Disambiguation Success -------------- */
if (do_disambig && currop.disambig) {
- if (DEBUG_AGT_CMD && !supress_debug) debugout("==> ACTION\n");
+ if (DEBUG_AGT_CMD && !suppress_debug) debugout("==> ACTION\n");
return -2;
}
/* ---------- Run normal metacommands -------------- */
switch (r = exec_instr(&currop)) {
case 0: /* Normal action token or successful conditional token */
- if (DEBUG_AGT_CMD && !supress_debug) debug_newline(op, 0);
+ if (DEBUG_AGT_CMD && !suppress_debug) debug_newline(op, 0);
continue;
case 1: /* Conditional token: fail */
- if (DEBUG_AGT_CMD && !supress_debug) {
+ if (DEBUG_AGT_CMD && !suppress_debug) {
if (orflag) debugout(" (-->FAIL)\n");
else debugout("--->FAIL\n");
}
fail = 1;
continue;
default: /* Return explicit value */
- if (DEBUG_AGT_CMD && !supress_debug) {
+ if (DEBUG_AGT_CMD && !suppress_debug) {
if (r == 103) debugout("-->Redirect\n");
else debugout("==> END\n");
}
@@ -1018,7 +1018,7 @@ int scan_metacommand(integer m_actor, int vcode,
if (m_actor == -ext_code[weverybody]) m_actor = 2;
- if (DEBUG_AGT_CMD && DEBUG_SCAN && !supress_debug) scan_dbg(vcode);
+ if (DEBUG_AGT_CMD && DEBUG_SCAN && !suppress_debug) scan_dbg(vcode);
m_verb = syntbl[auxsyn[vcode]];
if (m_actor == 0) {
@@ -1062,7 +1062,7 @@ int scan_metacommand(integer m_actor, int vcode,
rfree(substack);
return 2;
}
- if (DEBUG_AGT_CMD && !supress_debug) {
+ if (DEBUG_AGT_CMD && !suppress_debug) {
debugout(" ==>");
debug_head(i);
}
diff --git a/engines/glk/agt/runverb.cpp b/engines/glk/agt/runverb.cpp
index 5cf8b16cc12..50f7abc81e4 100644
--- a/engines/glk/agt/runverb.cpp
+++ b/engines/glk/agt/runverb.cpp
@@ -1149,13 +1149,13 @@ rbool metacommand_cycle(int save_vb, int *p_redir_flag) {
if (DEBUG_AGT_CMD)
debugout("*** Scanning: ANY metacommands ****\n");
/* ANY metacommands: */
- supress_debug = !debug_any;
+ suppress_debug = !debug_any;
clear_stack();
if ((PURE_METAVERB || !was_metaverb)
&& 2 == scan_metacommand(0, 0, 0, 0, 0, nullptr))
return 1;
- supress_debug = 0;
+ suppress_debug = 0;
vb = save_vb;
actor_in_scope |= visible(actor); /* Set up for ActorWasPresent */
@@ -1497,12 +1497,12 @@ void exec_verb(void) {
if (DEBUG_AGT_CMD)
debugout("*** Scanning: AFTER metacommands ****\n");
/* AFTER metacommands: */
- supress_debug = !debug_any;
+ suppress_debug = !debug_any;
clear_stack();
if ((PURE_METAVERB || !was_metaverb) &&
2 == scan_metacommand(0, 57, 0, 0, 0, nullptr))
turndone = 1;
- supress_debug = 0;
+ suppress_debug = 0;
}
/* If the player really typed 'q' and we generated an "EndGame"
@@ -1547,7 +1547,7 @@ int objcheck_cycle(rbool *success, parse_rec *act, int verbid,
clear_stack();
*success = 1;
- supress_debug = !debug_disambig;
+ suppress_debug = !debug_disambig;
if (actor != 0 && aver < AGX00) {
result = scan_metacommand(2, verbid, dobj, prep_, iobj, nullptr);
if (result == 2) {
@@ -1561,7 +1561,7 @@ int objcheck_cycle(rbool *success, parse_rec *act, int verbid,
}
clear_stack();
result = scan_metacommand(actor, verbid, dobj, prep_, iobj, nullptr);
- supress_debug = 0;
+ suppress_debug = 0;
switch (result) {
case -2:
free_all_parserec();
diff --git a/engines/glk/agt/vars.cpp b/engines/glk/agt/vars.cpp
index 608560811b9..1065ac69ed9 100644
--- a/engines/glk/agt/vars.cpp
+++ b/engines/glk/agt/vars.cpp
@@ -191,7 +191,7 @@ words *verblist;
uchar do_disambig;
rbool beforecmd;
-rbool supress_debug;
+rbool suppress_debug;
rbool was_metaverb;
integer oldloc;
integer subcall_arg;
More information about the Scummvm-git-logs
mailing list