diff --git a/source/build/include/build.h b/source/build/include/build.h index 966fff7b6..5acd1f81a 100644 --- a/source/build/include/build.h +++ b/source/build/include/build.h @@ -1182,8 +1182,8 @@ void updatesector(int32_t const x, int32_t const y, int16_t * const sectnum) ATT void updatesectorexclude(int32_t const x, int32_t const y, int16_t * const sectnum, const uint8_t * const excludesectbitmap) ATTRIBUTE((nonnull(3,4))); void updatesectorz(int32_t const x, int32_t const y, int32_t const z, int16_t * const sectnum) ATTRIBUTE((nonnull(4))); -void updatesectorneighbour(int32_t const x, int32_t const y, int16_t * const sectnum, int32_t initialMaxDistance = INITIALUPDATESECTORDIST, int32_t maxDistance = MAXUPDATESECTORDIST) ATTRIBUTE((nonnull(3))); -void updatesectorneighbourz(int32_t const x, int32_t const y, int32_t const z, int16_t * const sectnum, int32_t initialMaxDistance = INITIALUPDATESECTORDIST, int32_t maxDistance = MAXUPDATESECTORDIST) ATTRIBUTE((nonnull(4))); +void updatesectorneighbor(int32_t const x, int32_t const y, int16_t * const sectnum, int32_t initialMaxDistance = INITIALUPDATESECTORDIST, int32_t maxDistance = MAXUPDATESECTORDIST) ATTRIBUTE((nonnull(3))); +void updatesectorneighborz(int32_t const x, int32_t const y, int32_t const z, int16_t * const sectnum, int32_t initialMaxDistance = INITIALUPDATESECTORDIST, int32_t maxDistance = MAXUPDATESECTORDIST) ATTRIBUTE((nonnull(4))); int findwallbetweensectors(int sect1, int sect2); static FORCE_INLINE bool sectoradjacent(int sect1, int sect2) { return findwallbetweensectors(sect1, sect2) != -1; } diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp index 54faa005c..7bb3b9086 100644 --- a/source/build/src/engine.cpp +++ b/source/build/src/engine.cpp @@ -11413,7 +11413,7 @@ int findwallbetweensectors(int sect1, int sect2) void updatesector(int32_t const x, int32_t const y, int16_t * const sectnum) { int16_t sect = *sectnum; - updatesectorneighbour(x, y, §, INITIALUPDATESECTORDIST, MAXUPDATESECTORDIST); + updatesectorneighbor(x, y, §, INITIALUPDATESECTORDIST, MAXUPDATESECTORDIST); if (sect != -1) SET_AND_RETURN(*sectnum, sect); @@ -11460,7 +11460,7 @@ void updatesectorexclude(int32_t const x, int32_t const y, int16_t * const sectn void updatesectorz(int32_t const x, int32_t const y, int32_t const z, int16_t * const sectnum) { int16_t sect = *sectnum; - updatesectorneighbourz(x, y, z, §, INITIALUPDATESECTORDIST, MAXUPDATESECTORDIST); + updatesectorneighborz(x, y, z, §, INITIALUPDATESECTORDIST, MAXUPDATESECTORDIST); if (sect != -1) SET_AND_RETURN(*sectnum, sect); @@ -11472,7 +11472,7 @@ void updatesectorz(int32_t const x, int32_t const y, int32_t const z, int16_t * *sectnum = -1; } -void updatesectorneighbour(int32_t const x, int32_t const y, int16_t * const sectnum, int32_t initialMaxDistance /*= INITIALUPDATESECTORDIST*/, int32_t maxDistance /*= MAXUPDATESECTORDIST*/) +void updatesectorneighbor(int32_t const x, int32_t const y, int16_t * const sectnum, int32_t initialMaxDistance /*= INITIALUPDATESECTORDIST*/, int32_t maxDistance /*= MAXUPDATESECTORDIST*/) { int const initialsectnum = *sectnum; @@ -11508,7 +11508,7 @@ void updatesectorneighbour(int32_t const x, int32_t const y, int16_t * const sec *sectnum = -1; } -void updatesectorneighbourz(int32_t const x, int32_t const y, int32_t const z, int16_t * const sectnum, int32_t initialMaxDistance /*= 0*/, int32_t maxDistance /*= 0*/) +void updatesectorneighborz(int32_t const x, int32_t const y, int32_t const z, int16_t * const sectnum, int32_t initialMaxDistance /*= 0*/, int32_t maxDistance /*= 0*/) { bool nofirstzcheck = false; diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp index db0864b26..768302b61 100644 --- a/source/duke3d/src/gamedef.cpp +++ b/source/duke3d/src/gamedef.cpp @@ -546,8 +546,8 @@ static tokenmap_t const vm_keywords[] = { "undefinevolume", CON_UNDEFINEVOLUME }, { "updatesector", CON_UPDATESECTOR }, { "updatesectorz", CON_UPDATESECTORZ }, - { "updatesectorneighbour", CON_UPDATESECTORNEIGHBOUR }, - { "updatesectorneighbourz", CON_UPDATESECTORNEIGHBOURZ }, + { "updatesectorneighbor", CON_UPDATESECTORNEIGHBOR }, + { "updatesectorneighborz", CON_UPDATESECTORNEIGHBORZ }, { "useractor", CON_USERACTOR }, { "userquote", CON_USERQUOTE }, { "wackplayer", CON_WACKPLAYER }, @@ -4132,7 +4132,7 @@ setvarvar: case CON_GETFLORZOFSLOPE: case CON_GETCEILZOFSLOPE: case CON_UPDATESECTORZ: - case CON_UPDATESECTORNEIGHBOURZ: + case CON_UPDATESECTORNEIGHBORZ: C_GetManyVars(3); C_GetNextVarType(GAMEVAR_READONLY); continue; @@ -4551,7 +4551,7 @@ ifvar: case CON_CANSEESPR: case CON_UPDATESECTOR: - case CON_UPDATESECTORNEIGHBOUR: + case CON_UPDATESECTORNEIGHBOR: case CON_QSTRCMP: C_GetManyVars(2); C_GetNextVarType(GAMEVAR_READONLY); diff --git a/source/duke3d/src/gamedef.h b/source/duke3d/src/gamedef.h index 9dd0cbfc3..c23c59ae7 100644 --- a/source/duke3d/src/gamedef.h +++ b/source/duke3d/src/gamedef.h @@ -1321,8 +1321,8 @@ enum IterationTypes_t TRANSFORM(CON_TOSSWEAPON) DELIMITER \ TRANSFORM(CON_UPDATESECTOR) DELIMITER \ TRANSFORM(CON_UPDATESECTORZ) DELIMITER \ - TRANSFORM(CON_UPDATESECTORNEIGHBOUR) DELIMITER \ - TRANSFORM(CON_UPDATESECTORNEIGHBOURZ) DELIMITER \ + TRANSFORM(CON_UPDATESECTORNEIGHBOR) DELIMITER \ + TRANSFORM(CON_UPDATESECTORNEIGHBORZ) DELIMITER \ TRANSFORM(CON_USERQUOTE) DELIMITER \ TRANSFORM(CON_WACKPLAYER) DELIMITER \ TRANSFORM(CON_WRITEARRAYTOFILE) DELIMITER \ diff --git a/source/duke3d/src/gameexec.cpp b/source/duke3d/src/gameexec.cpp index 3b09a5573..e1150dd8f 100644 --- a/source/duke3d/src/gameexec.cpp +++ b/source/duke3d/src/gameexec.cpp @@ -4740,7 +4740,7 @@ badindex: dispatch(); } - vInstruction(CON_UPDATESECTORNEIGHBOUR): + vInstruction(CON_UPDATESECTORNEIGHBOR): insptr++; { vec2_t vect = { 0, 0 }; @@ -4752,12 +4752,12 @@ badindex: if ((unsigned)sectNum >= MAXSECTORS) sectNum = vm.pSprite->sectnum; - updatesectorneighbour(vect.x, vect.y, §Num, getsectordist(vect, sectNum)); + updatesectorneighbor(vect.x, vect.y, §Num, getsectordist(vect, sectNum)); Gv_SetVar(returnVar, sectNum); dispatch(); } - vInstruction(CON_UPDATESECTORNEIGHBOURZ): + vInstruction(CON_UPDATESECTORNEIGHBORZ): insptr++; { vec3_t vect = { 0, 0, 0 }; @@ -4769,7 +4769,7 @@ badindex: if ((unsigned)sectNum >= MAXSECTORS) sectNum = vm.pSprite->sectnum; - updatesectorneighbourz(vect.x, vect.y, vect.z, §Num, getsectordist({vect.x, vect.y}, sectNum)); + updatesectorneighborz(vect.x, vect.y, vect.z, §Num, getsectordist({vect.x, vect.y}, sectNum)); Gv_SetVar(returnVar, sectNum); dispatch(); } diff --git a/source/duke3d/src/m32def.cpp b/source/duke3d/src/m32def.cpp index 39c677f24..ca79d27bc 100644 --- a/source/duke3d/src/m32def.cpp +++ b/source/duke3d/src/m32def.cpp @@ -341,8 +341,8 @@ const char *keyw[] = "updatecursectnum", "updatesector", "updatesectorz", - "updatesectorneighbour", - "updatesectorneighbourz", + "updatesectorneighbor", + "updatesectorneighborz", "getzrange", "clipmove", "lineintersect", @@ -3065,10 +3065,10 @@ repeatcase: case CON_UPDATESECTOR: case CON_UPDATESECTORZ: - case CON_UPDATESECTORNEIGHBOUR: - case CON_UPDATESECTORNEIGHBOURZ: + case CON_UPDATESECTORNEIGHBOR: + case CON_UPDATESECTORNEIGHBORZ: C_GetManyVars(2); - if (tw==CON_UPDATESECTORZ || tw==CON_UPDATESECTORNEIGHBOURZ) + if (tw==CON_UPDATESECTORZ || tw==CON_UPDATESECTORNEIGHBORZ) C_GetNextVar(); C_GetNextVarType(GV_WRITABLE); break; diff --git a/source/duke3d/src/m32def.h b/source/duke3d/src/m32def.h index 5429114eb..bf95ead33 100644 --- a/source/duke3d/src/m32def.h +++ b/source/duke3d/src/m32def.h @@ -475,8 +475,8 @@ enum ScriptKeywords_t CON_UPDATECURSECTNUM, CON_UPDATESECTOR, CON_UPDATESECTORZ, - CON_UPDATESECTORNEIGHBOUR, - CON_UPDATESECTORNEIGHBOURZ, + CON_UPDATESECTORNEIGHBOR, + CON_UPDATESECTORNEIGHBORZ, CON_GETZRANGE, CON_CLIPMOVE, CON_LINEINTERSECT, diff --git a/source/duke3d/src/m32exec.cpp b/source/duke3d/src/m32exec.cpp index c94cfc75e..dd093f658 100644 --- a/source/duke3d/src/m32exec.cpp +++ b/source/duke3d/src/m32exec.cpp @@ -2116,12 +2116,12 @@ badindex: case CON_UPDATESECTOR: case CON_UPDATESECTORZ: - case CON_UPDATESECTORNEIGHBOUR: - case CON_UPDATESECTORNEIGHBOURZ: + case CON_UPDATESECTORNEIGHBOR: + case CON_UPDATESECTORNEIGHBORZ: insptr++; { int32_t x=Gv_GetVar(*insptr++), y=Gv_GetVar(*insptr++); - int32_t z=(tw==CON_UPDATESECTORZ || tw==CON_UPDATESECTORNEIGHBOURZ)?Gv_GetVar(*insptr++):0; + int32_t z=(tw==CON_UPDATESECTORZ || tw==CON_UPDATESECTORNEIGHBORZ)?Gv_GetVar(*insptr++):0; int32_t var=*insptr++; int16_t w; @@ -2130,14 +2130,14 @@ badindex: switch (tw) { - case CON_UPDATESECTORNEIGHBOURZ: - updatesectorneighbourz(x,y,z,&w,getsectordist({x, y}, w)); + case CON_UPDATESECTORNEIGHBORZ: + updatesectorneighborz(x,y,z,&w,getsectordist({x, y}, w)); continue; case CON_UPDATESECTORZ: updatesectorz(x,y,z,&w); continue; - case CON_UPDATESECTORNEIGHBOUR: - updatesectorneighbour(x,y,&w,getsectordist({x, y}, w)); + case CON_UPDATESECTORNEIGHBOR: + updatesectorneighbor(x,y,&w,getsectordist({x, y}, w)); continue; default: updatesector(x,y,&w);