zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 04:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

- eliminated SHRAP typedefs.

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-31 13:26:07 +01:00
parent 271af39a59
commit 085eb8a36e
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/sw/src/jsector.cpp
View file

@ -67,7 +67,7 @@ bool bSpinBobVoxels = false; // Do twizzly stuff to voxels, but
bool bAutoSize = true; // Autosizing on/off bool bAutoSize = true; // Autosizing on/off
//extern int chainnumpages; //extern int chainnumpages;
extern AMB_INFO ambarray[]; extern ambientstruct ambarray[];
extern short NormalVisibility; extern short NormalVisibility;
extern ParentalStruct aVoxelArray[MAXTILES]; extern ParentalStruct aVoxelArray[MAXTILES];

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

@ -1402,10 +1402,10 @@ void PreMapCombineFloors(void)
int dx, dy; int dx, dy;
short pnum; short pnum;
typedef struct struct BOUND_LIST
{ {
DSWActor* offset; DSWActor* offset;
} BOUND_LIST; };
BOUND_LIST BoundList[MAX_FLOORS]; BOUND_LIST BoundList[MAX_FLOORS];

2
source/games/sw/src/sumo.cpp
View file

@ -541,7 +541,7 @@ STATEp sg_SumoDead[] =
}; };
/* /*
typedef struct struct
{ {
#define MAX_ACTOR_CLOSE_ATTACK 2 #define MAX_ACTOR_CLOSE_ATTACK 2
#define MAX_ACTOR_ATTACK 6 #define MAX_ACTOR_ATTACK 6

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

@ -3037,7 +3037,7 @@ int SpawnShrap(DSWActor* parentActor, DSWActor* secondaryActor, int means, BREAK
{nullptr,0,0,0,0,0,0,0,0,0}, {nullptr,0,0,0,0,0,0,0,0,0},
}; };
static SHRAPp FireballExpShrap[] = static SHRAP* FireballExpShrap[] =
{ {
FireballExpShrap1, FireballExpShrap1,
FireballExpShrap2 FireballExpShrap2
@ -3144,7 +3144,7 @@ int SpawnShrap(DSWActor* parentActor, DSWActor* secondaryActor, int means, BREAK
int hz[3]; int hz[3];
short dang = 0; short dang = 0;
SHRAPp p = SmallGore; SHRAP* p = SmallGore;
short shrap_shade = -15; short shrap_shade = -15;
short shrap_xsize = 48, shrap_ysize = 48; short shrap_xsize = 48, shrap_ysize = 48;
short retval = true; short retval = true;
@ -3977,7 +3977,7 @@ int SpawnBlood(DSWActor* actor, DSWActor* weapActor, short hit_ang, int hit_x, i
short dang = 0; short dang = 0;
SHRAPp p = UziBlood; SHRAP* p = UziBlood;
short shrap_shade = -15; short shrap_shade = -15;
short shrap_xsize = 20, shrap_ysize = 20; short shrap_xsize = 20, shrap_ysize = 20;
short retval = true; short retval = true;

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

@ -200,13 +200,13 @@ int InitBunnyRocket(PLAYERp pp);
int GetDamage(DSWActor*, DSWActor*, int DamageNdx); int GetDamage(DSWActor*, DSWActor*, int DamageNdx);
int DoFlamesDamageTest(DSWActor*); int DoFlamesDamageTest(DSWActor*);
typedef struct struct SHRAP
{ {
STATEp state; STATEp state;
short id, num, zlevel, min_jspeed, max_jspeed, min_vel, max_vel, random_disperse, ang_range; short id, num, zlevel, min_jspeed, max_jspeed, min_vel, max_vel, random_disperse, ang_range;
// state, id, num, min_jspeed, max_jspeed, min_vel, max_vel, size, // state, id, num, min_jspeed, max_jspeed, min_vel, max_vel, size,
// random_disperse, ang_range // random_disperse, ang_range
} SHRAP, *SHRAPp; };
enum ShrapPos enum ShrapPos
{ {