lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Skybox spawning now uses the taglists.

This commit is contained in:
Nev3r 2020-04-17 10:05:50 +02:00
parent 81be6b4067
commit 4fc07473fd
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/p_mobj.c
View File

@ -12584,17 +12584,20 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
break;
}
case MT_SKYBOX:
if (mthing->tag < 0 || mthing->tag > 15)
{
mtag_t tag = Tag_FGet(&mthing->tags);
if (tag < 0 || tag > 15)
{
CONS_Debug(DBG_GAMELOGIC, "P_SetupSpawnedMapThing: Skybox ID %d of mapthing %s is not between 0 and 15!\n", mthing->tag, sizeu1((size_t)(mthing - mapthings)));
CONS_Debug(DBG_GAMELOGIC, "P_SetupSpawnedMapThing: Skybox ID %d of mapthing %s is not between 0 and 15!\n", tag, sizeu1((size_t)(mthing - mapthings)));
break;
}
if (mthing->options & MTF_OBJECTSPECIAL)
skyboxcenterpnts[mthing->tag] = mobj;
skyboxcenterpnts[tag] = mobj;
else
skyboxviewpnts[mthing->tag] = mobj;
skyboxviewpnts[tag] = mobj;
break;
}
case MT_EGGSTATUE:
if (mthing->options & MTF_EXTRA)
{

2
src/p_setup.c
View File

@ -2844,7 +2844,7 @@ static void P_ConvertBinaryMap(void)
mapthings[i].tag = mapthings[i].angle;
break;
case 780:
mapthings[i].tag = mapthings[i].extrainfo;
Tag_FSet(&mapthings[i].tags, mapthings[i].extrainfo);
break;
default:
break;