From 32b59c4b018b8793a2f13f5161922c4f6092811c Mon Sep 17 00:00:00 2001 From: danij Date: Sat, 10 Mar 2012 01:18:20 +0000 Subject: [PATCH] Refactor: Renamed sidedef_t as SideDef --- doomsday/engine/api/doomsday.h | 2 +- doomsday/engine/portable/include/edit_map.h | 2 +- doomsday/engine/portable/include/gamemap.h | 8 +++---- doomsday/engine/portable/include/mapdata.hs | 2 +- doomsday/engine/portable/include/p_mapdata.h | 2 +- doomsday/engine/portable/include/p_maptypes.h | 2 +- doomsday/engine/portable/include/p_sidedef.h | 10 ++++----- doomsday/engine/portable/src/bsp_main.c | 4 ++-- doomsday/engine/portable/src/bsp_map.c | 6 ++--- doomsday/engine/portable/src/cl_world.c | 2 +- doomsday/engine/portable/src/dam_file.c | 4 ++-- doomsday/engine/portable/src/edit_map.c | 22 +++++++++---------- doomsday/engine/portable/src/gamemap.c | 10 ++++----- doomsday/engine/portable/src/linedef.c | 8 +++---- doomsday/engine/portable/src/p_data.c | 2 +- doomsday/engine/portable/src/p_dmu.c | 20 ++++++++--------- doomsday/engine/portable/src/p_sidedef.c | 10 ++++----- doomsday/engine/portable/src/r_data.c | 2 +- doomsday/engine/portable/src/r_main.c | 4 ++-- doomsday/engine/portable/src/r_world.c | 14 ++++++------ doomsday/engine/portable/src/rend_decor.c | 6 ++--- doomsday/engine/portable/src/rend_fakeradio.c | 6 ++--- doomsday/engine/portable/src/rend_main.c | 16 +++++++------- doomsday/engine/portable/src/sv_pool.c | 6 ++--- doomsday/plugins/common/include/dmu_lib.h | 4 ++-- doomsday/plugins/common/include/p_switch.h | 6 ++--- doomsday/plugins/common/src/dmu_lib.c | 6 ++--- doomsday/plugins/common/src/p_ceiling.c | 4 ++-- doomsday/plugins/common/src/p_floor.c | 6 ++--- doomsday/plugins/common/src/p_mapsetup.c | 6 ++--- doomsday/plugins/common/src/p_saveg.c | 6 ++--- doomsday/plugins/common/src/p_switch.c | 10 ++++----- doomsday/plugins/common/src/p_xgline.c | 12 +++++----- doomsday/plugins/common/src/p_xgsec.c | 4 ++-- doomsday/plugins/jdoom/src/p_oldsvg.c | 2 +- doomsday/plugins/jdoom/src/p_spec.c | 2 +- doomsday/plugins/jdoom64/src/p_spec.c | 2 +- doomsday/plugins/jheretic/src/p_oldsvg.c | 2 +- doomsday/plugins/jheretic/src/p_spec.c | 2 +- doomsday/plugins/jhexen/src/p_acs.c | 2 +- doomsday/plugins/jhexen/src/p_spec.c | 2 +- 41 files changed, 124 insertions(+), 124 deletions(-) diff --git a/doomsday/engine/api/doomsday.h b/doomsday/engine/api/doomsday.h index 986ca9d16c..6114872251 100644 --- a/doomsday/engine/api/doomsday.h +++ b/doomsday/engine/api/doomsday.h @@ -68,7 +68,7 @@ extern "C" { typedef struct bspnode_s { int type; } BspNode; typedef struct vertex_s {int type; } vertex_t; typedef struct linedef_s { int type; } LineDef; - typedef struct sidedef_s { int type; } sidedef_t; + typedef struct sidedef_s { int type; } SideDef; typedef struct hedge_s { int type; } HEdge; typedef struct bspleaf_s { int type; } BspLeaf; typedef struct sector_s { int type; } sector_t; diff --git a/doomsday/engine/portable/include/edit_map.h b/doomsday/engine/portable/include/edit_map.h index 09ea6f99ec..0cc9c047fa 100644 --- a/doomsday/engine/portable/include/edit_map.h +++ b/doomsday/engine/portable/include/edit_map.h @@ -39,7 +39,7 @@ typedef struct editmap_s { uint numLineDefs; LineDef** lineDefs; uint numSideDefs; - sidedef_t** sideDefs; + SideDef** sideDefs; uint numSectors; sector_t** sectors; uint numPolyObjs; diff --git a/doomsday/engine/portable/include/gamemap.h b/doomsday/engine/portable/include/gamemap.h index b2a73ee252..6cd677f0d7 100644 --- a/doomsday/engine/portable/include/gamemap.h +++ b/doomsday/engine/portable/include/gamemap.h @@ -97,7 +97,7 @@ typedef struct gamemap_s { LineDef* lineDefs; uint numSideDefs; - sidedef_t* sideDefs; + SideDef* sideDefs; uint numPolyObjs; polyobj_t** polyObjs; @@ -222,7 +222,7 @@ LineDef* GameMap_LineDef(GameMap* map, uint idx); * @param idx Unique index of the sidedef. * @return Pointer to SideDef with this index else @c NULL if @a idx is not valid. */ -sidedef_t* GameMap_SideDef(GameMap* map, uint idx); +SideDef* GameMap_SideDef(GameMap* map, uint idx); /** * Lookup a Sector by its unique index. @@ -285,7 +285,7 @@ int GameMap_LineDefIndex(GameMap* map, LineDef* line); * @param side SideDef to lookup. * @return Unique index for the SideDef else @c -1 if not present. */ -int GameMap_SideDefIndex(GameMap* map, sidedef_t* side); +int GameMap_SideDefIndex(GameMap* map, SideDef* side); /** * Lookup the unique index for @a sector. @@ -682,7 +682,7 @@ int GameMap_PolyobjIterator(GameMap* map, int (*callback) (polyobj_t*, void*), v int GameMap_VertexIterator(GameMap* map, int (*callback) (vertex_t*, void*), void* parameters); -int GameMap_SideDefIterator(GameMap* map, int (*callback) (sidedef_t*, void*), void* parameters); +int GameMap_SideDefIterator(GameMap* map, int (*callback) (SideDef*, void*), void* parameters); int GameMap_SectorIterator(GameMap* map, int (*callback) (sector_t*, void*), void* parameters); diff --git a/doomsday/engine/portable/include/mapdata.hs b/doomsday/engine/portable/include/mapdata.hs index f737da93b9..97fa98832a 100644 --- a/doomsday/engine/portable/include/mapdata.hs +++ b/doomsday/engine/portable/include/mapdata.hs @@ -403,7 +403,7 @@ typedef struct msidedef_s { } msidedef_t; end -struct sidedef +struct SideDef - surface_t[3] sections UINT uint hedgeCount PTR hedge_s** hedges // [hedgeCount] size, segs arranged left>right diff --git a/doomsday/engine/portable/include/p_mapdata.h b/doomsday/engine/portable/include/p_mapdata.h index f571d2626f..5ba0b28cb8 100644 --- a/doomsday/engine/portable/include/p_mapdata.h +++ b/doomsday/engine/portable/include/p_mapdata.h @@ -179,7 +179,7 @@ extern sector_t* sectors; extern BspLeaf* bspLeafs; extern BspNode* bspNodes; extern LineDef* lineDefs; -extern sidedef_t* sideDefs; +extern SideDef* sideDefs; extern polyobj_t** polyObjs; ///< List of all polyobjs on the current map. #include "gamemap.h" diff --git a/doomsday/engine/portable/include/p_maptypes.h b/doomsday/engine/portable/include/p_maptypes.h index 353d714da5..8eeb9509d0 100644 --- a/doomsday/engine/portable/include/p_maptypes.h +++ b/doomsday/engine/portable/include/p_maptypes.h @@ -393,7 +393,7 @@ typedef struct sidedef_s { shadowcorner_t bottomCorners[2]; shadowcorner_t sideCorners[2]; edgespan_t spans[2]; // [left, right] -} sidedef_t; +} SideDef; // Helper macros for accessing linedef data elements. #define L_v(n) v[(n)? 1:0] diff --git a/doomsday/engine/portable/include/p_sidedef.h b/doomsday/engine/portable/include/p_sidedef.h index 24a32c126e..e9a92d8112 100644 --- a/doomsday/engine/portable/include/p_sidedef.h +++ b/doomsday/engine/portable/include/p_sidedef.h @@ -1,4 +1,4 @@ -/**\file p_sidedef.h +/**\file sidedef.h *\section License * License: GPL * Online License Link: http://www.gnu.org/licenses/gpl.html @@ -38,7 +38,7 @@ * * @param sideDef SideDef instance. */ -void SideDef_UpdateOrigin(sidedef_t* side); +void SideDef_UpdateOrigin(SideDef* side); /** * Update the SideDef's map space surface tangents according to the points @@ -47,16 +47,16 @@ void SideDef_UpdateOrigin(sidedef_t* side); * * @param sideDef SideDef instance. */ -void SideDef_UpdateSurfaceTangents(sidedef_t* sideDef); +void SideDef_UpdateSurfaceTangents(SideDef* sideDef); /** * Get the value of a sidedef property, selected by DMU_* name. */ -int SideDef_GetProperty(const sidedef_t* sideDef, setargs_t* args); +int SideDef_GetProperty(const SideDef* sideDef, setargs_t* args); /** * Update the sidedef, property is selected by DMU_* name. */ -int SideDef_SetProperty(sidedef_t* sideDef, const setargs_t* args); +int SideDef_SetProperty(SideDef* sideDef, const setargs_t* args); #endif /* LIBDENG_MAP_SIDEDEF_H */ diff --git a/doomsday/engine/portable/src/bsp_main.c b/doomsday/engine/portable/src/bsp_main.c index b472ed0cc0..053a03b0dc 100644 --- a/doomsday/engine/portable/src/bsp_main.c +++ b/doomsday/engine/portable/src/bsp_main.c @@ -160,7 +160,7 @@ static superblock_t* createInitialHEdges(GameMap* map) if(line->sideDefs[FRONT]) { - sidedef_t *side = line->sideDefs[FRONT]; + SideDef* side = line->sideDefs[FRONT]; if(!side->sector) Con_Message("Warning: Bad sidedef on linedef #%d\n", line->buildData.index); @@ -174,7 +174,7 @@ static superblock_t* createInitialHEdges(GameMap* map) if(line->sideDefs[BACK]) { - sidedef_t *side = line->sideDefs[BACK]; + SideDef* side = line->sideDefs[BACK]; if(!side->sector) Con_Message("Warning: Bad sidedef on linedef #%d\n", line->buildData.index); diff --git a/doomsday/engine/portable/src/bsp_map.c b/doomsday/engine/portable/src/bsp_map.c index 655cb0e409..bdf5726066 100644 --- a/doomsday/engine/portable/src/bsp_map.c +++ b/doomsday/engine/portable/src/bsp_map.c @@ -52,7 +52,7 @@ // CODE -------------------------------------------------------------------- -static void hardenSidedefHEdgeList(GameMap* map, sidedef_t* side, HEdge* hedge, +static void hardenSidedefHEdgeList(GameMap* map, SideDef* side, HEdge* hedge, bsp_hedge_t* bspHEdge) { uint count; @@ -233,7 +233,7 @@ static void buildHEdgesFromBSPHEdges(GameMap* dest, binarytree_t* rootNode) // Front first if(hedge->lineDef && HEDGE_SIDEDEF(hedge)) { - sidedef_t* side = HEDGE_SIDEDEF(hedge); + SideDef* side = HEDGE_SIDEDEF(hedge); surface_t* surface = &side->SW_topsurface; surface->normal[VY] = (hedge->HE_v1pos[VX] - hedge->HE_v2pos[VX]) / hedge->length; @@ -305,7 +305,7 @@ static void hardenLeaf(GameMap* map, BspLeaf* dest, HEdge* hedge = *segp; if(!found && hedge->lineDef && HEDGE_SIDEDEF(hedge)) { - sidedef_t* side = HEDGE_SIDEDEF(hedge); + SideDef* side = HEDGE_SIDEDEF(hedge); dest->sector = side->sector; found = true; } diff --git a/doomsday/engine/portable/src/cl_world.c b/doomsday/engine/portable/src/cl_world.c index eea2b66bb4..d2cfd185ec 100644 --- a/doomsday/engine/portable/src/cl_world.c +++ b/doomsday/engine/portable/src/cl_world.c @@ -734,7 +734,7 @@ void Cl_ReadSideDelta2(int deltaType, boolean skip) byte lineFlags = 0, sideFlags = 0; float toprgb[3] = {0,0,0}, midrgba[4] = {0,0,0,0}; float bottomrgb[3] = {0,0,0}; - sidedef_t *sid; + SideDef* sid; // First read all the data. num = Reader_ReadUInt16(msgReader); diff --git a/doomsday/engine/portable/src/dam_file.c b/doomsday/engine/portable/src/dam_file.c index 9f7b2a91b1..8f6ad5a0cf 100644 --- a/doomsday/engine/portable/src/dam_file.c +++ b/doomsday/engine/portable/src/dam_file.c @@ -326,7 +326,7 @@ static void archiveLines(GameMap *map, boolean write) static void writeSide(const GameMap *map, uint idx) { uint i; - sidedef_t *s = &map->sideDefs[idx]; + SideDef *s = &map->sideDefs[idx]; for(i = 0; i < 3; ++i) { @@ -357,7 +357,7 @@ static void readSide(const GameMap *map, uint idx) uint i; long secIdx; float offset[2], rgba[4]; - sidedef_t *s = &map->sideDefs[idx]; + SideDef *s = &map->sideDefs[idx]; for(i = 0; i < 3; ++i) { diff --git a/doomsday/engine/portable/src/edit_map.c b/doomsday/engine/portable/src/edit_map.c index a47b0fb978..211656ab87 100644 --- a/doomsday/engine/portable/src/edit_map.c +++ b/doomsday/engine/portable/src/edit_map.c @@ -109,9 +109,9 @@ static LineDef* createLine(void) return line; } -static sidedef_t* createSide(void) +static SideDef* createSide(void) { - sidedef_t* side; + SideDef* side; side = M_Calloc(sizeof(*side)); side->header.type = DMU_SIDEDEF; @@ -198,7 +198,7 @@ static void destroyEditableSideDefs(editmap_t *map) uint i; for(i = 0; i < map->numSideDefs; ++i) { - sidedef_t *side = map->sideDefs[i]; + SideDef *side = map->sideDefs[i]; M_Free(side); } @@ -420,7 +420,7 @@ static void pruneUnusedSidedefs(editmap_t* map) for(i = 0, newNum = 0; i < map->numSideDefs; ++i) { - sidedef_t* s = map->sideDefs[i]; + SideDef* s = map->sideDefs[i]; if(s->buildData.refCount == 0) { @@ -454,7 +454,7 @@ static void pruneUnusedSectors(editmap_t* map) for(i = 0; i < map->numSideDefs; ++i) { - sidedef_t* s = map->sideDefs[i]; + SideDef* s = map->sideDefs[i]; if(s->sector) s->sector->buildData.refCount++; @@ -1305,12 +1305,12 @@ static void hardenSidedefs(GameMap* dest, editmap_t* src) uint i; dest->numSideDefs = src->numSideDefs; - dest->sideDefs = Z_Malloc(dest->numSideDefs * sizeof(sidedef_t), PU_MAPSTATIC, 0); + dest->sideDefs = Z_Malloc(dest->numSideDefs * sizeof(SideDef), PU_MAPSTATIC, 0); for(i = 0; i < dest->numSideDefs; ++i) { - sidedef_t* destS = &dest->sideDefs[i]; - sidedef_t* srcS = src->sideDefs[i]; + SideDef* destS = &dest->sideDefs[i]; + SideDef* srcS = src->sideDefs[i]; memcpy(destS, srcS, sizeof(*destS)); destS->sector = &dest->sectors[srcS->sector->buildData.index - 1]; @@ -1475,7 +1475,7 @@ static void testForWindowEffect(editmap_t* map, LineDef* l) LineDef* n = map->lineDefs[i]; double dist; boolean isFront; - sidedef_t* hitSide; + SideDef* hitSide; double dX2, dY2; if(n == l || LINE_SELFREF(n) /*|| n->buildData.overlap || @@ -2049,7 +2049,7 @@ uint MPE_SidedefCreate(uint sector, short flags, float bottomRed, float bottomGreen, float bottomBlue) { - sidedef_t* s; + SideDef* s; if(!editMapInited) return 0; @@ -2092,7 +2092,7 @@ uint MPE_LinedefCreate(uint v1, uint v2, uint frontSide, uint backSide, int flags) { LineDef* l; - sidedef_t* front = NULL, *back = NULL; + SideDef* front = NULL, *back = NULL; vertex_t* vtx1, *vtx2; float length, dx, dy; diff --git a/doomsday/engine/portable/src/gamemap.c b/doomsday/engine/portable/src/gamemap.c index 6f29ac1b8e..a515c027e2 100644 --- a/doomsday/engine/portable/src/gamemap.c +++ b/doomsday/engine/portable/src/gamemap.c @@ -158,14 +158,14 @@ LineDef* GameMap_LineDef(GameMap* map, uint idx) return &map->lineDefs[idx]; } -int GameMap_SideDefIndex(GameMap* map, sidedef_t* side) +int GameMap_SideDefIndex(GameMap* map, SideDef* side) { assert(map); if(!side || !(side >= map->sideDefs && side <= &map->sideDefs[map->numSideDefs])) return -1; return side - map->sideDefs; } -sidedef_t* GameMap_SideDef(GameMap* map, uint idx) +SideDef* GameMap_SideDef(GameMap* map, uint idx) { assert(map); if(idx >= map->numSideDefs) return NULL; @@ -326,7 +326,7 @@ static void initPolyobj(polyobj_t* po) for(lineIter = po->lines; *lineIter; lineIter++) { LineDef* line = *lineIter; - sidedef_t* front = line->L_frontside; + SideDef* front = line->L_frontside; front->SW_topinflags |= SUIF_NO_RADIO; front->SW_middleinflags |= SUIF_NO_RADIO; @@ -334,7 +334,7 @@ static void initPolyobj(polyobj_t* po) if(line->L_backside) { - sidedef_t* back = line->L_backside; + SideDef* back = line->L_backside; back->SW_topinflags |= SUIF_NO_RADIO; back->SW_middleinflags |= SUIF_NO_RADIO; @@ -1081,7 +1081,7 @@ int GameMap_VertexIterator(GameMap* map, int (*callback) (vertex_t*, void*), voi return false; // Continue iteration. } -int GameMap_SideDefIterator(GameMap* map, int (*callback) (sidedef_t*, void*), void* parameters) +int GameMap_SideDefIterator(GameMap* map, int (*callback) (SideDef*, void*), void* parameters) { uint i; assert(map); diff --git a/doomsday/engine/portable/src/linedef.c b/doomsday/engine/portable/src/linedef.c index cb416f58c8..f4311f7c4c 100644 --- a/doomsday/engine/portable/src/linedef.c +++ b/doomsday/engine/portable/src/linedef.c @@ -168,7 +168,7 @@ int LineDef_MiddleMaterialCoords(const LineDef* lineDef, int side, { float* top[2], *bottom[2], openingTop[2], openingBottom[2]; // {left, right} float tcYOff; - sidedef_t* sideDef; + SideDef* sideDef; int i, texHeight; assert(lineDef && bottomLeft && bottomRight && topLeft && topRight); @@ -234,7 +234,7 @@ int LineDef_MiddleMaterialCoords(const LineDef* lineDef, int side, } /** - * @fixme No need to do this each frame. Set a flag in sidedef_t->flags to + * @fixme No need to do this each frame. Set a flag in SideDef->flags to * denote this. Is sensitive to plane heights, surface properties * (e.g. alpha) and surface texture properties. */ @@ -244,7 +244,7 @@ boolean LineDef_MiddleMaterialCoversOpening(const LineDef *line, int side, assert(line); if(line->L_backside) { - sidedef_t* sideDef = line->L_side(side); + SideDef* sideDef = line->L_side(side); sector_t* frontSec = line->L_sector(side); sector_t* backSec = line->L_sector(side^1); @@ -374,7 +374,7 @@ int LineDef_SetProperty(LineDef* lin, const setargs_t* args) DMU_SetValue(DMT_LINEDEF_VALIDCOUNT, &lin->validCount, args, 0); break; case DMU_FLAGS: { - sidedef_t* s; + SideDef* s; DMU_SetValue(DMT_LINEDEF_FLAGS, &lin->flags, args, 0); diff --git a/doomsday/engine/portable/src/p_data.c b/doomsday/engine/portable/src/p_data.c index 90b0723d57..4290821edd 100644 --- a/doomsday/engine/portable/src/p_data.c +++ b/doomsday/engine/portable/src/p_data.c @@ -56,7 +56,7 @@ sector_t* sectors = NULL; BspLeaf* bspLeafs = NULL; BspNode* bspNodes = NULL; LineDef* lineDefs = NULL; -sidedef_t* sideDefs = NULL; +SideDef* sideDefs = NULL; polyobj_t** polyObjs = NULL; // List of all poly-objects in the map. GameMap* theMap = NULL; diff --git a/doomsday/engine/portable/src/p_dmu.c b/doomsday/engine/portable/src/p_dmu.c index cc814ad188..a25566616a 100644 --- a/doomsday/engine/portable/src/p_dmu.c +++ b/doomsday/engine/portable/src/p_dmu.c @@ -44,7 +44,7 @@ // TYPES ------------------------------------------------------------------- typedef struct dummysidedef_s { - sidedef_t sideDef; // Side data. + SideDef sideDef; // Side data. void* extraData; // Pointer to user data. boolean inUse; // true, if the dummy is being used. } dummysidedef_t; @@ -431,7 +431,7 @@ uint P_ToIndex(const void* ptr) return GET_LINE_IDX((LineDef*) ptr); case DMU_SIDEDEF: - return GET_SIDE_IDX((sidedef_t*) ptr); + return GET_SIDE_IDX((SideDef*) ptr); case DMU_BSPLEAF: return GET_BSPLEAF_IDX((BspLeaf*) ptr); @@ -915,7 +915,7 @@ static int setProperty(void* obj, void* context) sector_t* updateSector1 = NULL, *updateSector2 = NULL; plane_t* updatePlane = NULL; LineDef* updateLinedef = NULL; - sidedef_t* updateSidedef = NULL; + SideDef* updateSidedef = NULL; surface_t* updateSurface = NULL; // BspLeaf* updateBspLeaf = NULL; @@ -993,21 +993,21 @@ static int setProperty(void* obj, void* context) if(args->type == DMU_SIDEDEF) { - updateSidedef = (sidedef_t*) obj; + updateSidedef = (SideDef*) obj; if(args->modifiers & DMU_TOP_OF_SIDEDEF) { - obj = &((sidedef_t*) obj)->SW_topsurface; + obj = &((SideDef*) obj)->SW_topsurface; args->type = DMU_SURFACE; } else if(args->modifiers & DMU_MIDDLE_OF_SIDEDEF) { - obj = &((sidedef_t*) obj)->SW_middlesurface; + obj = &((SideDef*) obj)->SW_middlesurface; args->type = DMU_SURFACE; } else if(args->modifiers & DMU_BOTTOM_OF_SIDEDEF) { - obj = &((sidedef_t*) obj)->SW_bottomsurface; + obj = &((SideDef*) obj)->SW_bottomsurface; args->type = DMU_SURFACE; } } @@ -1452,17 +1452,17 @@ static int getProperty(void* obj, void* context) { if(args->modifiers & DMU_TOP_OF_SIDEDEF) { - obj = &((sidedef_t*) obj)->SW_topsurface; + obj = &((SideDef*) obj)->SW_topsurface; args->type = DMU_SURFACE; } else if(args->modifiers & DMU_MIDDLE_OF_SIDEDEF) { - obj = &((sidedef_t*) obj)->SW_middlesurface; + obj = &((SideDef*) obj)->SW_middlesurface; args->type = DMU_SURFACE; } else if(args->modifiers & DMU_BOTTOM_OF_SIDEDEF) { - obj = &((sidedef_t*) obj)->SW_bottomsurface; + obj = &((SideDef*) obj)->SW_bottomsurface; args->type = DMU_SURFACE; } } diff --git a/doomsday/engine/portable/src/p_sidedef.c b/doomsday/engine/portable/src/p_sidedef.c index fe2cf56cf6..f53d20f51e 100644 --- a/doomsday/engine/portable/src/p_sidedef.c +++ b/doomsday/engine/portable/src/p_sidedef.c @@ -1,4 +1,4 @@ -/**\file p_sidedef.c +/**\file sidedef.c *\section License * License: GPL * Online License Link: http://www.gnu.org/licenses/gpl.html @@ -27,7 +27,7 @@ #include "de_refresh.h" #include "de_play.h" -void SideDef_UpdateOrigin(sidedef_t* side) +void SideDef_UpdateOrigin(SideDef* side) { assert(side); @@ -38,7 +38,7 @@ void SideDef_UpdateOrigin(sidedef_t* side) side->origin.pos[VY] = side->line->L_v1pos[VY] + side->line->dY / 2; } -void SideDef_UpdateSurfaceTangents(sidedef_t* side) +void SideDef_UpdateSurfaceTangents(SideDef* side) { surface_t* surface = &side->SW_topsurface; LineDef* line = side->line; @@ -63,7 +63,7 @@ void SideDef_UpdateSurfaceTangents(sidedef_t* side) memcpy(side->SW_bottomnormal, surface->normal, sizeof(surface->normal)); } -int SideDef_SetProperty(sidedef_t* sid, const setargs_t* args) +int SideDef_SetProperty(SideDef* sid, const setargs_t* args) { switch(args->prop) { @@ -82,7 +82,7 @@ int SideDef_SetProperty(sidedef_t* sid, const setargs_t* args) return false; // Continue iteration. } -int SideDef_GetProperty(const sidedef_t* sid, setargs_t* args) +int SideDef_GetProperty(const SideDef* sid, setargs_t* args) { switch(args->prop) { diff --git a/doomsday/engine/portable/src/r_data.c b/doomsday/engine/portable/src/r_data.c index 5feb38e7f3..749c6c0794 100644 --- a/doomsday/engine/portable/src/r_data.c +++ b/doomsday/engine/portable/src/r_data.c @@ -2661,7 +2661,7 @@ void R_PrecacheForMap(void) for(i = 0; i < NUM_SIDEDEFS; ++i) { - sidedef_t* side = SIDE_PTR(i); + SideDef* side = SIDE_PTR(i); if(side->SW_middlematerial) Materials_Precache(side->SW_middlematerial, spec, true); diff --git a/doomsday/engine/portable/src/r_main.c b/doomsday/engine/portable/src/r_main.c index 9e552b4259..167a7d813e 100644 --- a/doomsday/engine/portable/src/r_main.c +++ b/doomsday/engine/portable/src/r_main.c @@ -583,7 +583,7 @@ void R_Update(void) { uint i; for(i = 0; i < NUM_SIDEDEFS; ++i) { - sidedef_t* side = &sideDefs[i]; + SideDef* side = &sideDefs[i]; Surface_Update(&side->SW_topsurface); Surface_Update(&side->SW_middlesurface); Surface_Update(&side->SW_bottomsurface); @@ -597,7 +597,7 @@ void R_Update(void) for(lineIter = po->lines; *lineIter; lineIter++) { LineDef* line = *lineIter; - sidedef_t* side = line->L_frontside; + SideDef* side = line->L_frontside; Surface_Update(&side->SW_middlesurface); } }} diff --git a/doomsday/engine/portable/src/r_world.c b/doomsday/engine/portable/src/r_world.c index 4e63fe8caa..deef1956ec 100644 --- a/doomsday/engine/portable/src/r_world.c +++ b/doomsday/engine/portable/src/r_world.c @@ -827,7 +827,7 @@ void R_UpdateSkyFixForSec(const sector_t* sec) // Must be twosided. if(li->L_frontside && li->L_backside) { - sidedef_t* si = li->L_frontsector == sec? li->L_frontside : li->L_backside; + SideDef* si = li->L_frontsector == sec? li->L_frontside : li->L_backside; if(si->SW_middlematerial) { @@ -1322,7 +1322,7 @@ void R_MapInitSurfaces(boolean forceUpdate) { uint i; for(i = 0; i < NUM_SIDEDEFS; ++i) { - sidedef_t* si = SIDE_PTR(i); + SideDef* si = SIDE_PTR(i); initSurfaceMaterialOffset(&si->SW_topsurface); initSurfaceMaterialOffset(&si->SW_middlesurface); @@ -1348,7 +1348,7 @@ void R_MapInitSurfaceLists(void) { uint i; for(i = 0; i < NUM_SIDEDEFS; ++i) { - sidedef_t* side = SIDE_PTR(i); + SideDef* side = SIDE_PTR(i); addToSurfaceLists(&side->SW_middlesurface, side->SW_middlematerial); addToSurfaceLists(&side->SW_topsurface, side->SW_topmaterial); @@ -1583,7 +1583,7 @@ boolean R_SectorContainsSkySurfaces(const sector_t* sec) * Non-animated materials are preferred. * Sky materials are ignored. */ -static material_t* chooseFixMaterial(sidedef_t* s, sidedefsection_t section) +static material_t* chooseFixMaterial(SideDef* s, sidedefsection_t section) { material_t* choice1 = NULL, *choice2 = NULL; @@ -1618,7 +1618,7 @@ static material_t* chooseFixMaterial(sidedef_t* s, sidedefsection_t section) return NULL; } -static void updateSidedefSection(sidedef_t* s, sidedefsection_t section) +static void updateSidedefSection(SideDef* s, sidedefsection_t section) { surface_t* suf; @@ -1643,7 +1643,7 @@ void R_UpdateLinedefsOfSector(sector_t* sec) for(i = 0; i < sec->lineDefCount; ++i) { LineDef* li = sec->lineDefs[i]; - sidedef_t* front, *back; + SideDef* front, *back; sector_t* frontSec, *backSec; if(!li->L_frontside || !li->L_backside) @@ -1810,7 +1810,7 @@ boolean R_UpdateLinedef(LineDef* line, boolean forceUpdate) /** * Stub. */ -boolean R_UpdateSidedef(sidedef_t* side, boolean forceUpdate) +boolean R_UpdateSidedef(SideDef* side, boolean forceUpdate) { return false; // Not changed. } diff --git a/doomsday/engine/portable/src/rend_decor.c b/doomsday/engine/portable/src/rend_decor.c index f1294185ad..ce85df758f 100644 --- a/doomsday/engine/portable/src/rend_decor.c +++ b/doomsday/engine/portable/src/rend_decor.c @@ -72,7 +72,7 @@ typedef struct decorsource_s { // PRIVATE FUNCTION PROTOTYPES --------------------------------------------- -static void updateSideSectionDecorations(sidedef_t* side, sidedefsection_t section); +static void updateSideSectionDecorations(SideDef* side, sidedefsection_t section); static void updatePlaneDecorations(plane_t* pln); // EXTERNAL DATA DECLARATIONS ---------------------------------------------- @@ -389,7 +389,7 @@ boolean R_ProjectSurfaceDecorations(surface_t* suf, void* context) { case DMU_SIDEDEF: { - sidedef_t* side = (sidedef_t*)suf->owner; + SideDef* side = (SideDef*)suf->owner; updateSideSectionDecorations(side, &side->SW_middlesurface == suf? SS_MIDDLE : &side->SW_bottomsurface == suf? SS_BOTTOM : SS_TOP); break; } @@ -569,7 +569,7 @@ static void updatePlaneDecorations(plane_t* pln) updateSurfaceDecorations2(suf, offsetS, offsetT, v1, v2, sec, suf->material? true : false); } -static void updateSideSectionDecorations(sidedef_t* side, sidedefsection_t section) +static void updateSideSectionDecorations(SideDef* side, sidedefsection_t section) { LineDef* line; surface_t* suf; diff --git a/doomsday/engine/portable/src/rend_fakeradio.c b/doomsday/engine/portable/src/rend_fakeradio.c index 9aff8567ec..2dad9be26f 100644 --- a/doomsday/engine/portable/src/rend_fakeradio.c +++ b/doomsday/engine/portable/src/rend_fakeradio.c @@ -74,7 +74,7 @@ float Rend_RadioCalcShadowDarkness(float lightLevel) void Rend_RadioUpdateLinedef(LineDef* line, boolean backSide) { - sidedef_t* s; + SideDef* s; if(!rendFakeRadio || levelFullBright || !line) return; @@ -469,7 +469,7 @@ static void scanEdges(shadowcorner_t topCorners[2], const LineDef* line, boolean backSide) { uint i, sid = (backSide? BACK : FRONT); - sidedef_t* side; + SideDef* side; LineDef* other; side = line->L_side(sid); @@ -1308,7 +1308,7 @@ static void addShadowEdge(vec2_t inner[2], vec2_t outer[2], float innerLeftZ, static void processEdgeShadow(const BspLeaf* bspLeaf, const LineDef* lineDef, uint side, uint planeId, float shadowDark) { - const sidedef_t* sideDef = lineDef->L_side(side? BACK : FRONT); + const SideDef* sideDef = lineDef->L_side(side? BACK : FRONT); const plane_t* pln = sideDef->sector->SP_plane(planeId); vec2_t inner[2], outer[2], edgeOpen, sideOpen; const materialvariantspecification_t* spec; diff --git a/doomsday/engine/portable/src/rend_main.c b/doomsday/engine/portable/src/rend_main.c index 217cf144e0..dd748a8882 100644 --- a/doomsday/engine/portable/src/rend_main.c +++ b/doomsday/engine/portable/src/rend_main.c @@ -379,7 +379,7 @@ void Rend_PreparePlane(rvertex_t* rvertices, size_t numVertices, static void markSideDefSectionsPVisible(HEdge* hedge) { const plane_t* fceil, *bceil, *ffloor, *bfloor; - sidedef_t* side; + SideDef* side; uint i; if(!hedge->lineDef || !hedge->lineDef->L_side(hedge->side)) return; @@ -552,7 +552,7 @@ static void doCalcSegDivisions(walldiv_t* div, const LineDef* line, static void calcSegDivisions(walldiv_t* div, const HEdge* hedge, const sector_t* frontSec, float bottomZ, float topZ, boolean doRight) { - sidedef_t* side; + SideDef* side; div->num = 0; @@ -609,7 +609,7 @@ for(k = 0; k < div->num; ++k) } static void selectSurfaceColors(const float** topColor, - const float** bottomColor, sidedef_t* side, sidedefsection_t section) + const float** bottomColor, SideDef* side, sidedefsection_t section) { switch(section) { @@ -1457,7 +1457,7 @@ static boolean doRenderSeg(HEdge* hedge, boolean isTwosidedMiddle) { rendworldpoly_params_t params; - sidedef_t* side = (hedge->lineDef? HEDGE_SIDEDEF(hedge) : NULL); + SideDef* side = (hedge->lineDef? HEDGE_SIDEDEF(hedge) : NULL); rvertex_t* rvertices; // Init the params. @@ -1968,7 +1968,7 @@ static boolean rendSegSection(BspLeaf* bspLeaf, HEdge* hedge, static boolean Rend_RenderSeg(BspLeaf* bspLeaf, HEdge* hedge) { boolean solidSeg = true; - sidedef_t* side; + SideDef* side; LineDef* ldef; float ffloor, fceil; boolean backSide; @@ -2148,7 +2148,7 @@ static boolean Rend_RenderSegTwosided(BspLeaf* bspLeaf, HEdge* hedge) int pid = viewPlayer - ddPlayers; float bottom, top, texOffset[2]; sector_t* frontSec, *backSec; - sidedef_t* frontSide, *backSide; + SideDef* frontSide, *backSide; plane_t* ffloor, *fceil, *bfloor, *bceil; LineDef* line; int solidSeg = false; @@ -2617,7 +2617,7 @@ static void rendBspLeafSky(BspLeaf* bspLeaf, int skyCap) static boolean skymaskSegIsVisible(HEdge* hedge, boolean clipBackFacing) { LineDef* lineDef; - sidedef_t* sideDef; + SideDef* sideDef; sector_t* backSec; sector_t* frontSec; @@ -2976,7 +2976,7 @@ void Rend_RenderSurfaceVectors(void) { HEdge* hedge = &hedges[i]; float x, y, bottom, top; - sidedef_t* side; + SideDef* side; surface_t* suf; vec3_t origin; diff --git a/doomsday/engine/portable/src/sv_pool.c b/doomsday/engine/portable/src/sv_pool.c index ed40677e62..ce3212a315 100644 --- a/doomsday/engine/portable/src/sv_pool.c +++ b/doomsday/engine/portable/src/sv_pool.c @@ -468,7 +468,7 @@ void Sv_RegisterSector(dt_sector_t* reg, uint number) */ void Sv_RegisterSide(dt_side_t* reg, uint number) { - sidedef_t* side = SIDE_PTR(number); + SideDef* side = SIDE_PTR(number); LineDef* line = side->line; reg->top.material = side->SW_topmaterial; @@ -753,7 +753,7 @@ boolean Sv_RegisterCompareSector(cregister_t* reg, uint number, boolean Sv_RegisterCompareSide(cregister_t* reg, uint number, sidedelta_t* d, byte doUpdate) { - const sidedef_t* s = SIDE_PTR(number); + const SideDef* s = SIDE_PTR(number); const LineDef* line = s->line; dt_side_t* r = ®->sideDefs[number]; byte lineFlags = (line ? line->flags & 0xff : 0); @@ -1570,7 +1570,7 @@ float Sv_DeltaDistance(const void* deltaPtr, const ownerinfo_t* info) if(delta->type == DT_SIDE) { - sidedef_t* sideDef = &sideDefs[delta->id]; + SideDef* sideDef = &sideDefs[delta->id]; return P_ApproxDistance(info->pos[VX] - sideDef->origin.pos[VX], info->pos[VY] - sideDef->origin.pos[VY]); } diff --git a/doomsday/plugins/common/include/dmu_lib.h b/doomsday/plugins/common/include/dmu_lib.h index bd7b8627a1..86d045599b 100644 --- a/doomsday/plugins/common/include/dmu_lib.h +++ b/doomsday/plugins/common/include/dmu_lib.h @@ -128,8 +128,8 @@ iterlist_t* P_GetSectorIterListForTag(int tag, boolean createNewList); LineDef* P_AllocDummyLine(void); void P_FreeDummyLine(LineDef* line); -sidedef_t* P_AllocDummySideDef(void); -void P_FreeDummySideDef(sidedef_t* sideDef); +SideDef* P_AllocDummySideDef(void); +void P_FreeDummySideDef(SideDef* sideDef); /** * Get the sector on the other side of the line that is NOT the given sector. diff --git a/doomsday/plugins/common/include/p_switch.h b/doomsday/plugins/common/include/p_switch.h index 80297197ce..301065b51c 100644 --- a/doomsday/plugins/common/include/p_switch.h +++ b/doomsday/plugins/common/include/p_switch.h @@ -41,7 +41,7 @@ typedef enum { typedef struct { thinker_t thinker; int timer; - sidedef_t* side; + SideDef* side; sidedefsurfaceid_t ssurfaceID; material_t* material; } materialchanger_t; @@ -66,12 +66,12 @@ typedef struct { void P_InitSwitchList(void); material_t* P_GetSwitch(material_t* mat, const switchlist_t** info); -boolean P_ToggleSwitch(sidedef_t* side, int sound, boolean silent, +boolean P_ToggleSwitch(SideDef* side, int sound, boolean silent, int tics); boolean P_UseSpecialLine(mobj_t* mo, LineDef* line, int side); void T_MaterialChanger(materialchanger_t* mchanger); -void P_SpawnMaterialChanger(sidedef_t* side, sidedefsurfaceid_t ssurfaceID, +void P_SpawnMaterialChanger(SideDef* side, sidedefsurfaceid_t ssurfaceID, material_t* mat, int tics); #endif diff --git a/doomsday/plugins/common/src/dmu_lib.c b/doomsday/plugins/common/src/dmu_lib.c index 0e374f207a..f816d5507d 100644 --- a/doomsday/plugins/common/src/dmu_lib.c +++ b/doomsday/plugins/common/src/dmu_lib.c @@ -78,19 +78,19 @@ void P_FreeDummyLine(LineDef* line) P_FreeDummy(line); } -sidedef_t* P_AllocDummySideDef(void) +SideDef* P_AllocDummySideDef(void) { return P_AllocDummy(DMU_SIDEDEF, 0); } -void P_FreeDummySideDef(sidedef_t* sideDef) +void P_FreeDummySideDef(SideDef* sideDef) { P_FreeDummy(sideDef); } void P_CopyLine(LineDef* dest, LineDef* src) { - sidedef_t* sidefrom, *sideto; + SideDef* sidefrom, *sideto; xline_t* xsrc = P_ToXLine(src); xline_t* xdest = P_ToXLine(dest); int i, sidx; diff --git a/doomsday/plugins/common/src/p_ceiling.c b/doomsday/plugins/common/src/p_ceiling.c index 54106a629d..2c3055a2ac 100644 --- a/doomsday/plugins/common/src/p_ceiling.c +++ b/doomsday/plugins/common/src/p_ceiling.c @@ -358,8 +358,8 @@ static int EV_DoCeiling2(int tag, float basespeed, ceilingtype_e type) case CT_CUSTOM: // jd64 { //bitmip? wha? - sidedef_t *front = P_GetPtrp(line, DMU_SIDEDEF0); - sidedef_t *back = P_GetPtrp(line, DMU_SIDEDEF1); + SideDef *front = P_GetPtrp(line, DMU_SIDEDEF0); + SideDef *back = P_GetPtrp(line, DMU_SIDEDEF1); float bitmipL = 0, bitmipR = 0; bitmipL = P_GetFloatp(front, DMU_MIDDLE_MATERIAL_OFFSET_X); diff --git a/doomsday/plugins/common/src/p_floor.c b/doomsday/plugins/common/src/p_floor.c index fd7ccbeee9..15401758e2 100644 --- a/doomsday/plugins/common/src/p_floor.c +++ b/doomsday/plugins/common/src/p_floor.c @@ -448,7 +448,7 @@ int findLineInSectorSmallestBottomMaterial(void *ptr, void *context) if(frontSec && backSec) { - sidedef_t* side; + SideDef* side; material_t* mat; side = P_GetPtrp(li, DMU_SIDEDEF0); @@ -587,8 +587,8 @@ int EV_DoFloor(LineDef *line, floortype_e floortype) #if __JDOOM64__ // jd64 > bitmip? wha? float bitmipL = 0, bitmipR = 0; - sidedef_t *front = P_GetPtrp(line, DMU_SIDEDEF0); - sidedef_t *back = P_GetPtrp(line, DMU_SIDEDEF1); + SideDef *front = P_GetPtrp(line, DMU_SIDEDEF0); + SideDef *back = P_GetPtrp(line, DMU_SIDEDEF1); bitmipL = P_GetFloatp(front, DMU_MIDDLE_MATERIAL_OFFSET_X); if(back) diff --git a/doomsday/plugins/common/src/p_mapsetup.c b/doomsday/plugins/common/src/p_mapsetup.c index 15c0f75573..0ac772556c 100644 --- a/doomsday/plugins/common/src/p_mapsetup.c +++ b/doomsday/plugins/common/src/p_mapsetup.c @@ -252,7 +252,7 @@ int applySurfaceColor(void* obj, void* context) if((dFlags & LDF_BLEND) && params->frontSec == P_GetPtrp(li, DMU_FRONT_SECTOR)) { - sidedef_t* side = P_GetPtrp(li, DMU_SIDEDEF0); + SideDef* side = P_GetPtrp(li, DMU_SIDEDEF0); if(side) { @@ -280,7 +280,7 @@ int applySurfaceColor(void* obj, void* context) if((dFlags & LDF_BLEND) && params->frontSec == P_GetPtrp(li, DMU_BACK_SECTOR)) { - sidedef_t* side = P_GetPtrp(li, DMU_SIDEDEF1); + SideDef* side = P_GetPtrp(li, DMU_SIDEDEF1); if(side) { @@ -991,7 +991,7 @@ static void P_FinalizeMap(void) material_t* mat = P_ToPtr(DMU_MATERIAL, Materials_ResolveUriCString(MN_TEXTURES_NAME":NUKE24")); material_t* bottomMat, *midMat; float yoff; - sidedef_t* sidedef; + SideDef* sidedef; LineDef* line; for(i = 0; i < numlines; ++i) diff --git a/doomsday/plugins/common/src/p_saveg.c b/doomsday/plugins/common/src/p_saveg.c index 89d31c7d69..193ec6627c 100644 --- a/doomsday/plugins/common/src/p_saveg.c +++ b/doomsday/plugins/common/src/p_saveg.c @@ -2189,7 +2189,7 @@ static void SV_WriteLine(LineDef* li) // For each side for(i = 0; i < 2; ++i) { - sidedef_t *si = P_GetPtrp(li, (i? DMU_SIDEDEF1:DMU_SIDEDEF0)); + SideDef *si = P_GetPtrp(li, (i? DMU_SIDEDEF1:DMU_SIDEDEF0)); if(!si) continue; @@ -2337,7 +2337,7 @@ static void SV_ReadLine(LineDef* li) // For each side for(i = 0; i < 2; ++i) { - sidedef_t* si = P_GetPtrp(li, (i? DMU_SIDEDEF1:DMU_SIDEDEF0)); + SideDef* si = P_GetPtrp(li, (i? DMU_SIDEDEF1:DMU_SIDEDEF0)); if(!si) continue; @@ -3751,7 +3751,7 @@ static void SV_WriteMaterialChanger(const materialchanger_t* mchanger) static int SV_ReadMaterialChanger(materialchanger_t* mchanger) { - sidedef_t* side; + SideDef* side; /*int ver =*/ SV_ReadByte(); // version byte. SV_ReadByte(); // Type byte. diff --git a/doomsday/plugins/common/src/p_switch.c b/doomsday/plugins/common/src/p_switch.c index 070ec6ebf0..b3c2b1272f 100644 --- a/doomsday/plugins/common/src/p_switch.c +++ b/doomsday/plugins/common/src/p_switch.c @@ -333,7 +333,7 @@ void T_MaterialChanger(materialchanger_t* mchanger) } } -void P_SpawnMaterialChanger(sidedef_t* side, sidedefsurfaceid_t ssurfaceID, +void P_SpawnMaterialChanger(SideDef* side, sidedefsurfaceid_t ssurfaceID, material_t* mat, int tics) { materialchanger_t* mchanger; @@ -349,7 +349,7 @@ void P_SpawnMaterialChanger(sidedef_t* side, sidedefsurfaceid_t ssurfaceID, } typedef struct { - sidedef_t* side; + SideDef* side; sidedefsurfaceid_t ssurfaceID; } findmaterialchangerparams_t; @@ -366,7 +366,7 @@ int findMaterialChanger(thinker_t* th, void* data) return false; // Keep looking. } -void P_StartButton(sidedef_t* side, sidedefsurfaceid_t ssurfaceID, +void P_StartButton(SideDef* side, sidedefsurfaceid_t ssurfaceID, material_t* mat, int tics) { findmaterialchangerparams_t params; @@ -392,7 +392,7 @@ void P_StartButton(sidedef_t* side, sidedefsurfaceid_t ssurfaceID, * @param tics @c <= 0 = A permanent change. * @c > 0 = Change back after this many tics. */ -boolean P_ToggleSwitch2(sidedef_t* side, sidedefsurfaceid_t ssurfaceID, +boolean P_ToggleSwitch2(SideDef* side, sidedefsurfaceid_t ssurfaceID, int sound, boolean silent, int tics) { material_t* mat, *current; @@ -445,7 +445,7 @@ boolean P_ToggleSwitch2(sidedef_t* side, sidedefsurfaceid_t ssurfaceID, * @param tics @c <= 0 = A permanent change. * @c > 0 = Change back after this many tics. */ -boolean P_ToggleSwitch(sidedef_t* side, int sound, boolean silent, int tics) +boolean P_ToggleSwitch(SideDef* side, int sound, boolean silent, int tics) { if(P_ToggleSwitch2(side, SID_TOP, sound, silent, tics)) return true; diff --git a/doomsday/plugins/common/src/p_xgline.c b/doomsday/plugins/common/src/p_xgline.c index 9af9db971c..e467e9e561 100644 --- a/doomsday/plugins/common/src/p_xgline.c +++ b/doomsday/plugins/common/src/p_xgline.c @@ -965,7 +965,7 @@ int XL_ValidateLineRef(LineDef* line, int reftype, void* context, char* parmname) { int answer = 0; - sidedef_t* side; + SideDef* side; switch(reftype) { @@ -1419,7 +1419,7 @@ int C_DECL XLTrav_ChangeWallMaterial(LineDef* line, boolean dummy, mobj_t* activator) { linetype_t* info = context2; - sidedef_t* side; + SideDef* side; blendmode_t blend = BM_NORMAL; byte rgba[4]; material_t* mat = NULL; @@ -1912,7 +1912,7 @@ void XL_SwapSwitchTextures(LineDef* line, int snum) { if(line) { - sidedef_t* side = P_GetPtrp(line, + SideDef* side = P_GetPtrp(line, snum? DMU_SIDEDEF1 : DMU_SIDEDEF0); if(side && P_ToggleSwitch(side, SFX_NONE, true, 0)) @@ -1930,7 +1930,7 @@ void XL_ChangeMaterial(LineDef* line, int sidenum, int section, { int i; int currentFlags; - sidedef_t* side = + SideDef* side = P_GetPtrp(line, sidenum? DMU_SIDEDEF1:DMU_SIDEDEF0); if(!side) @@ -2531,7 +2531,7 @@ int XL_HitLine(LineDef *line, int sidenum, mobj_t *thing) void XL_DoChain(LineDef* lineDef, int chain, boolean activating, mobj_t* actThing) { - sidedef_t* dummyFrontSideDef, *dummyBackSideDef = NULL; + SideDef* dummyFrontSideDef, *dummyBackSideDef = NULL; LineDef* dummyLineDef; xline_t* xdummyLineDef; @@ -2700,7 +2700,7 @@ void XL_Thinker(xlthinker_t* xl) { // The texture should be moved. Calculate the offsets. float current[2]; // The current offset. - sidedef_t* side; + SideDef* side; float spd = info->materialMoveSpeed; float offset[2]; angle_t ang = diff --git a/doomsday/plugins/common/src/p_xgsec.c b/doomsday/plugins/common/src/p_xgsec.c index 07dae3b260..fc11e8c5a1 100644 --- a/doomsday/plugins/common/src/p_xgsec.c +++ b/doomsday/plugins/common/src/p_xgsec.c @@ -761,7 +761,7 @@ int FindPrevOf(int *list, int num, int h) */ int XS_TextureHeight(LineDef* line, int part) { - sidedef_t* side; + SideDef* side; int snum = 0; int minfloor = 0, maxfloor = 0, maxceil = 0; sector_t* front = P_GetPtrp(line, DMU_FRONT_SECTOR); @@ -2618,7 +2618,7 @@ void XS_DoChain(sector_t* sec, int ch, int activating, void* act_thing) LineDef* dummyLine; xline_t* xdummyLine; linetype_t* ltype; - sidedef_t* dummySideDef; + SideDef* dummySideDef; xg = P_ToXSector(sec)->xg; info = &xg->info; diff --git a/doomsday/plugins/jdoom/src/p_oldsvg.c b/doomsday/plugins/jdoom/src/p_oldsvg.c index e08834ca2c..741101b459 100644 --- a/doomsday/plugins/jdoom/src/p_oldsvg.c +++ b/doomsday/plugins/jdoom/src/p_oldsvg.c @@ -412,7 +412,7 @@ void P_v19_UnArchiveWorld(void) for(j = 0; j < 2; ++j) { - sidedef_t* sdef = P_GetPtrp(line, (j? DMU_SIDEDEF1:DMU_SIDEDEF0)); + SideDef* sdef = P_GetPtrp(line, (j? DMU_SIDEDEF1:DMU_SIDEDEF0)); if(!sdef) continue; diff --git a/doomsday/plugins/jdoom/src/p_spec.c b/doomsday/plugins/jdoom/src/p_spec.c index 59d2067e94..7ce7448518 100644 --- a/doomsday/plugins/jdoom/src/p_spec.c +++ b/doomsday/plugins/jdoom/src/p_spec.c @@ -867,7 +867,7 @@ void P_PlayerInSpecialSector(player_t* player) void P_UpdateSpecials(void) { LineDef* line; - sidedef_t* side; + SideDef* side; // Extended lines and sectors. XG_Ticker(); diff --git a/doomsday/plugins/jdoom64/src/p_spec.c b/doomsday/plugins/jdoom64/src/p_spec.c index dc8082a37c..1384bd6f87 100644 --- a/doomsday/plugins/jdoom64/src/p_spec.c +++ b/doomsday/plugins/jdoom64/src/p_spec.c @@ -955,7 +955,7 @@ void P_UpdateSpecials(void) { float x, y; // jd64 added @c y, LineDef* line; - sidedef_t* side; + SideDef* side; // Extended lines and sectors. XG_Ticker(); diff --git a/doomsday/plugins/jheretic/src/p_oldsvg.c b/doomsday/plugins/jheretic/src/p_oldsvg.c index 0b30c63302..d564d068e6 100644 --- a/doomsday/plugins/jheretic/src/p_oldsvg.c +++ b/doomsday/plugins/jheretic/src/p_oldsvg.c @@ -425,7 +425,7 @@ void P_v13_UnArchiveWorld(void) for(j = 0; j < 2; j++) { - sidedef_t* sdef; + SideDef* sdef; if(j == 0) sdef = P_GetPtrp(line, DMU_SIDEDEF0); diff --git a/doomsday/plugins/jheretic/src/p_spec.c b/doomsday/plugins/jheretic/src/p_spec.c index af8229a4d2..61093d9035 100644 --- a/doomsday/plugins/jheretic/src/p_spec.c +++ b/doomsday/plugins/jheretic/src/p_spec.c @@ -1062,7 +1062,7 @@ void P_UpdateSpecials(void) uint i; float x; LineDef* line; - sidedef_t* side; + SideDef* side; // Extended lines and sectors. XG_Ticker(); diff --git a/doomsday/plugins/jhexen/src/p_acs.c b/doomsday/plugins/jhexen/src/p_acs.c index fc70d7324b..05ae47b5fa 100644 --- a/doomsday/plugins/jhexen/src/p_acs.c +++ b/doomsday/plugins/jhexen/src/p_acs.c @@ -1770,7 +1770,7 @@ static int CmdSetLineTexture(void) IterList_RewindIterator(list); while((line = IterList_MoveIterator(list)) != NULL) { - sidedef_t* sdef = + SideDef* sdef = P_GetPtrp(line, (side == 0? DMU_SIDEDEF0 : DMU_SIDEDEF1)); if(position == TEXTURE_MIDDLE) diff --git a/doomsday/plugins/jhexen/src/p_spec.c b/doomsday/plugins/jhexen/src/p_spec.c index 47ef067c6d..ddfec82490 100644 --- a/doomsday/plugins/jhexen/src/p_spec.c +++ b/doomsday/plugins/jhexen/src/p_spec.c @@ -964,7 +964,7 @@ void P_AnimateSurfaces(void) IterList_RewindIterator(linespecials); while((line = IterList_MoveIterator(linespecials)) != NULL) { - sidedef_t* side = 0; + SideDef* side = 0; fixed_t texOff[2]; xline_t* xline = P_ToXLine(line);