diff --git a/engines/ags/engine/ac/dynobj/cc_ags_dynamic_object.h b/engines/ags/engine/ac/dynobj/cc_ags_dynamic_object.h index 3db089bd2ae..cbf2686d812 100644 --- a/engines/ags/engine/ac/dynobj/cc_ags_dynamic_object.h +++ b/engines/ags/engine/ac/dynobj/cc_ags_dynamic_object.h @@ -29,7 +29,7 @@ // byte buffer. // // AGSCCDynamicObject, extends CCBasicObject: parent for built-in dynamic -// object managers; provides simplier serialization methods working with +// object managers; provides simpler serialization methods working with // streams instead of a raw memory buffer. // // AGSCCStaticObject, extends CCBasicObject: a formal stub, intended as diff --git a/engines/ags/engine/script/script.h b/engines/ags/engine/script/script.h index 47fb910df85..2e3e773a2ef 100644 --- a/engines/ags/engine/script/script.h +++ b/engines/ags/engine/script/script.h @@ -76,11 +76,11 @@ void run_function_on_non_blocking_thread(NonBlockingScriptFunction *funcToRun // Runs the ObjectEvent using an old interaction callback type of 'evnt' index, // or alternatively of 'chkAny' index, if previous does not exist; // 'isInv' tells if this is a inventory event (it has a slightly different handling for that) -// Returns 0 normally, or -1 telling of a game state change (eg. a room change occured). +// Returns 0 normally, or -1 telling of a game state change (eg. a room change occurred). int run_interaction_event(const ObjectEvent &obj_evt, Interaction *nint, int evnt, int chkAny = -1, bool isInv = false); // Runs the ObjectEvent using a script callback of 'evnt' index, // or alternatively of 'chkAny' index, if previous does not exist -// Returns 0 normally, or -1 telling of a game state change (eg. a room change occured). +// Returns 0 normally, or -1 telling of a game state change (eg. a room change occurred). int run_interaction_script(const ObjectEvent &obj_evt, InteractionScripts *nint, int evnt, int chkAny = -1); int run_interaction_commandlist(const ObjectEvent &obj_evt, InteractionCommandList *nicl, int *timesrun, int *cmdsrun); void run_unhandled_event(const ObjectEvent &obj_evt, int evnt); diff --git a/engines/ags/shared/util/data_stream.h b/engines/ags/shared/util/data_stream.h index 863e46add71..667707ebecd 100644 --- a/engines/ags/shared/util/data_stream.h +++ b/engines/ags/shared/util/data_stream.h @@ -128,7 +128,7 @@ public: // StreamSection does NOT own the base stream, and closing // a "stream section" does NOT close the base stream. // Base stream must stay in memory for as long as there are -// "stream sections" refering it. +// "stream sections" referring it. class DataStreamSection : public DataStream { public: // Constructs a StreamSection over a base stream, diff --git a/engines/ags/shared/util/string_compat.cpp b/engines/ags/shared/util/string_compat.cpp index d1a002e3e84..a610317c810 100644 --- a/engines/ags/shared/util/string_compat.cpp +++ b/engines/ags/shared/util/string_compat.cpp @@ -73,7 +73,7 @@ int ags_strncpy_s(char *dest, size_t dest_sz, const char *src, size_t count) { for (; *psrc && (psrc != src_end); ++psrc, ++pdst) *pdst = *psrc; *pdst = 0; // ensure null terminator - assert((*psrc == 0) || ((psrc - src) == (int)count)); // assert that no *unintended* truncation occured + assert((*psrc == 0) || ((psrc - src) == (int)count)); // assert that no *unintended* truncation occurred if ((*psrc != 0) && ((psrc - src) < (int)count)) return AL_ERANGE; // not enough dest buffer - error return 0; // success