Move skinrecord_t and unloaded_skin_t to doomstat.h

Unfortunately, they are necessary to have in this already bloated file, to avoid circular dependency in future work.
This commit is contained in:
toaster 2023-05-29 12:57:42 +01:00
parent 1527471678
commit cd2a4b3807
3 changed files with 19 additions and 19 deletions

View file

@ -113,6 +113,23 @@ extern preciptype_t curWeather;
/** Time attack information, currently a very small structure.
*/
struct skinrecord_t
{
UINT32 wins;
};
struct unloaded_skin_t
{
char name[SKINNAMESIZE+1];
UINT32 namehash;
skinrecord_t records;
unloaded_skin_t *next;
};
extern unloaded_skin_t *unloadedskins;
// mapvisited is now a set of flags that says what we've done in the map.
#define MV_VISITED (1)
#define MV_BEATEN (1<<1)

View file

@ -34,11 +34,6 @@ extern "C" {
#define DEFAULTSKIN3 "sonic" // third player
#define DEFAULTSKIN4 "knuckles" // fourth player
struct skinrecord_t
{
UINT32 wins;
};
/// The skin_t struct
struct skin_t
{
@ -76,18 +71,6 @@ struct skin_t
spriteinfo_t sprinfo[NUMPLAYERSPRITES*2];
};
struct unloaded_skin_t
{
char name[SKINNAMESIZE+1];
UINT32 namehash;
skinrecord_t records;
unloaded_skin_t *next;
};
extern unloaded_skin_t *unloadedskins;
enum facepatches {
FACE_RANK = 0,
FACE_WANTED,

View file

@ -113,6 +113,8 @@ TYPEDEF (skincolor_t);
// doomstat.h
TYPEDEF (precipprops_t);
TYPEDEF (skinrecord_t);
TYPEDEF (unloaded_skin_t);
TYPEDEF (recorddata_t);
TYPEDEF (cupwindata_t);
TYPEDEF (scene_t);
@ -385,9 +387,7 @@ TYPEDEF (visffloor_t);
TYPEDEF (portal_t);
// r_skins.h
TYPEDEF (skinrecord_t);
TYPEDEF (skin_t);
TYPEDEF (unloaded_skin_t);
// r_splats.h
TYPEDEF (floorsplat_t);