zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- only use un-deprecated variants of updatesector(z) in SW.

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-07 20:23:52 +01:00
parent 94b2b0af31
commit a35900362e
5 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -434,21 +434,7 @@ int32_t try_facespr_intersect(uspriteptr_t const spr, vec3_t const in,
#define MAXUPDATESECTORDIST 1536 #define MAXUPDATESECTORDIST 1536
#define INITIALUPDATESECTORDIST 256 #define INITIALUPDATESECTORDIST 256
void updatesector(int const x, int const y, int * const sectnum) ATTRIBUTE((nonnull(3))); void updatesector(int const x, int const y, int * const sectnum) ATTRIBUTE((nonnull(3)));
[[deprecated]]
inline void updatesector(int32_t const x, int32_t const y, int16_t * const sectnum)
{
int snum = *sectnum;
updatesector(x, y, &snum);
*sectnum = snum;
}
void updatesectorz(int32_t const x, int32_t const y, int32_t const z, int * const sectnum) ATTRIBUTE((nonnull(4))); void updatesectorz(int32_t const x, int32_t const y, int32_t const z, int * const sectnum) ATTRIBUTE((nonnull(4)));
[[deprecated]]
inline void updatesectorz(int32_t const x, int32_t const y, int32_t const z, int16_t* const sectnum)
{
int snum = *sectnum;
updatesectorz(x, y, z, &snum);
*sectnum = snum;
}
void updatesectorneighbor(int32_t const x, int32_t const y, int * const sectnum, int32_t initialMaxDistance = INITIALUPDATESECTORDIST, int32_t maxDistance = MAXUPDATESECTORDIST) ATTRIBUTE((nonnull(3))); void updatesectorneighbor(int32_t const x, int32_t const y, int * 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, int * 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, int * const sectnum, int32_t initialMaxDistance = INITIALUPDATESECTORDIST, int32_t maxDistance = MAXUPDATESECTORDIST) ATTRIBUTE((nonnull(4)));

6
source/games/sw/src/break.cpp
View file

@ -745,7 +745,7 @@ bool UserBreakWall(WALLp wp, short)
return false; return false;
} }
int WallBreakPosition(short hit_wall, short *sectnum, int *x, int *y, int *z, short *ang) int WallBreakPosition(short hit_wall, int *sectnum, int *x, int *y, int *z, short *ang)
{ {
short w,nw; short w,nw;
WALLp wp; WALLp wp;
@ -823,7 +823,7 @@ bool HitBreakWall(WALLp wp, int hit_x, int hit_y, int hit_z, short ang, short ty
//if (hit_x == INT32_MAX) //if (hit_x == INT32_MAX)
{ {
short sectnum; int sectnum;
WallBreakPosition(short(wp - wall), &sectnum, &hit_x, &hit_y, &hit_z, &ang); WallBreakPosition(short(wp - wall), &sectnum, &hit_x, &hit_y, &hit_z, &ang);
} }
@ -1091,7 +1091,7 @@ static int SectorOfWall(short theline)
void DoWallBreakMatch(short match) void DoWallBreakMatch(short match)
{ {
short i,sectnum; int i,sectnum;
int x,y,z; int x,y,z;
WALLp wp; WALLp wp;
short wall_ang; short wall_ang;

2
source/games/sw/src/break.h
View file

@ -51,7 +51,7 @@ short FindBreakSpriteMatch(short match);
bool HitBreakWall(WALLp wp, int, int, int, short ang, short type); bool HitBreakWall(WALLp wp, int, int, int, short ang, short type);
int HitBreakSprite(short BreakSprite, short type); int HitBreakSprite(short BreakSprite, short type);
bool CheckBreakToughness(BREAK_INFOp break_info, short ID); bool CheckBreakToughness(BREAK_INFOp break_info, short ID);
int WallBreakPosition(short hit_wall, short *sectnum, int *x, int *y, int *z, short *ang); int WallBreakPosition(short hit_wall, int *sectnum, int *x, int *y, int *z, short *ang);
void SortBreakInfo(void); void SortBreakInfo(void);
END_SW_NS END_SW_NS

2
source/games/sw/src/game.h
View file

@ -1692,6 +1692,7 @@ struct SECTOR_OBJECTstruct
drive_speed, drive_speed,
drive_slide, drive_slide,
crush_z, crush_z,
op_main_sector, // main sector operational SO moves in - for speed purposes
flags; flags;
short sector[MAX_SO_SECTOR], // hold the sector numbers of the sector object short sector[MAX_SO_SECTOR], // hold the sector numbers of the sector object
@ -1727,7 +1728,6 @@ struct SECTOR_OBJECTstruct
turn_speed, // shift value determines how fast SO turns to match new angle turn_speed, // shift value determines how fast SO turns to match new angle
bob_sine_ndx, // index into sine table bob_sine_ndx, // index into sine table
bob_speed, // shift value for speed bob_speed, // shift value for speed
op_main_sector, // main sector operational SO moves in - for speed purposes
save_vel, // save velocity save_vel, // save velocity
save_spin_speed, // save spin speed save_spin_speed, // save spin speed
match_event, // match number match_event, // match number

4
source/games/sw/src/weapon.cpp
View file

@ -7652,7 +7652,6 @@ short StatBreakList[] =
void TraverseBreakableWalls(short start_sect, int x, int y, int z, short ang, int radius) void TraverseBreakableWalls(short start_sect, int x, int y, int z, short ang, int radius)
{ {
int WallBreakPosition(short hit_wall, short *sectnum, int *x, int *y, int *z, short *ang);
int j, k; int j, k;
short sectlist[MAXSECTORS]; // !JIM! Frank, 512 was not big enough for $dozer, was asserting out! short sectlist[MAXSECTORS]; // !JIM! Frank, 512 was not big enough for $dozer, was asserting out!
short sectlistplc, sectlistend, sect, startwall, endwall, nextsector; short sectlistplc, sectlistend, sect, startwall, endwall, nextsector;
@ -7660,7 +7659,8 @@ void TraverseBreakableWalls(short start_sect, int x, int y, int z, short ang, in
int dist; int dist;
short break_count; short break_count;
short sectnum,wall_ang; int sectnum;
short wall_ang;
int hit_x,hit_y,hit_z; int hit_x,hit_y,hit_z;
sectlist[0] = start_sect; sectlist[0] = start_sect;