teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-01-20 08:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- eliminated a few more typedefs,

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-31 13:37:57 +01:00
parent 89ab00fe99
commit 12c63d2337
9 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,7 @@ extern bool Voxel;
bool DrawScreen;
extern int f_c;
extern ParentalStruct aVoxelArray[MAXTILES];
extern TILE_INFO_TYPE aVoxelArray[MAXTILES];
void PreDrawStackedWater(void);

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

@ -70,7 +70,7 @@ bool bAutoSize = true; // Autosizing on/off
extern AMB_INFO ambarray[];
extern short NormalVisibility;
extern ParentalStruct aVoxelArray[MAXTILES];
extern TILE_INFO_TYPE aVoxelArray[MAXTILES];
// F U N C T I O N S //////////////////////////////////////////////////////////////////////////////

6
source/games/sw/src/parent.h
View file

@ -29,13 +29,11 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
BEGIN_SW_NS
#define INVISTILE 6145
typedef struct TILE_INFO_TYPE
struct TILE_INFO_TYPE
{
short Voxel; // Voxel Number to replace sprites with
// 0 = Invisible
} ParentalStruct;
};
END_SW_NS

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

@ -42,13 +42,13 @@ PLAYER PredictPlayer;
//USER PredictUser;
PLAYERp ppp = &PredictPlayer;
typedef struct
struct PREDICT
{
int x,y,z;
binangle ang;
fixedhoriz horiz;
short filler;
} PREDICT, *PREDICTp;
};
PREDICT Predict[/*MOVEFIFOSIZ*/256];
int predictmovefifoplc;
@ -123,7 +123,7 @@ void DoPrediction(PLAYERp ppp)
void CorrectPrediction(int actualfifoplc)
{
#if 0
PREDICTp predict = &Predict[actualfifoplc & (MOVEFIFOSIZ-1)];
PREDICT* predict = &Predict[actualfifoplc & (MOVEFIFOSIZ-1)];
if (!PredictionOn)
return;

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

@ -44,15 +44,15 @@ void SW_FloorPortalHack(DSWActor* actor, int z, int match);
void SW_CeilingPortalHack(DSWActor* actor, int z, int match);
#define ZMAX 400
typedef struct
enum { ZMAX = 400 };
struct SAVE
{
sectortype* sect[ZMAX];
int32_t zval[ZMAX];
int16_t pic[ZMAX];
int16_t zcount;
int16_t slope[ZMAX];
} SAVE, *SAVEp;
};
SAVE save;

12
source/games/sw/src/saveable.h
View file

@ -38,14 +38,14 @@ struct saveable_data
unsigned int size;
};
typedef struct
struct saveable_module
{
saveable_code *code;
unsigned int numcode;
saveable_data *data;
unsigned int numdata;
} saveable_module;
};
template <typename T>
constexpr std::enable_if_t<!std::is_pointer<T>::value, size_t> SAVE_SIZEOF(T const & obj) noexcept
@ -58,16 +58,16 @@ constexpr std::enable_if_t<!std::is_pointer<T>::value, size_t> SAVE_SIZEOF(T con
#define NUM_SAVEABLE_ITEMS(x) countof(x)
typedef struct
struct savedcodesym
{
FString name;
} savedcodesym;
};
typedef struct
struct saveddatasym
{
FString name;
unsigned int offset;
} saveddatasym;
};
void Saveable_Init(void);

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

@ -44,7 +44,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
BEGIN_SW_NS
ParentalStruct aVoxelArray[MAXTILES];
TILE_INFO_TYPE aVoxelArray[MAXTILES];
/*

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

@ -2009,7 +2009,7 @@ bool NearThings(PLAYERp pp)
short nti_cnt;
void NearTagList(NEAR_TAG_INFOp ntip, PLAYERp pp, int z, int dist, int type, int count)
void NearTagList(NEAR_TAG_INFO* ntip, PLAYERp pp, int z, int dist, int type, int count)
{
short save_lotag, save_hitag;
HitInfo near;
@ -2111,7 +2111,7 @@ void NearTagList(NEAR_TAG_INFOp ntip, PLAYERp pp, int z, int dist, int type, int
}
}
void BuildNearTagList(NEAR_TAG_INFOp ntip, int size, PLAYERp pp, int z, int dist, int type, int count)
void BuildNearTagList(NEAR_TAG_INFO* ntip, int size, PLAYERp pp, int z, int dist, int type, int count)
{
memset(ntip, -1, size);
nti_cnt = 0;

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

@ -56,13 +56,13 @@ enum SO_SCALE_TYPE
#define SCALE_POINT_SPEED (4 + RandomRange(8))
typedef struct
struct NEAR_TAG_INFO
{
int dist;
sectortype* sectp;
walltype* wallp;
DSWActor* actor;
} NEAR_TAG_INFO, *NEAR_TAG_INFOp;
};
extern short nti_cnt;
void DoSpawnSpotsForKill(short match);