zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-04-25 00:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Amend r7805

Browse source 
'Murica.

git-svn-id: https://svn.eduke32.com/eduke32@7811 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-07-19 03:14:53 +00:00 committed by Christoph Oelckers
parent 763b4b8d7f
commit 165b320f64
8 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/build/include/build.h
View file

@ -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, void updatesectorexclude(int32_t const x, int32_t const y, int16_t * const sectnum,
const uint8_t * const excludesectbitmap) ATTRIBUTE((nonnull(3,4))); 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 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 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 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 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); int findwallbetweensectors(int sect1, int sect2);
static FORCE_INLINE bool sectoradjacent(int sect1, int sect2) { return findwallbetweensectors(sect1, sect2) != -1; } static FORCE_INLINE bool sectoradjacent(int sect1, int sect2) { return findwallbetweensectors(sect1, sect2) != -1; }

8
source/build/src/engine.cpp
View file

@ -11413,7 +11413,7 @@ int findwallbetweensectors(int sect1, int sect2)
void updatesector(int32_t const x, int32_t const y, int16_t * const sectnum) void updatesector(int32_t const x, int32_t const y, int16_t * const sectnum)
{ {
int16_t sect = *sectnum; int16_t sect = *sectnum;
updatesectorneighbour(x, y, &sect, INITIALUPDATESECTORDIST, MAXUPDATESECTORDIST); updatesectorneighbor(x, y, &sect, INITIALUPDATESECTORDIST, MAXUPDATESECTORDIST);
if (sect != -1) if (sect != -1)
SET_AND_RETURN(*sectnum, sect); 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) void updatesectorz(int32_t const x, int32_t const y, int32_t const z, int16_t * const sectnum)
{ {
int16_t sect = *sectnum; int16_t sect = *sectnum;
updatesectorneighbourz(x, y, z, &sect, INITIALUPDATESECTORDIST, MAXUPDATESECTORDIST); updatesectorneighborz(x, y, z, &sect, INITIALUPDATESECTORDIST, MAXUPDATESECTORDIST);
if (sect != -1) if (sect != -1)
SET_AND_RETURN(*sectnum, sect); 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; *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; int const initialsectnum = *sectnum;
@ -11508,7 +11508,7 @@ void updatesectorneighbour(int32_t const x, int32_t const y, int16_t * const sec
*sectnum = -1; *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; bool nofirstzcheck = false;

8
source/duke3d/src/gamedef.cpp
View file

@ -546,8 +546,8 @@ static tokenmap_t const vm_keywords[] =
{ "undefinevolume", CON_UNDEFINEVOLUME }, { "undefinevolume", CON_UNDEFINEVOLUME },
{ "updatesector", CON_UPDATESECTOR }, { "updatesector", CON_UPDATESECTOR },
{ "updatesectorz", CON_UPDATESECTORZ }, { "updatesectorz", CON_UPDATESECTORZ },
{ "updatesectorneighbour", CON_UPDATESECTORNEIGHBOUR }, { "updatesectorneighbor", CON_UPDATESECTORNEIGHBOR },
{ "updatesectorneighbourz", CON_UPDATESECTORNEIGHBOURZ }, { "updatesectorneighborz", CON_UPDATESECTORNEIGHBORZ },
{ "useractor", CON_USERACTOR }, { "useractor", CON_USERACTOR },
{ "userquote", CON_USERQUOTE }, { "userquote", CON_USERQUOTE },
{ "wackplayer", CON_WACKPLAYER }, { "wackplayer", CON_WACKPLAYER },
@ -4132,7 +4132,7 @@ setvarvar:
case CON_GETFLORZOFSLOPE: case CON_GETFLORZOFSLOPE:
case CON_GETCEILZOFSLOPE: case CON_GETCEILZOFSLOPE:
case CON_UPDATESECTORZ: case CON_UPDATESECTORZ:
case CON_UPDATESECTORNEIGHBOURZ: case CON_UPDATESECTORNEIGHBORZ:
C_GetManyVars(3); C_GetManyVars(3);
C_GetNextVarType(GAMEVAR_READONLY); C_GetNextVarType(GAMEVAR_READONLY);
continue; continue;
@ -4551,7 +4551,7 @@ ifvar:
case CON_CANSEESPR: case CON_CANSEESPR:
case CON_UPDATESECTOR: case CON_UPDATESECTOR:
case CON_UPDATESECTORNEIGHBOUR: case CON_UPDATESECTORNEIGHBOR:
case CON_QSTRCMP: case CON_QSTRCMP:
C_GetManyVars(2); C_GetManyVars(2);
C_GetNextVarType(GAMEVAR_READONLY); C_GetNextVarType(GAMEVAR_READONLY);

4
source/duke3d/src/gamedef.h
View file

@ -1321,8 +1321,8 @@ enum IterationTypes_t
TRANSFORM(CON_TOSSWEAPON) DELIMITER \ TRANSFORM(CON_TOSSWEAPON) DELIMITER \
TRANSFORM(CON_UPDATESECTOR) DELIMITER \ TRANSFORM(CON_UPDATESECTOR) DELIMITER \
TRANSFORM(CON_UPDATESECTORZ) DELIMITER \ TRANSFORM(CON_UPDATESECTORZ) DELIMITER \
TRANSFORM(CON_UPDATESECTORNEIGHBOUR) DELIMITER \ TRANSFORM(CON_UPDATESECTORNEIGHBOR) DELIMITER \
TRANSFORM(CON_UPDATESECTORNEIGHBOURZ) DELIMITER \ TRANSFORM(CON_UPDATESECTORNEIGHBORZ) DELIMITER \
TRANSFORM(CON_USERQUOTE) DELIMITER \ TRANSFORM(CON_USERQUOTE) DELIMITER \
TRANSFORM(CON_WACKPLAYER) DELIMITER \ TRANSFORM(CON_WACKPLAYER) DELIMITER \
TRANSFORM(CON_WRITEARRAYTOFILE) DELIMITER \ TRANSFORM(CON_WRITEARRAYTOFILE) DELIMITER \

8
source/duke3d/src/gameexec.cpp
View file

@ -4740,7 +4740,7 @@ badindex:
dispatch(); dispatch();
} }
vInstruction(CON_UPDATESECTORNEIGHBOUR): vInstruction(CON_UPDATESECTORNEIGHBOR):
insptr++; insptr++;
{ {
vec2_t vect = { 0, 0 }; vec2_t vect = { 0, 0 };
@ -4752,12 +4752,12 @@ badindex:
if ((unsigned)sectNum >= MAXSECTORS) if ((unsigned)sectNum >= MAXSECTORS)
sectNum = vm.pSprite->sectnum; sectNum = vm.pSprite->sectnum;
updatesectorneighbour(vect.x, vect.y, &sectNum, getsectordist(vect, sectNum)); updatesectorneighbor(vect.x, vect.y, &sectNum, getsectordist(vect, sectNum));
Gv_SetVar(returnVar, sectNum); Gv_SetVar(returnVar, sectNum);
dispatch(); dispatch();
} }
vInstruction(CON_UPDATESECTORNEIGHBOURZ): vInstruction(CON_UPDATESECTORNEIGHBORZ):
insptr++; insptr++;
{ {
vec3_t vect = { 0, 0, 0 }; vec3_t vect = { 0, 0, 0 };
@ -4769,7 +4769,7 @@ badindex:
if ((unsigned)sectNum >= MAXSECTORS) if ((unsigned)sectNum >= MAXSECTORS)
sectNum = vm.pSprite->sectnum; sectNum = vm.pSprite->sectnum;
updatesectorneighbourz(vect.x, vect.y, vect.z, &sectNum, getsectordist({vect.x, vect.y}, sectNum)); updatesectorneighborz(vect.x, vect.y, vect.z, &sectNum, getsectordist({vect.x, vect.y}, sectNum));
Gv_SetVar(returnVar, sectNum); Gv_SetVar(returnVar, sectNum);
dispatch(); dispatch();
} }

10
source/duke3d/src/m32def.cpp
View file

@ -341,8 +341,8 @@ const char *keyw[] =
"updatecursectnum", "updatecursectnum",
"updatesector", "updatesector",
"updatesectorz", "updatesectorz",
"updatesectorneighbour", "updatesectorneighbor",
"updatesectorneighbourz", "updatesectorneighborz",
"getzrange", "getzrange",
"clipmove", "clipmove",
"lineintersect", "lineintersect",
@ -3065,10 +3065,10 @@ repeatcase:
case CON_UPDATESECTOR: case CON_UPDATESECTOR:
case CON_UPDATESECTORZ: case CON_UPDATESECTORZ:
case CON_UPDATESECTORNEIGHBOUR: case CON_UPDATESECTORNEIGHBOR:
case CON_UPDATESECTORNEIGHBOURZ: case CON_UPDATESECTORNEIGHBORZ:
C_GetManyVars(2); C_GetManyVars(2);
if (tw==CON_UPDATESECTORZ || tw==CON_UPDATESECTORNEIGHBOURZ) if (tw==CON_UPDATESECTORZ || tw==CON_UPDATESECTORNEIGHBORZ)
C_GetNextVar(); C_GetNextVar();
C_GetNextVarType(GV_WRITABLE); C_GetNextVarType(GV_WRITABLE);
break; break;

4
source/duke3d/src/m32def.h
View file

@ -475,8 +475,8 @@ enum ScriptKeywords_t
CON_UPDATECURSECTNUM, CON_UPDATECURSECTNUM,
CON_UPDATESECTOR, CON_UPDATESECTOR,
CON_UPDATESECTORZ, CON_UPDATESECTORZ,
CON_UPDATESECTORNEIGHBOUR, CON_UPDATESECTORNEIGHBOR,
CON_UPDATESECTORNEIGHBOURZ, CON_UPDATESECTORNEIGHBORZ,
CON_GETZRANGE, CON_GETZRANGE,
CON_CLIPMOVE, CON_CLIPMOVE,
CON_LINEINTERSECT, CON_LINEINTERSECT,

14
source/duke3d/src/m32exec.cpp
View file

@ -2116,12 +2116,12 @@ badindex:
case CON_UPDATESECTOR: case CON_UPDATESECTOR:
case CON_UPDATESECTORZ: case CON_UPDATESECTORZ:
case CON_UPDATESECTORNEIGHBOUR: case CON_UPDATESECTORNEIGHBOR:
case CON_UPDATESECTORNEIGHBOURZ: case CON_UPDATESECTORNEIGHBORZ:
insptr++; insptr++;
{ {
int32_t x=Gv_GetVar(*insptr++), y=Gv_GetVar(*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++; int32_t var=*insptr++;
int16_t w; int16_t w;
@ -2130,14 +2130,14 @@ badindex:
switch (tw) switch (tw)
{ {
case CON_UPDATESECTORNEIGHBOURZ: case CON_UPDATESECTORNEIGHBORZ:
updatesectorneighbourz(x,y,z,&w,getsectordist({x, y}, w)); updatesectorneighborz(x,y,z,&w,getsectordist({x, y}, w));
continue; continue;
case CON_UPDATESECTORZ: case CON_UPDATESECTORZ:
updatesectorz(x,y,z,&w); updatesectorz(x,y,z,&w);
continue; continue;
case CON_UPDATESECTORNEIGHBOUR: case CON_UPDATESECTORNEIGHBOR:
updatesectorneighbour(x,y,&w,getsectordist({x, y}, w)); updatesectorneighbor(x,y,&w,getsectordist({x, y}, w));
continue; continue;
default: default:
updatesector(x,y,&w); updatesector(x,y,&w);