stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-18 10:31:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge issue.

Browse source
This commit is contained in:
Nevur 2017-06-25 15:39:45 +02:00
parent d5e38c087d
commit d3a652aa15
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/p_setup.c
View file

@ -2781,6 +2781,9 @@ boolean P_SetupLevel(boolean skipprecip)
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
skyboxmo[i] = NULL; skyboxmo[i] = NULL;
for (i = 0; i < 16; i++)
skyboxviewpnts[i] = skyboxcenterpnts[i] = NULL;
P_MapStart(); P_MapStart();
P_PrepareRawThings(wadData + (fileinfo + ML_THINGS)->filepos, (fileinfo + ML_THINGS)->size); P_PrepareRawThings(wadData + (fileinfo + ML_THINGS)->filepos, (fileinfo + ML_THINGS)->size);
@ -2815,16 +2818,25 @@ boolean P_SetupLevel(boolean skipprecip)
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
skyboxmo[i] = NULL; skyboxmo[i] = NULL;
for (i = 0; i < 16; i++)
skyboxviewpnts[i] = skyboxcenterpnts[i] = NULL;
P_MapStart(); P_MapStart();
P_PrepareThings(lastloadedmaplumpnum + ML_THINGS); P_PrepareThings(lastloadedmaplumpnum + ML_THINGS);
} }
// init gravity, tag lists,
// anything that P_ResetDynamicSlopes/P_LoadThings needs to know
P_InitSpecials();
#ifdef ESLOPE #ifdef ESLOPE
P_ResetDynamicSlopes(); P_ResetDynamicSlopes();
#endif #endif
P_LoadThings(); P_LoadThings();
skyboxmo[0] = skyboxviewpnts[0];
skyboxmo[1] = skyboxcenterpnts[0];
P_SpawnSecretItems(loademblems); P_SpawnSecretItems(loademblems);