[Scummvm-git-logs] scummvm master -> b6c7be876a99cd5a842709f6a89dc2672560c00a
bluegr
noreply at scummvm.org
Mon Aug 5 15:57:43 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:
b6c7be876a JANITORIAL: GLK: Fix typos in comments
Commit: b6c7be876a99cd5a842709f6a89dc2672560c00a
https://github.com/scummvm/scummvm/commit/b6c7be876a99cd5a842709f6a89dc2672560c00a
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-08-05T18:57:40+03:00
Commit Message:
JANITORIAL: GLK: Fix typos in comments
Changed paths:
engines/glk/agt/agil.cpp
engines/glk/agt/agility.h
engines/glk/agt/agtread.cpp
engines/glk/agt/agxfile.cpp
engines/glk/agt/auxfile.cpp
engines/glk/agt/exec.cpp
engines/glk/agt/exec.h
engines/glk/agt/gamedata.cpp
engines/glk/agt/interp.h
engines/glk/agt/metacommand.cpp
engines/glk/agt/object.cpp
engines/glk/agt/os_glk.cpp
engines/glk/agt/parser.cpp
engines/glk/agt/runverb.cpp
engines/glk/archetype/archetype.cpp
engines/glk/archetype/expression.cpp
engines/glk/comprehend/game_tr1.cpp
engines/glk/comprehend/game_tr2.cpp
engines/glk/jacl/encapsulate.cpp
engines/glk/jacl/jacl_main.cpp
engines/glk/jacl/parser.cpp
engines/glk/jacl/utils.cpp
engines/glk/level9/bitmap.cpp
engines/glk/quest/geas_glk.h
engines/glk/scott/unp64/scanners/eca.cpp
engines/glk/scott/unp64/scanners/megabyte.cpp
engines/glk/tads/os_frob_tads.h
engines/glk/tads/tads2/line_source_file.h
engines/glk/tads/tads2/vocabulary_parser.cpp
engines/glk/zcode/processor.h
engines/glk/zcode/processor_streams.cpp
diff --git a/engines/glk/agt/agil.cpp b/engines/glk/agt/agil.cpp
index f85ea5681da..a42cc2f4595 100644
--- a/engines/glk/agt/agil.cpp
+++ b/engines/glk/agt/agil.cpp
@@ -136,7 +136,7 @@ static const char *ext_voc[] = {
/*-------------------------------------------------------------------*/
-/* Routines to read in and use various auxilary files. */
+/* Routines to read in and use various auxiliary files. */
/* (.TTL, .INS, .VOC, .CFG) */
/*-------------------------------------------------------------------*/
@@ -665,7 +665,7 @@ static void ext_dict(void)
static void fix_dummy(void) {
int i;
- /* At this point, all occurances in the game file of the dictionary
+ /* At this point, all occurrences in the game file of the dictionary
words have been converted to dictionary indices, and so as long as
we don't change the dictionary index values, we can change the contents
without interfering with the metacommand scanner (since it compares
@@ -731,7 +731,7 @@ static fc_type setup_game(fc_type fc)
no_auxsyn = 0;
debug_disambig = 0;
debug_any = 1;
- dbg_nomsg = 1; /* Supress output of MSG arguments to metacommands */
+ dbg_nomsg = 1; /* Suppress output of MSG arguments to metacommands */
textbold = 0;
debug_mode = 0;
aver = 0;
diff --git a/engines/glk/agt/agility.h b/engines/glk/agt/agility.h
index 8d63f5c6201..c44d565aea9 100644
--- a/engines/glk/agt/agility.h
+++ b/engines/glk/agt/agility.h
@@ -479,7 +479,7 @@ global rbool BATCH_MODE, make_test;
-- Automatically send output to <gamename>.scr
-- Automatically read/write input from <gamename>.log
(depending on whether we are in BATCH_MODE or make_test mode,
- respectivly).
+ respectively).
*/
@@ -495,7 +495,7 @@ global rbool mars_fix;
global rbool fix_ascii_flag; /* Translate IBM characters?
Defaults to fix_ascii #define'd above */
global rbool dbg_nomsg; /* Causes printing of <msg> arguments by
- debug disassembler to be supressed */
+ debug disassembler to be suppressed */
global rbool irun_mode; /* If true, all messages will be in 1st person */
global rbool verboseflag;
@@ -781,7 +781,7 @@ global rbool open_as_binary; /* Open text files as binary, anyhow. */
of "[obj].[prop].[prop].[flag]"
constructions. */
-#define AGT_LVAL 150 /* Used by the compiler in certain psuedo-ops */
+#define AGT_LVAL 150 /* Used by the compiler in certain pseudo-ops */
#define AGT_DEFINE 256
diff --git a/engines/glk/agt/agtread.cpp b/engines/glk/agt/agtread.cpp
index 630cc51791d..afb68fd60d0 100644
--- a/engines/glk/agt/agtread.cpp
+++ b/engines/glk/agt/agtread.cpp
@@ -499,7 +499,7 @@ static void read_da4(fc_type fc) {
static int translate_vnum(int vnum)
-/* actor is a numerical index occuring at the beginning of each command.
+/* actor is a numerical index occurring at the beginning of each command.
In general, it contains the verb number of the verb associated with
this command; because of AGiliTy's dictionary organization, we don't
really need this (the verb itself will be converted to a number anyhow),
@@ -598,7 +598,7 @@ static void read_da5(fc_type fc) {
/* Now to read in DA6 for versions that have it */
if (aver >= AGT15F) read_da6(fc);
check_cmd_version(); /* This uses the opcodes to check gamefile
- version information and change it if neccesary. */
+ version information and change it if necessary. */
build_cmd_table(); /* Create the command translation table for
this version of AGT. */
@@ -648,7 +648,7 @@ static void read_da6(fc_type fc)
cbuf_size = (cfile_size < CBUF_SIZE) ? cfile_size : CBUF_SIZE;
cbuf = (uchar *)rmalloc(2 * cbuf_size);
- frame = cfile_size + 1; /* Guarentee frame will be wrong */
+ frame = cfile_size + 1; /* Guarantee frame will be wrong */
for (i = 0; i < last_cmd; i++)
if (cmd_ptr[i] >= 2) {
diff --git a/engines/glk/agt/agxfile.cpp b/engines/glk/agt/agxfile.cpp
index 38dcd094346..ab0d9302587 100644
--- a/engines/glk/agt/agxfile.cpp
+++ b/engines/glk/agt/agxfile.cpp
@@ -53,7 +53,7 @@ namespace AGT {
GUIDLINES FOR NEW FILE FORMAT VERSIONS
- File format version are labled by a series of four bytes near the
+ File format version are labeled by a series of four bytes near the
beginning of the file. (They are actually the fifth, sixth, seventh,
and eight bytes-- the first four bytes are the file format signature
that indicate the file is an AGX file and not, say, a PCX file)
diff --git a/engines/glk/agt/auxfile.cpp b/engines/glk/agt/auxfile.cpp
index cb3a7b79acf..2b1970e5e90 100644
--- a/engines/glk/agt/auxfile.cpp
+++ b/engines/glk/agt/auxfile.cpp
@@ -411,7 +411,7 @@ void add_verbrec(const char *verb_line, rbool addnew) {
if (verbStr.empty() || verbStr.hasPrefix("!"))
return; /* Comment or empty line */
- /* The following guarentees automatic initialization of the verbrec structures */
+ /* The following guarantees automatic initialization of the verbrec structures */
if (!addnew)
while (newindex < 3 && strcasecmp(verbStr.c_str() + 2, newvoc[newindex] + 2) > 0)
add_verbrec(newvoc[newindex++], 1);
@@ -515,7 +515,7 @@ rbool open_ins_file(fc_type fc, rbool report_error) {
if (ins_descr != nullptr) return 1;
/* Note that if the AGX file doesn't contain an INS block, we
- don't immediatly give up but try opening <fname>.INS */
+ don't immediately give up but try opening <fname>.INS */
}
insfile = openfile(fc, fINS,
diff --git a/engines/glk/agt/exec.cpp b/engines/glk/agt/exec.cpp
index 7d355be02db..287fed7ef61 100644
--- a/engines/glk/agt/exec.cpp
+++ b/engines/glk/agt/exec.cpp
@@ -949,7 +949,7 @@ void print_score(void) {
if (!room[i].unused) {
if (room[i].seen) rmcnt++;
/* Should really compute this once at the beginning, but */
- /* I don't want to add yet another global variable, particulary */
+ /* I don't want to add yet another global variable, particularly */
/* since this is only used here. */
totroom++;
}
diff --git a/engines/glk/agt/exec.h b/engines/glk/agt/exec.h
index ce2f971abdf..8e43688bde4 100644
--- a/engines/glk/agt/exec.h
+++ b/engines/glk/agt/exec.h
@@ -58,7 +58,7 @@ global uchar do_disambig; /* 0= execution
global rbool beforecmd; /* Only used by 1.8x games */
global rbool supress_debug; /* Causes debugging info to _not_ be printed
even if debugging is on; used by disambiguator
- and to supress ANY commands */
+ and to suppress ANY commands */
global rbool was_metaverb; /* Was the verb that just executed a metaverb? */
/* Metaverbs are commands that should not take game time
to execute: SAVE, RESTORE, RESTART, QUIT, SCRIPT, UNSCRIPT,
diff --git a/engines/glk/agt/gamedata.cpp b/engines/glk/agt/gamedata.cpp
index af29e11edf7..642c24a5ea9 100644
--- a/engines/glk/agt/gamedata.cpp
+++ b/engines/glk/agt/gamedata.cpp
@@ -744,7 +744,7 @@ slist add_multi_word(word w) {
}
-/* Check verb vp for multiwords and enter any found in the auxilary
+/* Check verb vp for multiwords and enter any found in the auxiliary
combination list */
static void verb_multiword(int vp) {
int i;
@@ -944,7 +944,7 @@ word add_dict(const char *str) {
}
/* Adds w to dynamically grown synonym list */
-/* If no_syn is set, then *don't* add a synonym: return immediatly */
+/* If no_syn is set, then *don't* add a synonym: return immediately */
/* (This is done by agt2agx to avoid creating the auxsyn lists, */
/* since those should be created when the interpreter loads the */
/* game file and not before) */
@@ -1276,7 +1276,7 @@ void sort_cmd(void) {
for (i = 0; i < TOTAL_VERB; i++)
if (verbptr[i] == last_cmd) /* No occurrences of this verb */
verbend[i] = last_cmd;
- else verbend[i]++; /* Point *after* last occurance */
+ else verbend[i]++; /* Point *after* last occurrence */
for (i = 0; i < TOTAL_VERB; i++) {
int j;
diff --git a/engines/glk/agt/interp.h b/engines/glk/agt/interp.h
index 5656a83505e..8a19f161d4b 100644
--- a/engines/glk/agt/interp.h
+++ b/engines/glk/agt/interp.h
@@ -268,7 +268,7 @@ global short ap, vp, np, pp, op; /* Points to first word in actor, verb, noun,
-/* The following needs to be kept consistant with ext_voc[] in
+/* The following needs to be kept consistent with ext_voc[] in
agil.c */
typedef enum {wthe, wmy, wa, wan, wthen, wp, wsc, wand, wc, wits, wall, wundo, wlook, wg,
wpick, wgo, wexits, wtalk, wtake, wdoor, wagain, wbut, wexcept,
@@ -472,7 +472,7 @@ extern void agt_endbox(void);
extern genfile agt_globalfile(int fid); /* When fid=0, return global config file */
extern rbool agt_option(int optnum, char *optstr[], rbool setflag);
-/* These have stubs defined in interface.c that would ened to be
+/* These have stubs defined in interface.c that would need to be
commented out if you actually wanted to support these */
extern void fontcmd(int cmd, int font); /* fontlist[font] */
extern void pictcmd(int cmd, int pict); /* pictlist[pict] or pixlist[pict] */
diff --git a/engines/glk/agt/metacommand.cpp b/engines/glk/agt/metacommand.cpp
index 6946507962f..e2aa70ba339 100644
--- a/engines/glk/agt/metacommand.cpp
+++ b/engines/glk/agt/metacommand.cpp
@@ -389,7 +389,7 @@ static rbool decode_args(int ip_, op_rec *oprec) {
run_metacommand hits Return. It sets restart_state and
returns 5 to its parent.
scan_metacommand then runs pop_subcall_grammar and restores
- the original scanning grammer. It subtracts one from cnum
+ the original scanning grammar. It subtracts one from cnum
so the original cnum will be rerun.
run_metacommand sees that restart_state is set and pops the
rest of the information (cnum and ip) off of the stack.
@@ -1068,8 +1068,8 @@ int scan_metacommand(integer m_actor, int vcode,
}
/* REDIRECT :If we do a redirect from a broader grammar to a
- narrower grammer, it will be noted so that certain types
- of grammer checking can be disabled. */
+ narrower grammar, it will be noted so that certain types
+ of grammar checking can be disabled. */
if (redir_flag != nullptr) {
if (*redir_flag < 2
&& redir_narrows_grammar(&command[oldi], &command[i]))
diff --git a/engines/glk/agt/object.cpp b/engines/glk/agt/object.cpp
index 2c1525493fe..e9032b90766 100644
--- a/engines/glk/agt/object.cpp
+++ b/engines/glk/agt/object.cpp
@@ -360,7 +360,7 @@ defined in exec.h */
/* Weight */
if (obj2 == 1 || (aver > AGTME15 && aver < AGX00)) {
/* Pre-1.56 interpreters forgot to check this;
- Magx deliberatly *doesn't* check this */
+ Magx deliberately *doesn't* check this */
net = noun[obj1 - first_noun].weight;
if (aver >= AGX00) net += contweight(obj1);
diff --git a/engines/glk/agt/os_glk.cpp b/engines/glk/agt/os_glk.cpp
index 18cbfdf9e18..a289d3f8a72 100644
--- a/engines/glk/agt/os_glk.cpp
+++ b/engines/glk/agt/os_glk.cpp
@@ -1016,7 +1016,7 @@ static void gagt_standout_string(const char *message);
* This should turn off blinking, bold, color, etc. and restore
* the text mode to its default appearance.
* 8=Turn on blinking.
- * 9= *Just* White (not neccessarily "normal" and no need to turn off
+ * 9= *Just* White (not necessarily "normal" and no need to turn off
* blinking)
* 10=Turn on fixed pitch font.
* 11=Turn off fixed pitch font
diff --git a/engines/glk/agt/parser.cpp b/engines/glk/agt/parser.cpp
index b99573bae83..3445c76c8a1 100644
--- a/engines/glk/agt/parser.cpp
+++ b/engines/glk/agt/parser.cpp
@@ -1232,7 +1232,7 @@ TELLHack: /* This is used to restart the noun/prep/object scan
return parseerr(230, "I don't understand '$word$' as a verb.", ip);
/* Now we need to find noun, obj, and prep (if they all exist) */
- /* standard grammer: verb noun prep obj */
+ /* standard grammar: verb noun prep obj */
prep = 0;
np = ++ip; /* ip now points just _after_ verb */
lnoun = parse_noun((verbflag[vnum] & VERB_MULTI) != 0, 0);
@@ -1604,7 +1604,7 @@ void menu_cmd(void) {
}
-/* Grammer structures:
+/* Grammar structures:
sverb, dverb (n,s,e,w,...,q,l,....)
overb noun (close,examine,read,eat,drink,pull,light,ext)
averb noun|ALL (drop,get,wear,remove)
diff --git a/engines/glk/agt/runverb.cpp b/engines/glk/agt/runverb.cpp
index ee36a2b6c99..5cf8b16cc12 100644
--- a/engines/glk/agt/runverb.cpp
+++ b/engines/glk/agt/runverb.cpp
@@ -1013,7 +1013,7 @@ static void v_yell(void) {
/* ------------------------------------------------------------------- */
-/* VERB EXECUTION AND GRAMMER CHECKING */
+/* VERB EXECUTION AND GRAMMAR CHECKING */
static int checkgram(int vb_, int dobj_, word prep_, int iobj_, rbool redir_flag) {
@@ -1025,7 +1025,7 @@ static int checkgram(int vb_, int dobj_, word prep_, int iobj_, rbool redir_flag
if (redir_flag < 2) redir_flag = 0;
if (PURE_GRAMMAR) redir_flag = 1;
- /* First of all, no constraints on dummy_verb grammer */
+ /* First of all, no constraints on dummy_verb grammar */
if (vb_ >= BASE_VERB && vb_ < TOTAL_VERB) return 0;
if (!(verbflag[vb_]&VERB_TAKEOBJ)
@@ -1226,7 +1226,7 @@ void exec_verb(void) {
/* LOOK: Doesn't matter if turn is done. */
v_look();
else if (!turndone) {
- /* Execute normal verbs: check grammer and then call */
+ /* Execute normal verbs: check grammar and then call */
if (!objswap) {
if (checkgram(vb, dobj, prep, iobj, redir_flag) == -1) return;
} else if (checkgram(vb, 0, prep, iobj, redir_flag) == -1) return;
diff --git a/engines/glk/archetype/archetype.cpp b/engines/glk/archetype/archetype.cpp
index f972e6e39d7..3fcf3120c38 100644
--- a/engines/glk/archetype/archetype.cpp
+++ b/engines/glk/archetype/archetype.cpp
@@ -157,8 +157,8 @@ void Archetype::writeln_internal(const String *fmt, ...) {
}
String Archetype::readLine() {
- // WORKAROUND: THe original archetype games prompt for save file names due to script
- // code before calling the save/load code. It's a bit hacky, but we detect the occurance
+ // WORKAROUND: The original archetype games prompt for save file names due to script
+ // code before calling the save/load code. It's a bit hacky, but we detect the occurrence
// of save/load in the text just before the readLine call and skip waiting for text
String text = _lastOutputText;
text.toLowercase();
diff --git a/engines/glk/archetype/expression.cpp b/engines/glk/archetype/expression.cpp
index 65166807bac..4f5fa60624d 100644
--- a/engines/glk/archetype/expression.cpp
+++ b/engines/glk/archetype/expression.cpp
@@ -79,7 +79,7 @@ void expression_init() {
Right_Assoc[OP_ASSIGN] = true;
- Precedence[OP_LPAREN] = 14; // must always be the higest
+ Precedence[OP_LPAREN] = 14; // must always be the highest
Precedence[OP_DOT] = 13;
Precedence[OP_CHS] = 12;
diff --git a/engines/glk/comprehend/game_tr1.cpp b/engines/glk/comprehend/game_tr1.cpp
index a6065b91742..7954a9e0817 100644
--- a/engines/glk/comprehend/game_tr1.cpp
+++ b/engines/glk/comprehend/game_tr1.cpp
@@ -239,7 +239,7 @@ void TransylvaniaGame1::handleSpecialOpcode() {
break;
case 9:
- // Show the Zin screen in reponse to doing
+ // Show the Zin screen in response to doing
// 'sing some enchanted evening' in his cabin.
g_comprehend->showGraphics();
g_comprehend->drawLocationPicture(41);
diff --git a/engines/glk/comprehend/game_tr2.cpp b/engines/glk/comprehend/game_tr2.cpp
index 21d222631cc..17a3978da23 100644
--- a/engines/glk/comprehend/game_tr2.cpp
+++ b/engines/glk/comprehend/game_tr2.cpp
@@ -232,7 +232,7 @@ void TransylvaniaGame2::handleSpecialOpcode() {
break;
case 9:
- // Show the Zin screen in reponse to doing
+ // Show the Zin screen in response to doing
// 'sing some enchanted evening' in his cabin.
g_comprehend->showGraphics();
g_comprehend->drawLocationPicture(41);
diff --git a/engines/glk/jacl/encapsulate.cpp b/engines/glk/jacl/encapsulate.cpp
index 5d5f11d8e5c..8cf12bad4cf 100644
--- a/engines/glk/jacl/encapsulate.cpp
+++ b/engines/glk/jacl/encapsulate.cpp
@@ -155,7 +155,7 @@ command_encapsulate() {
case ',':
text_buffer[index] = 0;
// SET THIS WORD TO POINT TO A STRING CONSTANT OF 'comma' AS THE
- // COMMA ITSELF WILL BE NULLED OUT TO TERMINATE THE PRECEEDING
+ // COMMA ITSELF WILL BE NULLED OUT TO TERMINATE THE PRECEDING
// WORD IN THE COMMAND.
word[position] = comma;
if (position < MAX_WORDS)
@@ -165,7 +165,7 @@ command_encapsulate() {
case '.':
text_buffer[index] = 0;
// SET THIS WORD TO POINT TO A STRING CONSTANT OF 'comma' AS THE
- // COMMA ITSELF WILL BE NULLED OUT TO TERMINATE THE PRECEEDING
+ // COMMA ITSELF WILL BE NULLED OUT TO TERMINATE THE PRECEDING
// WORD IN THE COMMAND
word[position] = then;
if (position < MAX_WORDS)
diff --git a/engines/glk/jacl/jacl_main.cpp b/engines/glk/jacl/jacl_main.cpp
index 9dd20d3d64a..aeaf76c09bb 100644
--- a/engines/glk/jacl/jacl_main.cpp
+++ b/engines/glk/jacl/jacl_main.cpp
@@ -205,7 +205,7 @@ void glk_main() {
//promptwin = g_vm->glk_window_open(mainwin, winmethod_Below | winmethod_Fixed,
// 3, wintype_TextBuffer, 0);
- /* SET THIS TO DETERMINE THE SYTEM OF INPUT TO USE */
+ /* SET THIS TO DETERMINE THE SYSTEM OF INPUT TO USE */
//inputwin = promptwin;
inputwin = mainwin;
diff --git a/engines/glk/jacl/parser.cpp b/engines/glk/jacl/parser.cpp
index c79f355db7c..6378fccb2b4 100644
--- a/engines/glk/jacl/parser.cpp
+++ b/engines/glk/jacl/parser.cpp
@@ -430,7 +430,7 @@ void call_functions(const char *base_name) {
/* THIS LOCATION-SPECIFIC FUNCTION DOES NOT
* EXIST OR HAS ISSUED A 'break false' COMMAND.
* EXECUTE THE FUNCTION '+func'
- * WITH THE POSSIBLILITY OF
+ * WITH THE POSSIBILITY OF
* EXECUTING THE FUNCTION 'func_override_here'
* IF AN 'override' COMMAND IS FOUND IN '+func'
* IF THIS OVERRIDE FUNCTION ISN'T FOUND
@@ -456,7 +456,7 @@ void call_functions(const char *base_name) {
/* THIS OBJECT-SPECIFIC FUNCTION DOES NOT
* EXIST OR HAS ISSUED A 'break false' COMMAND.
* EXECUTE THE FUNCTION '+func'
- * WITH THE POSSIBLILITY OF
+ * WITH THE POSSIBILITY OF
* EXECUTING THE FUNCTION 'func_override_noun1'
* IF AN 'override' COMMAND IS FOUND IN '+func'
* IF THIS OVERRIDE FUNCTION ISN'T FOUND
@@ -486,7 +486,7 @@ void call_functions(const char *base_name) {
/* THIS OBJECTS-SPECIFIC FUNCTION DOES NOT
* EXIST OR HAS ISSUED A 'break false' COMMAND.
* EXECUTE THE FUNCTION '+func'
- * WITH THE POSSIBLILITY OF
+ * WITH THE POSSIBILITY OF
* EXECUTING THE FUNCTION 'func_override_noun2_noun1'
* IF AN 'override' COMMAND IS FOUND IN '+func'
* IF THIS OVERRIDE FUNCTION ISN'T FOUND
@@ -1392,7 +1392,7 @@ int noun_resolve(struct word_type *scope_word, int finding_from, int noun_number
if (!matches) {
/* IF THERE ARE NO REMAINING MATCHES DON'T MOVE ON TO THE NEXT
* WORD IN THE PLAYER'S INPUT. */
- //printf("--- %s isnt a name match for any object\n", word[wp]);
+ //printf("--- %s isn't a name match for any object\n", word[wp]);
/* THIS WORD IS A LIKELY BE INCORRECT AS IT DIDN'T MATCH
* ANY OBJECTS */
@@ -1846,7 +1846,7 @@ int find_parent(int index) {
//printf("--- %s is a location, so dont recuse\n", object[parent]->label);
return (FALSE);
} else {
- //printf("--- %s isnt a location, so recuse\n", object[parent]->label);
+ //printf("--- %s isn't a location, so recuse\n", object[parent]->label);
return (find_parent(parent));
}
}
diff --git a/engines/glk/jacl/utils.cpp b/engines/glk/jacl/utils.cpp
index 34865f80667..611b336034c 100644
--- a/engines/glk/jacl/utils.cpp
+++ b/engines/glk/jacl/utils.cpp
@@ -50,7 +50,7 @@ void eachturn() {
/* INCREMENT THE TOTAL NUMBER OF MOVES MADE AND CALL THE 'EACHTURN'
* FUNCTION FOR THE CURRENT LOCATION AND THE GLOBAL 'EACHTURN'
* FUNCTION. THESE FUNCTIONS CONTAIN ANY CODE THAT SIMULATED EVENTS
- * OCCURING DUE TO THE PASSING OF TIME */
+ * OCCURRING DUE TO THE PASSING OF TIME */
TOTAL_MOVES->value++;
execute("+eachturn");
Common::strcpy_s(function_name, 81, "eachturn_");
diff --git a/engines/glk/level9/bitmap.cpp b/engines/glk/level9/bitmap.cpp
index 46e06702ddc..89461caa575 100644
--- a/engines/glk/level9/bitmap.cpp
+++ b/engines/glk/level9/bitmap.cpp
@@ -502,7 +502,7 @@ L9BOOL bitmap_pc1_decode(char *file, int x, int y) {
high byte of theBitStreamBuffer.
Set a counter (theBufferBitCounter) to 8 which you will use to keep track
- of when it is necesary to refill the buffer.
+ of when it is necessary to refill the buffer.
Set a L9BYTE variable (theNewPixel) to byte 40 (seedByte) of the header.
We need to do this because as part of identifying the pixel being
@@ -549,7 +549,7 @@ L9BOOL bitmap_pc1_decode(char *file, int x, int y) {
In this case, instead of the above routine we begin by removing
the low eight bits from the theBitStreamBuffer. We use the same
ono-by-one bit shift right process described above to do this,
- again checking after each shift if it is necesary to refill the
+ again checking after each shift if it is necessary to refill the
buffer's high byte.
When the eight bits have been removed we set theNewPixelIndex to
diff --git a/engines/glk/quest/geas_glk.h b/engines/glk/quest/geas_glk.h
index 8ea57e65d24..ebe6e7ac50f 100644
--- a/engines/glk/quest/geas_glk.h
+++ b/engines/glk/quest/geas_glk.h
@@ -31,7 +31,7 @@ namespace Quest {
/* User interface bridge from Geas Core to Glk.
- Glk Window arrangment.
+ Glk Window arrangement.
+---------+
| B |
diff --git a/engines/glk/scott/unp64/scanners/eca.cpp b/engines/glk/scott/unp64/scanners/eca.cpp
index 0d8aced1541..ec443939a66 100644
--- a/engines/glk/scott/unp64/scanners/eca.cpp
+++ b/engines/glk/scott/unp64/scanners/eca.cpp
@@ -130,7 +130,7 @@ void scnECA(UnpStr *unp) {
01ec C9 DF CMP #$DF ;<< not fixed, found as lower as $44 for
example 01ee D0 EA BNE $01DA 01f0 60 RTS Because of this,
$d000-dfff will be a copy of $e000-efff. So if $2d points to >= $d000,
- SOMETIMES it's better save upto $ffff or: mem[$2d]|(mem[$2e]+$10)<<8
+ SOMETIMES it's better save up to $ffff or: mem[$2d]|(mem[$2e]+$10)<<8
Still it's not a rule and I don't know exactly when.
17/06/09: Implemented but still experimental, so better check
extensively. use -v to know when it does the adjustments. 28/10/09:
diff --git a/engines/glk/scott/unp64/scanners/megabyte.cpp b/engines/glk/scott/unp64/scanners/megabyte.cpp
index 151d84b9d0c..94ffe30d6bf 100644
--- a/engines/glk/scott/unp64/scanners/megabyte.cpp
+++ b/engines/glk/scott/unp64/scanners/megabyte.cpp
@@ -49,7 +49,7 @@ void scnMegabyte(UnpStr *unp) {
unp->_endAdr = READ_LE_UINT16(&mem[p + 0x55]); // mem[p + 0x55] | mem[p + 0x56] << 8;
unp->_endAdr++;
unp->_strMem = 0x801;
- unp->_retAdr = 0x801; /* ususally it just runs */
+ unp->_retAdr = 0x801; /* usually it just runs */
unp->_idFlag = 1;
return;
}
diff --git a/engines/glk/tads/os_frob_tads.h b/engines/glk/tads/os_frob_tads.h
index a62dfe122e5..56d88851cf5 100644
--- a/engines/glk/tads/os_frob_tads.h
+++ b/engines/glk/tads/os_frob_tads.h
@@ -685,7 +685,7 @@ bool os_rmdir(const char *dir);
/* apply a default extension to a filename, if it doesn't already have one */
void os_defext(char *fname, const char *ext);
-/* unconditionally add an extention to a filename */
+/* unconditionally add an extension to a filename */
void os_addext(char *fname, const char *ext);
/* remove the extension from a filename */
diff --git a/engines/glk/tads/tads2/line_source_file.h b/engines/glk/tads/tads2/line_source_file.h
index 4b96a717b04..7d58cb8a8c6 100644
--- a/engines/glk/tads/tads2/line_source_file.h
+++ b/engines/glk/tads/tads2/line_source_file.h
@@ -125,7 +125,7 @@ void linfseek(lindef *lin, uchar *pos);
/* read */
int linfread(lindef *lin, uchar *buf, uint siz);
-/* add a signed delta to a seek positon */
+/* add a signed delta to a seek position */
void linfpadd(lindef *lin, uchar *pos, long delta);
/* query whether at top of file */
diff --git a/engines/glk/tads/tads2/vocabulary_parser.cpp b/engines/glk/tads/tads2/vocabulary_parser.cpp
index 6d53a676a87..051bc330aa9 100644
--- a/engines/glk/tads/tads2/vocabulary_parser.cpp
+++ b/engines/glk/tads/tads2/vocabulary_parser.cpp
@@ -2553,7 +2553,7 @@ static int vocg1o(voccxdef *ctx, char *cmd[], int typelist[],
VOC_RETVAL(ctx, save_sp, outcnt);
}
- /* check for ALL/ANY/BOTH/EITHER [OF] <plural> contruction */
+ /* check for ALL/ANY/BOTH/EITHER [OF] <plural> construction */
if ((vocspec(cmd[cur], VOCW_ALL)
|| vocspec(cmd[cur], VOCW_BOTH)
|| vocspec(cmd[cur], VOCW_ANY)) &&
@@ -3019,7 +3019,7 @@ retry_exclude_first:
if (chkact) { VOC_RETVAL(ctx, save_sp, 0); }
/*
- * tell the player about it unless supressing complaints,
+ * tell the player about it unless suppressing complaints,
* and return an error
*/
if (complain)
@@ -6092,7 +6092,7 @@ int vocdisambig(voccxdef *ctx, vocoldef *outlist, vocoldef *inlist,
/*
* Check for redundant objects in the list. If the same
* object appears multiple times in the list, remove the
- * extra occurrences. Sometimes, a game can inadvertantly
+ * extra occurrences. Sometimes, a game can inadvertently
* define the same vocabulary word several times for the
* same object, because of the parser's leniency with
* matching leading substrings of 6 characters or longer.
diff --git a/engines/glk/zcode/processor.h b/engines/glk/zcode/processor.h
index 2e244b0caf9..7c95c61edf6 100644
--- a/engines/glk/zcode/processor.h
+++ b/engines/glk/zcode/processor.h
@@ -1010,7 +1010,7 @@ protected:
void z_or();
/**
- * 16 bit substraction.
+ * 16 bit subtraction.
*
* zargs[0] = first value
* zargs[1] = second value
diff --git a/engines/glk/zcode/processor_streams.cpp b/engines/glk/zcode/processor_streams.cpp
index fdc2cb30b21..b1c220b6fc4 100644
--- a/engines/glk/zcode/processor_streams.cpp
+++ b/engines/glk/zcode/processor_streams.cpp
@@ -560,7 +560,7 @@ void Processor::z_save() {
bool success = false;
if (zargc != 0) {
- // Open auxilary file
+ // Open auxiliary file
frefid_t ref = glk_fileref_create_by_prompt(fileusage_Data | fileusage_BinaryMode,
filemode_Write, 0);
if (ref != nullptr) {
More information about the Scummvm-git-logs
mailing list