From 051b4f8935e62a51698f8a30dfc056b80b5f1bb2 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 27 Nov 2022 17:20:42 -0800 Subject: [PATCH] Always use typedef name instead of struct name mobj_t instead of struct mobj_s --- src/command.h | 4 +-- src/d_clisrv.h | 4 +-- src/d_netfil.h | 4 +-- src/d_player.h | 2 +- src/d_think.h | 6 ++-- src/discord.h | 6 ++-- src/doomdata.h | 2 +- src/doomstat.h | 4 +-- src/k_bheap.h | 4 +-- src/k_menu.h | 16 +++++----- src/k_pathfind.h | 6 ++-- src/k_terrain.h | 2 +- src/k_waypoint.h | 6 ++-- src/m_dllist.h | 6 ++-- src/m_queue.h | 4 +-- src/p_local.h | 2 +- src/p_mobj.h | 62 ++++++++++++++++++------------------ src/p_polyobj.h | 16 +++++----- src/r_defs.h | 81 +++++++++++++++++++++++------------------------- src/r_draw.c | 2 +- src/r_draw.h | 2 +- src/r_plane.h | 10 +++--- src/r_portal.h | 4 +-- src/r_things.h | 14 ++++----- src/s_sound.h | 10 +++--- src/screen.h | 8 ++--- src/typedef.h | 74 +++++++++++++++++++++---------------------- 27 files changed, 179 insertions(+), 182 deletions(-) diff --git a/src/command.h b/src/command.h index 94cf2f269..6715d66a0 100644 --- a/src/command.h +++ b/src/command.h @@ -133,7 +133,7 @@ struct CV_PossibleValue_t const char *strvalue; }; -struct consvar_s //NULL, NULL, 0, NULL, NULL |, 0, NULL, NULL, 0, 0, NULL +struct consvar_t //NULL, NULL, 0, NULL, NULL |, 0, NULL, NULL, 0, 0, NULL { const char *name; const char *defaultvalue; @@ -157,7 +157,7 @@ struct consvar_s //NULL, NULL, 0, NULL, NULL |, 0, NULL, NULL, 0, 0, NULL UINT16 netid; // used internaly : netid for send end receive // used only with CV_NETVAR char changed; // has variable been changed by the user? 0 = no, 1 = yes - struct consvar_s *next; + consvar_t *next; }; /* name, defaultvalue, flags, PossibleValue, func */ diff --git a/src/d_clisrv.h b/src/d_clisrv.h index 4effefde8..42393da1b 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -528,7 +528,7 @@ extern boolean hu_stopped; // SRB2Kart // -struct rewind_s { +struct rewind_t { UINT8 savebuffer[(768*1024)]; tic_t leveltime; size_t demopos; @@ -536,7 +536,7 @@ struct rewind_s { ticcmd_t oldcmd[MAXPLAYERS]; mobj_t oldghost[MAXPLAYERS]; - struct rewind_s *next; + rewind_t *next; }; void CL_ClearRewinds(void); diff --git a/src/d_netfil.h b/src/d_netfil.h index 2bc415406..1191e1bfa 100644 --- a/src/d_netfil.h +++ b/src/d_netfil.h @@ -110,7 +110,7 @@ typedef enum LFTNS_SENT // The node already has the file } luafiletransfernodestatus_t; -struct luafiletransfer_s +struct luafiletransfer_t { char *filename; char *realfilename; @@ -119,7 +119,7 @@ struct luafiletransfer_s boolean ongoing; luafiletransfernodestatus_t nodestatus[MAXNETNODES]; tic_t nodetimeouts[MAXNETNODES]; - struct luafiletransfer_s *next; + luafiletransfer_t *next; }; extern luafiletransfer_t *luafiletransfers; diff --git a/src/d_player.h b/src/d_player.h index cfd72df1c..a65f0235b 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -332,7 +332,7 @@ struct skybox_t { // ======================================================================== // PLAYER STRUCTURE // ======================================================================== -struct player_s +struct player_t { mobj_t *mo; diff --git a/src/d_think.h b/src/d_think.h index 8f786a4ed..719efa564 100644 --- a/src/d_think.h +++ b/src/d_think.h @@ -40,10 +40,10 @@ typedef union typedef actionf_t think_t; // Doubly linked list of actors. -struct thinker_s +struct thinker_t { - struct thinker_s *prev; - struct thinker_s *next; + thinker_t *prev; + thinker_t *next; think_t function; // killough 11/98: count of how many other objects reference diff --git a/src/discord.h b/src/discord.h index 99444b3cd..eb38a8d2c 100644 --- a/src/discord.h +++ b/src/discord.h @@ -27,7 +27,7 @@ extern struct discordInfo_s { boolean everyoneCanInvite; } discordInfo; -struct discordRequest_s { +struct discordRequest_t { char *username; // Discord user name. char *discriminator; // Discord discriminator (The little hashtag thing after the username). Separated for a "hide discriminators" cvar. char *userID; // The ID of the Discord user, gets used with Discord_Respond() @@ -38,8 +38,8 @@ struct discordRequest_s { // Hey, wanna add ImageMagick as a dependency? :dying: //patch_t *avatar; - struct discordRequest_s *next; // Next request in the list. - struct discordRequest_s *prev; // Previous request in the list. Not used normally, but just in case something funky happens, this should repair the list. + discordRequest_t *next; // Next request in the list. + discordRequest_t *prev; // Previous request in the list. Not used normally, but just in case something funky happens, this should repair the list. }; extern discordRequest_t *discordRequestList; diff --git a/src/doomdata.h b/src/doomdata.h index 0c02c17d4..5767da5ec 100644 --- a/src/doomdata.h +++ b/src/doomdata.h @@ -222,7 +222,7 @@ struct mapthing_t fixed_t scale; INT32 args[NUMMAPTHINGARGS]; char *stringargs[NUMMAPTHINGSTRINGARGS]; - struct mobj_s *mobj; + mobj_t *mobj; }; #define ZSHIFT 4 diff --git a/src/doomstat.h b/src/doomstat.h index 739c69ad2..320e29c13 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -347,7 +347,7 @@ struct customoption_t #define CUPCACHE_SPECIAL (CUPCACHE_BONUS+MAXBONUSLIST) #define CUPCACHE_MAX (CUPCACHE_SPECIAL+1) -struct cupheader_s +struct cupheader_t { UINT16 id; ///< Cup ID char name[15]; ///< Cup title (14 chars) @@ -358,7 +358,7 @@ struct cupheader_s UINT8 numbonus; ///< Number of bonus stages defined UINT8 emeraldnum; ///< ID of Emerald to use for special stage (1-7 for Chaos Emeralds, 8-14 for Super Emeralds, 0 for no emerald) SINT8 unlockrequired; ///< An unlockable is required to select this cup. -1 for no unlocking required. - struct cupheader_s *next; ///< Next cup in linked list + cupheader_t *next; ///< Next cup in linked list }; extern cupheader_t *kartcupheaders; // Start of cup linked list diff --git a/src/k_bheap.h b/src/k_bheap.h index 881a8973c..be07b40df 100644 --- a/src/k_bheap.h +++ b/src/k_bheap.h @@ -21,12 +21,12 @@ struct bheapitem_t { size_t heapindex; // The index in the heap this item is updateindexfunc indexchanged; // A callback function that is called when this item changes index to alert data - struct bheap_s *owner; // The heap that owns this item + bheap_t *owner; // The heap that owns this item void *data; // data for this heap item UINT32 value; // The value of this item, the lowest value item is first in the array }; -struct bheap_s +struct bheap_t { size_t capacity; // capacity of the heap size_t count; // number of items in the heap diff --git a/src/k_menu.h b/src/k_menu.h index 7e222d212..d8a966775 100644 --- a/src/k_menu.h +++ b/src/k_menu.h @@ -101,15 +101,15 @@ extern M_waiting_mode_t m_waiting_mode; typedef union { - struct menu_s *submenu; // IT_SUBMENU + menu_t *submenu; // IT_SUBMENU consvar_t *cvar; // IT_CVAR void (*routine)(INT32 choice); // IT_CALL, IT_KEYHANDLER, IT_ARROWS } itemaction_t; // Player Setup menu colors linked list -struct menucolor_s { - struct menucolor_s *next; - struct menucolor_s *prev; +struct menucolor_t { + menucolor_t *next; + menucolor_t *prev; UINT16 color; }; @@ -136,10 +136,10 @@ struct menuitem_t INT32 mvar2; }; -struct menu_s +struct menu_t { INT16 numitems; // # of menu items - struct menu_s *prevMenu; // previous menu + menu_t *prevMenu; // previous menu INT16 lastOn; // last item user was on in menu menuitem_t *menuitems; // menu items @@ -537,8 +537,8 @@ extern menucmd_t menucmd[MAXSPLITSCREENPLAYERS]; extern struct menutransition_s { INT16 tics; INT16 dest; - struct menu_s *startmenu; - struct menu_s *endmenu; + menu_t *startmenu; + menu_t *endmenu; boolean in; } menutransition; diff --git a/src/k_pathfind.h b/src/k_pathfind.h index c18911202..38b0b207f 100644 --- a/src/k_pathfind.h +++ b/src/k_pathfind.h @@ -35,10 +35,10 @@ typedef boolean(*getpathfindfinishedfunc)(void*, void*); // A pathfindnode contains information about a node from the pathfinding // heapindex is only used within the pathfinding algorithm itself, and is always 0 after it is completed -struct pathfindnode_s { +struct pathfindnode_t { size_t heapindex; // The index in the openset binary heap. Only valid while the node is in the openset. void *nodedata; - struct pathfindnode_s *camefrom; // should eventually be the most efficient predecessor node + pathfindnode_t *camefrom; // should eventually be the most efficient predecessor node UINT32 gscore; // The accumulated distance from the start to this node UINT32 hscore; // The heuristic from this node to the goal }; @@ -46,7 +46,7 @@ struct pathfindnode_s { // Contains the final created path after pathfinding is completed struct path_t { size_t numnodes; - struct pathfindnode_s *array; + pathfindnode_t *array; UINT32 totaldist; }; diff --git a/src/k_terrain.h b/src/k_terrain.h index 56bf7df34..349455bed 100644 --- a/src/k_terrain.h +++ b/src/k_terrain.h @@ -98,7 +98,7 @@ typedef enum TRF_TRIPWIRE = 1<<3 // Texture is a tripwire when used as a midtexture } terrain_flags_t; -struct terrain_s +struct terrain_t { // Terrain definition. // These are all of the properties that the floor gets. diff --git a/src/k_waypoint.h b/src/k_waypoint.h index 9322477e1..9239cd41c 100644 --- a/src/k_waypoint.h +++ b/src/k_waypoint.h @@ -20,12 +20,12 @@ #define DEFAULT_WAYPOINT_RADIUS (384) -struct waypoint_s +struct waypoint_t { mobj_t *mobj; boolean onaline; - struct waypoint_s **nextwaypoints; - struct waypoint_s **prevwaypoints; + waypoint_t **nextwaypoints; + waypoint_t **prevwaypoints; UINT32 *nextwaypointdistances; UINT32 *prevwaypointdistances; size_t numnextwaypoints; diff --git a/src/m_dllist.h b/src/m_dllist.h index 9b9cfca81..1a1f0a6ea 100644 --- a/src/m_dllist.h +++ b/src/m_dllist.h @@ -29,10 +29,10 @@ #pragma warning(disable : 4706) #endif -struct mdllistitem_s +struct mdllistitem_t { - struct mdllistitem_s *next; - struct mdllistitem_s **prev; + mdllistitem_t *next; + mdllistitem_t **prev; }; FUNCINLINE static ATTRINLINE void M_DLListInsert(mdllistitem_t *item, mdllistitem_t **head) diff --git a/src/m_queue.h b/src/m_queue.h index 6ba8e335c..8e0c02797 100644 --- a/src/m_queue.h +++ b/src/m_queue.h @@ -13,9 +13,9 @@ #ifndef M_QUEUE_H #define M_QUEUE_H -struct mqueueitem_s +struct mqueueitem_t { - struct mqueueitem_s *next; + mqueueitem_t *next; }; struct mqueue_t diff --git a/src/p_local.h b/src/p_local.h index 70e26f9d9..e547bc7b4 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -96,7 +96,7 @@ struct camera_t //More drawing info: to determine current sprite. angle_t angle; // orientation - struct subsector_s *subsector; + subsector_t *subsector; // The closest interval over all contacted Sectors (or Things). fixed_t floorz; diff --git a/src/p_mobj.h b/src/p_mobj.h index 50686eac9..8811c0149 100644 --- a/src/p_mobj.h +++ b/src/p_mobj.h @@ -270,7 +270,7 @@ typedef enum { } precipflag_t; // Map Object definition. -struct mobj_s +struct mobj_t { // List: thinker links. thinker_t thinker; @@ -284,8 +284,8 @@ struct mobj_s fixed_t old_x2, old_y2, old_z2; // More list: links in sector (if needed) - struct mobj_s *snext; - struct mobj_s **sprev; // killough 8/11/98: change to ptr-to-ptr + mobj_t *snext; + mobj_t **sprev; // killough 8/11/98: change to ptr-to-ptr // More drawing info: to determine current sprite. angle_t angle, pitch, roll; // orientation @@ -302,17 +302,17 @@ struct mobj_s fixed_t spritexoffset, spriteyoffset; fixed_t old_spritexscale, old_spriteyscale; fixed_t old_spritexoffset, old_spriteyoffset; - struct pslope_s *floorspriteslope; // The slope that the floorsprite is rotated by + pslope_t *floorspriteslope; // The slope that the floorsprite is rotated by - struct msecnode_s *touching_sectorlist; // a linked list of sectors where this object appears + msecnode_t *touching_sectorlist; // a linked list of sectors where this object appears - struct subsector_s *subsector; // Subsector the mobj resides in. + subsector_t *subsector; // Subsector the mobj resides in. // The closest interval over all contacted sectors (or things). fixed_t floorz; // Nearest floor below. fixed_t ceilingz; // Nearest ceiling above. - struct ffloor_s *floorrover; // FOF referred by floorz - struct ffloor_s *ceilingrover; // FOF referred by ceilingz + ffloor_t *floorrover; // FOF referred by floorz + ffloor_t *ceilingrover; // FOF referred by ceilingz fixed_t floordrop; fixed_t ceilingdrop; @@ -337,15 +337,15 @@ struct mobj_s // Interaction info, by BLOCKMAP. // Links in blocks (if needed). - struct mobj_s *bnext; - struct mobj_s **bprev; // killough 8/11/98: change to ptr-to-ptr + mobj_t *bnext; + mobj_t **bprev; // killough 8/11/98: change to ptr-to-ptr // Additional pointers for NiGHTS hoops - struct mobj_s *hnext; - struct mobj_s *hprev; + mobj_t *hnext; + mobj_t *hprev; // One last pointer for kart item lists - struct mobj_s *itnext; + mobj_t *itnext; INT32 health; // for player this is rings + 1 -- no it isn't, not any more!! @@ -353,7 +353,7 @@ struct mobj_s angle_t movedir; // dirtype_t 0-7; also used by Deton for up/down angle INT32 movecount; // when 0, select a new dir - struct mobj_s *target; // Thing being chased/attacked (or NULL), and originator for missiles. + mobj_t *target; // Thing being chased/attacked (or NULL), and originator for missiles. INT32 reactiontime; // If not 0, don't attack yet. @@ -361,13 +361,13 @@ struct mobj_s // Additional info record for player avatars only. // Only valid if type == MT_PLAYER - struct player_s *player; + player_t *player; INT32 lastlook; // Player number last looked for. mapthing_t *spawnpoint; // Used for CTF flags, objectplace, and a handful other applications. - struct mobj_s *tracer; // Thing being chased/attacked for tracers. + mobj_t *tracer; // Thing being chased/attacked for tracers. fixed_t friction; fixed_t movefactor; @@ -394,7 +394,7 @@ struct mobj_s INT32 cusval; INT32 cvmem; - struct pslope_s *standingslope; // The slope that the object is standing on (shouldn't need synced in savegames, right?) + pslope_t *standingslope; // The slope that the object is standing on (shouldn't need synced in savegames, right?) boolean resetinterp; // if true, some fields should not be interpolated (see R_InterpolateMobjState implementation) boolean colorized; // Whether the mobj uses the rainbow colormap @@ -405,8 +405,8 @@ struct mobj_s fixed_t sprxoff, spryoff, sprzoff; // Sprite offsets in real space, does NOT affect position or collision - struct terrain_s *terrain; // Terrain definition of the floor this object last hit. NULL when in the air. - struct mobj_s *terrainOverlay; // Overlay sprite object for terrain + terrain_t *terrain; // Terrain definition of the floor this object last hit. NULL when in the air. + mobj_t *terrainOverlay; // Overlay sprite object for terrain INT32 hitlag; // Sal-style hit lag, straight from Captain Fetch's jowls UINT8 waterskip; // Water skipping counter @@ -423,7 +423,7 @@ struct mobj_s // so please keep the start of the // structure the same. // -struct precipmobj_s +struct precipmobj_t { // List: thinker links. thinker_t thinker; @@ -437,8 +437,8 @@ struct precipmobj_s fixed_t old_x2, old_y2, old_z2; // More list: links in sector (if needed) - struct precipmobj_s *snext; - struct precipmobj_s **sprev; // killough 8/11/98: change to ptr-to-ptr + precipmobj_t *snext; + precipmobj_t **sprev; // killough 8/11/98: change to ptr-to-ptr // More drawing info: to determine current sprite. angle_t angle, pitch, roll; // orientation @@ -455,17 +455,17 @@ struct precipmobj_s fixed_t spritexoffset, spriteyoffset; fixed_t old_spritexscale, old_spriteyscale; fixed_t old_spritexoffset, old_spriteyoffset; - struct pslope_s *floorspriteslope; // The slope that the floorsprite is rotated by + pslope_t *floorspriteslope; // The slope that the floorsprite is rotated by - struct mprecipsecnode_s *touching_sectorlist; // a linked list of sectors where this object appears + mprecipsecnode_t *touching_sectorlist; // a linked list of sectors where this object appears - struct subsector_s *subsector; // Subsector the mobj resides in. + subsector_t *subsector; // Subsector the mobj resides in. // The closest interval over all contacted sectors (or things). fixed_t floorz; // Nearest floor below. fixed_t ceilingz; // Nearest ceiling above. - struct ffloor_s *floorrover; // FOF referred by floorz - struct ffloor_s *ceilingrover; // FOF referred by ceilingz + ffloor_t *floorrover; // FOF referred by floorz + ffloor_t *ceilingrover; // FOF referred by ceilingz fixed_t floordrop; fixed_t ceilingdrop; @@ -482,11 +482,11 @@ struct precipmobj_s UINT32 flags; // flags from mobjinfo tables }; -struct actioncache_s +struct actioncache_t { - struct actioncache_s *next; - struct actioncache_s *prev; - struct mobj_s *mobj; + actioncache_t *next; + actioncache_t *prev; + mobj_t *mobj; INT32 statenum; }; diff --git a/src/p_polyobj.h b/src/p_polyobj.h index 9cb94126b..dc5dab153 100644 --- a/src/p_polyobj.h +++ b/src/p_polyobj.h @@ -66,7 +66,7 @@ typedef enum // Polyobject Structure // -struct polyobj_s +struct polyobj_t { mdllistitem_t link; // for subsector links; must be first @@ -78,7 +78,7 @@ struct polyobj_s size_t segCount; // number of segs in polyobject size_t numSegsAlloc; // number of segs allocated - struct seg_s **segs; // the segs, a reallocating array. + seg_t **segs; // the segs, a reallocating array. size_t numVertices; // number of vertices (generally == segCount) size_t numVerticesAlloc; // number of vertices allocated @@ -88,7 +88,7 @@ struct polyobj_s size_t numLines; // number of linedefs (generally <= segCount) size_t numLinesAlloc; // number of linedefs allocated - struct line_s **lines; // linedefs this polyobject must move + line_t **lines; // linedefs this polyobject must move degenmobj_t spawnSpot; // location of spawn spot vertex_t centerPt; // center point @@ -109,7 +109,7 @@ struct polyobj_s INT32 translucency; // index to translucency tables INT16 triggertag; // Tag of linedef executor to trigger on touch - struct visplane_s *visplane; // polyobject's visplane, for ease of putting into the list later + visplane_t *visplane; // polyobject's visplane, for ease of putting into the list later // these are saved for netgames, so do not let Lua touch these! INT32 spawnflags; // Flags the polyobject originally spawned with @@ -212,7 +212,7 @@ struct polydisplace_t thinker_t thinker; // must be first INT32 polyObjNum; - struct sector_s *controlSector; + sector_t *controlSector; fixed_t dx; fixed_t dy; fixed_t oldHeights; @@ -223,7 +223,7 @@ struct polyrotdisplace_t thinker_t thinker; // must be first INT32 polyObjNum; - struct sector_s *controlSector; + sector_t *controlSector; fixed_t rotscale; UINT8 turnobjs; fixed_t oldHeights; @@ -328,7 +328,7 @@ struct polydoordata_t struct polydisplacedata_t { INT32 polyObjNum; - struct sector_s *controlSector; + sector_t *controlSector; fixed_t dx; fixed_t dy; }; @@ -336,7 +336,7 @@ struct polydisplacedata_t struct polyrotdisplacedata_t { INT32 polyObjNum; - struct sector_s *controlSector; + sector_t *controlSector; fixed_t rotscale; UINT8 turnobjs; }; diff --git a/src/r_defs.h b/src/r_defs.h index 2c1c67dc0..59faac3c0 100644 --- a/src/r_defs.h +++ b/src/r_defs.h @@ -57,7 +57,7 @@ typedef UINT8 lighttable_t; #define CMF_FOG 4 // ExtraColormap type. Use for extra_colormaps from now on. -struct extracolormap_s +struct extracolormap_t { UINT8 fadestart, fadeend; UINT8 flags; @@ -74,8 +74,8 @@ struct extracolormap_s char lumpname[9]; // for netsyncing #endif - struct extracolormap_s *next; - struct extracolormap_s *prev; + extracolormap_t *next; + extracolormap_t *prev; }; // @@ -91,9 +91,6 @@ struct vertex_t fixed_t floorz, ceilingz; }; -// Forward of linedefs, for sectors. -struct line_s; - /** Degenerate version of ::mobj_t, storing only a location. * Used for sound origins in sectors, hoop centers, and the like. Does not * handle sound from moving objects (doppler), because position is probably @@ -208,7 +205,7 @@ typedef enum BT_STRONG, } busttype_e; -struct ffloor_s +struct ffloor_t { fixed_t *topheight; INT32 *toppic; @@ -224,17 +221,17 @@ struct ffloor_s angle_t *bottomangle; // Pointers to pointers. Yup. - struct pslope_s **t_slope; - struct pslope_s **b_slope; + pslope_t **t_slope; + pslope_t **b_slope; size_t secnum; ffloortype_e fofflags; - struct line_s *master; + line_t *master; - struct sector_s *target; + sector_t *target; - struct ffloor_s *next; - struct ffloor_s *prev; + ffloor_t *next; + ffloor_t *prev; INT32 lastlight; INT32 alpha; @@ -271,12 +268,12 @@ struct lightlist_t extracolormap_t **extra_colormap; // pointer-to-a-pointer, so we can react to colormap changes INT32 flags; ffloor_t *caster; - struct pslope_s *slope; // FOF_DOUBLESHADOW makes me have to store this pointer here. Bluh bluh. + pslope_t *slope; // FOF_DOUBLESHADOW makes me have to store this pointer here. Bluh bluh. }; // This struct is used for rendering walls with shadows casted on them... -struct r_lightlist_s +struct r_lightlist_t { fixed_t height; fixed_t heightstep; @@ -296,10 +293,10 @@ typedef enum { SL_DYNAMIC = 1<<1, /// This plane slope will be assigned a thinker to make it dynamic. } slopeflags_t; -struct pslope_s +struct pslope_t { UINT16 id; // The number of the slope, mostly used for netgame syncing purposes - struct pslope_s *next; // Make a linked list of dynamic slopes, for easy reference later + pslope_t *next; // Make a linked list of dynamic slopes, for easy reference later // The plane's definition. vector3_t o; /// Plane origin. @@ -399,7 +396,7 @@ typedef enum // The SECTORS record, at runtime. // Stores things/mobjs. // -struct sector_s +struct sector_t { fixed_t floorheight; fixed_t ceilingheight; @@ -445,10 +442,10 @@ struct sector_s // list of mobjs that are at least partially in the sector // thinglist is a subset of touching_thinglist - struct msecnode_s *touching_thinglist; + msecnode_t *touching_thinglist; size_t linecount; - struct line_s **lines; // [linecount] size + line_t **lines; // [linecount] size // Improved fake floor hack ffloor_t *ffloors; @@ -480,14 +477,14 @@ struct sector_s fixed_t friction; // Sprite culling feature - struct line_s *cullheight; + line_t *cullheight; // Current speed of ceiling/floor. For Knuckles to hold onto stuff. fixed_t floorspeed, ceilspeed; // list of precipitation mobjs in sector precipmobj_t *preciplist; - struct mprecipsecnode_s *touching_preciplist; + mprecipsecnode_t *touching_preciplist; // Eternity engine slope pslope_t *f_slope; // floor slope @@ -517,7 +514,7 @@ typedef enum #define NUMLINEARGS 10 #define NUMLINESTRINGARGS 2 -struct line_s +struct line_t { // Vertices, from v1 to v2. vertex_t *v1; @@ -590,12 +587,12 @@ struct side_t // Basically, this is a list of linesegs, indicating the visible walls that define // (all or some) sides of a convex BSP leaf. // -struct subsector_s +struct subsector_t { sector_t *sector; INT16 numlines; UINT16 firstline; - struct polyobj_s *polyList; // haleyjd 02/19/06: list of polyobjects + polyobj_t *polyList; // haleyjd 02/19/06: list of polyobjects size_t validcount; }; @@ -613,25 +610,25 @@ struct subsector_s // // For the links, NULL means top or end of list. -struct msecnode_s +struct msecnode_t { sector_t *m_sector; // a sector containing this object - struct mobj_s *m_thing; // this object - struct msecnode_s *m_sectorlist_prev; // prev msecnode_t for this thing - struct msecnode_s *m_sectorlist_next; // next msecnode_t for this thing - struct msecnode_s *m_thinglist_prev; // prev msecnode_t for this sector - struct msecnode_s *m_thinglist_next; // next msecnode_t for this sector + mobj_t *m_thing; // this object + msecnode_t *m_sectorlist_prev; // prev msecnode_t for this thing + msecnode_t *m_sectorlist_next; // next msecnode_t for this thing + msecnode_t *m_thinglist_prev; // prev msecnode_t for this sector + msecnode_t *m_thinglist_next; // next msecnode_t for this sector boolean visited; // used in search algorithms }; -struct mprecipsecnode_s +struct mprecipsecnode_t { sector_t *m_sector; // a sector containing this object - struct precipmobj_s *m_thing; // this object - struct mprecipsecnode_s *m_sectorlist_prev; // prev msecnode_t for this thing - struct mprecipsecnode_s *m_sectorlist_next; // next msecnode_t for this thing - struct mprecipsecnode_s *m_thinglist_prev; // prev msecnode_t for this sector - struct mprecipsecnode_s *m_thinglist_next; // next msecnode_t for this sector + precipmobj_t *m_thing; // this object + mprecipsecnode_t *m_sectorlist_prev; // prev msecnode_t for this thing + mprecipsecnode_t *m_sectorlist_next; // next msecnode_t for this thing + mprecipsecnode_t *m_thinglist_prev; // prev msecnode_t for this sector + mprecipsecnode_t *m_thinglist_next; // next msecnode_t for this sector boolean visited; // used in search algorithms }; @@ -653,17 +650,17 @@ struct light_t float dynamic_sqrradius; // radius^2 of the light ball }; -struct lightmap_s +struct lightmap_t { float s[2], t[2]; light_t *light; - struct lightmap_s *next; + lightmap_t *next; }; // // The lineseg. // -struct seg_s +struct seg_t { vertex_t *v1; vertex_t *v2; @@ -771,9 +768,9 @@ struct drawseg_t INT16 *sprbottomclip; INT16 *maskedtexturecol; - struct visplane_s *ffloorplanes[MAXFFLOORS]; + visplane_t *ffloorplanes[MAXFFLOORS]; INT32 numffloorplanes; - struct ffloor_s *thicksides[MAXFFLOORS]; + ffloor_t *thicksides[MAXFFLOORS]; INT16 *thicksidecol; INT32 numthicksides; fixed_t frontscale[MAXVIDWIDTH]; diff --git a/src/r_draw.c b/src/r_draw.c index 4b8eaf715..6eb5d6cfb 100644 --- a/src/r_draw.c +++ b/src/r_draw.c @@ -103,7 +103,7 @@ UINT8 *dc_transmap; // one of the translucency tables */ UINT8 *dc_translation; -struct r_lightlist_s *dc_lightlist = NULL; +struct r_lightlist_t *dc_lightlist = NULL; INT32 dc_numlights = 0, dc_maxlights, dc_texheight; // ========================================================================= diff --git a/src/r_draw.h b/src/r_draw.h index 130c44c00..aee8ecc5f 100644 --- a/src/r_draw.h +++ b/src/r_draw.h @@ -47,7 +47,7 @@ extern UINT8 *dc_transmap; extern UINT8 *dc_translation; -extern struct r_lightlist_s *dc_lightlist; +extern struct r_lightlist_t *dc_lightlist; extern INT32 dc_numlights, dc_maxlights; //Fix TUTIFRUTI diff --git a/src/r_plane.h b/src/r_plane.h index 1aa5f84e3..782691af6 100644 --- a/src/r_plane.h +++ b/src/r_plane.h @@ -28,9 +28,9 @@ // Now what is a visplane, anyway? // Simple: kinda floor/ceiling polygon optimised for SRB2 rendering. // -struct visplane_s +struct visplane_t { - struct visplane_s *next; + visplane_t *next; fixed_t height; fixed_t viewx, viewy, viewz; @@ -50,7 +50,7 @@ struct visplane_s fixed_t xoffs, yoffs; // Scrolling flats. - struct ffloor_s *ffloor; + ffloor_t *ffloor; polyobj_t *polyobj; pslope_t *slope; @@ -119,9 +119,9 @@ struct visffloor_t fixed_t f_pos_slope; fixed_t b_pos_slope; - struct pslope_s *slope; + pslope_t *slope; - struct ffloor_s *ffloor; + ffloor_t *ffloor; polyobj_t *polyobj; }; diff --git a/src/r_portal.h b/src/r_portal.h index 556faac8e..4f665f90b 100644 --- a/src/r_portal.h +++ b/src/r_portal.h @@ -20,9 +20,9 @@ /** Portal structure for the software renderer. */ -struct portal_s +struct portal_t { - struct portal_s *next; + portal_t *next; // Viewport. fixed_t viewx; diff --git a/src/r_things.h b/src/r_things.h index 06965c797..f27f3a7c9 100644 --- a/src/r_things.h +++ b/src/r_things.h @@ -145,14 +145,14 @@ typedef enum // A vissprite_t is a thing that will be drawn during a refresh, // i.e. a sprite object that is partly visible. -struct vissprite_s +struct vissprite_t { // Doubly linked list. - struct vissprite_s *prev; - struct vissprite_s *next; + vissprite_t *prev; + vissprite_t *next; // Bonus linkdraw pointer. - struct vissprite_s *linkdraw; + vissprite_t *linkdraw; mobj_t *mobj; // for easy access @@ -236,7 +236,7 @@ UINT8 *R_GetSpriteTranslation(vissprite_t *vis); // A drawnode is something that points to a 3D floor, 3D side, or masked // middle texture. This is used for sorting with sprites. -struct drawnode_s +struct drawnode_t { visplane_t *plane; drawseg_t *seg; @@ -244,8 +244,8 @@ struct drawnode_s ffloor_t *ffloor; vissprite_t *sprite; - struct drawnode_s *next; - struct drawnode_s *prev; + drawnode_t *next; + drawnode_t *prev; }; void R_InitDrawNodes(void); diff --git a/src/s_sound.h b/src/s_sound.h index d1a7ba25f..a3ad44750 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -170,13 +170,13 @@ boolean S_MusicInfo(char *mname, UINT16 *mflags, boolean *looping); boolean S_SpeedMusic(float speed); // Music credits -struct musicdef_s +struct musicdef_t { char name[7]; //char usage[256]; char source[256]; int volume; - struct musicdef_s *next; + musicdef_t *next; }; extern struct cursongcredit @@ -218,7 +218,7 @@ UINT32 S_GetMusicPosition(void); // Music Stacking (Jingles) // -struct musicstack_s +struct musicstack_t { char musname[7]; UINT16 musflags; @@ -229,8 +229,8 @@ struct musicstack_s lumpnum_t mlumpnum; boolean noposition; // force music stack resuming from zero (like music_stack_noposition) - struct musicstack_s *prev; - struct musicstack_s *next; + musicstack_t *prev; + musicstack_t *next; }; extern char music_stack_nextmusname[7]; diff --git a/src/screen.h b/src/screen.h index 6728f3762..d49f4aee2 100644 --- a/src/screen.h +++ b/src/screen.h @@ -91,9 +91,9 @@ struct vesa_extra_t }; // a video modes from the video modes list, // note: video mode 0 is always standard VGA320x200. -struct vmode_s +struct vmode_t { - struct vmode_s *pnext; + vmode_t *pnext; char *name; UINT32 width, height; UINT32 rowbytes; // bytes per scanline @@ -102,9 +102,9 @@ struct vmode_s INT32 numpages; vesa_extra_t *pextradata; // vesa mode extra data #ifdef _WIN32 - INT32 (WINAPI *setmode)(viddef_t *lvid, struct vmode_s *pcurrentmode); + INT32 (WINAPI *setmode)(viddef_t *lvid, vmode_t *pcurrentmode); #else - INT32 (*setmode)(viddef_t *lvid, struct vmode_s *pcurrentmode); + INT32 (*setmode)(viddef_t *lvid, vmode_t *pcurrentmode); #endif INT32 misc; // misc for display driver (r_opengl.dll etc) }; diff --git a/src/typedef.h b/src/typedef.h index 4bdddd18d..db751340c 100644 --- a/src/typedef.h +++ b/src/typedef.h @@ -23,7 +23,7 @@ TYPEDEF (fline_t); // command.h TYPEDEF (vsbuf_t); TYPEDEF (CV_PossibleValue_t); -TYPEDEF2 (consvar_s, consvar_t); +TYPEDEF (consvar_t); // d_netcmd.h TYPEDEF (changeteam_packet_t); @@ -31,13 +31,13 @@ TYPEDEF (changeteam_value_t); TYPEDEF (scheduleTask_t); // discord.h -TYPEDEF2 (discordRequest_s, discordRequest_t); +TYPEDEF (discordRequest_t); // d_player.h TYPEDEF (respawnvars_t); TYPEDEF (botvars_t); TYPEDEF (skybox_t); -TYPEDEF2 (player_s, player_t); +TYPEDEF (player_t); // d_clisrv.h TYPEDEF (clientcmd_pak); @@ -59,7 +59,7 @@ TYPEDEF (plrconfig); TYPEDEF (filesneededconfig_pak); TYPEDEF (doomdata_t); TYPEDEF (serverelem_t); -TYPEDEF2 (rewind_s, rewind_t); +TYPEDEF (rewind_t); // d_event.h TYPEDEF (event_t); @@ -67,10 +67,10 @@ TYPEDEF (event_t); // d_netfil.h TYPEDEF (fileneeded_t); TYPEDEF (HTTP_login); -TYPEDEF2 (luafiletransfer_s, luafiletransfer_t); +TYPEDEF (luafiletransfer_t); // d_think.h -TYPEDEF2 (thinker_s, thinker_t); +TYPEDEF (thinker_t); // d_ticcmd.h TYPEDEF (ticcmd_t); @@ -105,7 +105,7 @@ TYPEDEF (mappoint_t); TYPEDEF (customoption_t); TYPEDEF (mapheader_t); TYPEDEF (tolinfo_t); -TYPEDEF2 (cupheader_s, cupheader_t); +TYPEDEF (cupheader_t); // font.h TYPEDEF (font_t); @@ -142,7 +142,7 @@ TYPEDEF (mobjinfo_t); // k_bheap.h TYPEDEF (bheapitem_t); -TYPEDEF2 (bheap_s, bheap_t); +TYPEDEF (bheap_t); // k_boss.h TYPEDEF (weakspot_t); @@ -161,15 +161,15 @@ TYPEDEF (followercategory_t); TYPEDEF (trackingResult_t); // k_menu.h -TYPEDEF2 (menucolor_s, menucolor_t); +TYPEDEF (menucolor_t); TYPEDEF (menuitem_t); -TYPEDEF2 (menu_s, menu_t); +TYPEDEF (menu_t); TYPEDEF (menucmd_t); TYPEDEF (setup_player_t); TYPEDEF (modedesc_t); // k_pathfind.h -TYPEDEF2 (pathfindnode_s, pathfindnode_t); +TYPEDEF (pathfindnode_t); TYPEDEF (path_t); TYPEDEF (pathfindsetup_t); @@ -180,11 +180,11 @@ TYPEDEF (profile_t); TYPEDEF (t_splash_t); TYPEDEF (t_footstep_t); TYPEDEF (t_overlay_t); -TYPEDEF2 (terrain_s, terrain_t); +TYPEDEF (terrain_t); TYPEDEF (t_floor_t); // k_waypoint.h -TYPEDEF2 (waypoint_s, waypoint_t); +TYPEDEF (waypoint_t); // lua_hudlib_drawlist.h typedef struct huddrawlist_s *huddrawlist_h; @@ -200,7 +200,7 @@ TYPEDEF (extraemblem_t); TYPEDEF (unlockable_t); // m_dllist.h -TYPEDEF2 (mdllistitem_s, mdllistitem_t); +TYPEDEF (mdllistitem_t); // m_fixed.h TYPEDEF (vector2_t); @@ -212,7 +212,7 @@ TYPEDEF (ps_hookinfo_t); TYPEDEF (ps_botinfo_t); // m_queue.h -TYPEDEF2 (mqueueitem_s, mqueueitem_t); +TYPEDEF (mqueueitem_t); TYPEDEF (mqueue_t); // mserv.h @@ -231,12 +231,12 @@ TYPEDEF (divline_t); TYPEDEF (intercept_t); // p_mobj.h -TYPEDEF2 (mobj_s, mobj_t); -TYPEDEF2 (precipmobj_s, precipmobj_t); -TYPEDEF2 (actioncache_s, actioncache_t); +TYPEDEF (mobj_t); +TYPEDEF (precipmobj_t); +TYPEDEF (actioncache_t); // p_polyobj.h -TYPEDEF2 (polyobj_s, polyobj_t); +TYPEDEF (polyobj_t); TYPEDEF (polymaplink_t); TYPEDEF (polyrotate_t); TYPEDEF (polymove_t); @@ -312,19 +312,19 @@ TYPEDEF (softwarepatch_t); TYPEDEF (pic_t); TYPEDEF (spriteframe_t); TYPEDEF (spritedef_t); -TYPEDEF2 (extracolormap_s, extracolormap_t); -TYPEDEF2 (ffloor_s, ffloor_t); +TYPEDEF (extracolormap_t); +TYPEDEF (ffloor_t); TYPEDEF (lightlist_t); -TYPEDEF2 (r_lightlist_s, r_lightlist_t); -TYPEDEF2 (pslope_s, pslope_t); -TYPEDEF2 (sector_s, sector_t); -TYPEDEF2 (line_s, line_t); +TYPEDEF (r_lightlist_t); +TYPEDEF (pslope_t); +TYPEDEF (sector_t); +TYPEDEF (line_t); TYPEDEF (side_t); -TYPEDEF2 (subsector_s, subsector_t); -TYPEDEF2 (msecnode_s, msecnode_t); -TYPEDEF2 (mprecipsecnode_s, mprecipsecnode_t); -TYPEDEF2 (lightmap_s, lightmap_t); -TYPEDEF2 (seg_s, seg_t); +TYPEDEF (subsector_t); +TYPEDEF (msecnode_t); +TYPEDEF (mprecipsecnode_t); +TYPEDEF (lightmap_t); +TYPEDEF (seg_t); // r_draw.h TYPEDEF (floatv3_t); @@ -339,11 +339,11 @@ TYPEDEF (spriteframepivot_t); TYPEDEF (spriteinfo_t); // r_plane.h -TYPEDEF2 (visplane_s, visplane_t); +TYPEDEF (visplane_t); TYPEDEF (visffloor_t); // r_portal.h -TYPEDEF2 (portal_s, portal_t); +TYPEDEF (portal_t); // r_skins.h TYPEDEF (skin_t); @@ -360,20 +360,20 @@ TYPEDEF (texture_t); // r_things.h TYPEDEF (maskcount_t); -TYPEDEF2 (vissprite_s, vissprite_t); -TYPEDEF2 (drawnode_s, drawnode_t); +TYPEDEF (vissprite_t); +TYPEDEF (drawnode_t); // s_sound.h TYPEDEF (listener_t); TYPEDEF (channel_t); TYPEDEF (caption_t); -TYPEDEF2 (musicdef_s, musicdef_t); -TYPEDEF2 (musicstack_s, musicstack_t); +TYPEDEF (musicdef_t); +TYPEDEF (musicstack_t); // screen.h TYPEDEF (viddef_t); TYPEDEF (vesa_extra_t); -TYPEDEF2 (vmode_s, vmode_t); +TYPEDEF (vmode_t); // sounds.h TYPEDEF (sfxinfo_t);