thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move shared parts of sidedef initialization into P_InitializeSidedef

Browse source
This commit is contained in:
MascaraSnake 2020-01-01 15:10:41 +01:00
parent 699de06c05
commit 9da0b78666
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/p_setup.c
View file

@ -1074,6 +1074,19 @@ static void P_SetSidedefSector(size_t i, UINT16 sector_num)
sides[i].sector = &sectors[sector_num]; sides[i].sector = &sectors[sector_num];
} }
static void P_InitializeSidedef(side_t *sd)
{
if (!sd->line)
{
CONS_Debug(DBG_SETUP, "P_LoadSidedefs: Sidedef %s is not used by any linedef\n", sizeu1(i));
sd->line = &lines[0];
sd->special = sd->line->special;
}
sd->text = NULL;
sd->colormap_data = NULL;
}
static void P_LoadSidedefs(UINT8 *data) static void P_LoadSidedefs(UINT8 *data)
{ {
mapsidedef_t *msd = (mapsidedef_t*)data; mapsidedef_t *msd = (mapsidedef_t*)data;
@ -1085,11 +1098,7 @@ static void P_LoadSidedefs(UINT8 *data)
INT16 textureoffset = SHORT(msd->textureoffset); INT16 textureoffset = SHORT(msd->textureoffset);
boolean isfrontside; boolean isfrontside;
if (!sd->line) P_InitializeSidedef(sd);
{
CONS_Debug(DBG_SETUP, "P_LoadSidedefs: Sidedef %s is not used by any linedef\n", sizeu1(i));
sd->line = &lines[0];
}
isfrontside = sd->line->sidenum[0] == i; isfrontside = sd->line->sidenum[0] == i;
@ -1109,8 +1118,6 @@ static void P_LoadSidedefs(UINT8 *data)
P_SetSidedefSector(i, SHORT(msd->sector)); P_SetSidedefSector(i, SHORT(msd->sector));
sd->colormap_data = NULL;
// Special info stored in texture fields! // Special info stored in texture fields!
switch (sd->special) switch (sd->special)
{ {
@ -1643,6 +1650,7 @@ static void P_LoadTextmap(void)
CONS_Debug(DBG_SETUP, "P_LoadTextmap: sidedef %s has no sector set; defaulting to 0\n", sizeu1(i)); CONS_Debug(DBG_SETUP, "P_LoadTextmap: sidedef %s has no sector set; defaulting to 0\n", sizeu1(i));
sd->sector = &sectors[0]; sd->sector = &sectors[0];
} }
P_InitializeSidedef(sd);
} }
for (i = 0, mt = mapthings; i < nummapthings; i++, mt++) for (i = 0, mt = mapthings; i < nummapthings; i++, mt++)