zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-13 07:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into asmjit

Browse source
This commit is contained in:
Christoph Oelckers 2018-11-28 18:44:42 +01:00
commit a5a9ab07af
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/p_3dfloors.cpp
View file

@ -891,11 +891,6 @@ void P_Spawn3DFloors (void)
line.special=0; line.special=0;
line.args[0] = line.args[1] = line.args[2] = line.args[3] = line.args[4] = 0; line.args[0] = line.args[1] = line.args[2] = line.args[3] = line.args[4] = 0;
} }
// kg3D - do it in software
for (auto &sec : level.sectors)
{
P_Recalculate3DFloors(&sec);
}
} }

6
src/p_setup.cpp
View file

@ -4116,6 +4116,12 @@ void P_SetupLevel(const char *lumpname, int position, bool newGame)
// This must be done BEFORE the PolyObj Spawn!!! // This must be done BEFORE the PolyObj Spawn!!!
InitRenderInfo(); // create hardware independent renderer resources for the level. InitRenderInfo(); // create hardware independent renderer resources for the level.
screen->mVertexData->CreateVBO(); screen->mVertexData->CreateVBO();
for (auto &sec : level.sectors)
{
P_Recalculate3DFloors(&sec);
}
SWRenderer->SetColormap(); //The SW renderer needs to do some special setup for the level's default colormap. SWRenderer->SetColormap(); //The SW renderer needs to do some special setup for the level's default colormap.
InitPortalGroups(); InitPortalGroups();
P_InitHealthGroups(); P_InitHealthGroups();

5
wadsrc/static/zscript/level_compatibility.txt
View file

@ -179,6 +179,11 @@ class LevelCompatibility play
{ {
// The famous missing yellow key... // The famous missing yellow key...
SetThingFlags(470, 2016); SetThingFlags(470, 2016);
// Fix textures on the two switches that rise from the floor in the eastern area
for (int i = 0; i < 8; i++)
{
SetLineFlags(1676 + i, 0, Line.ML_DONTPEGBOTTOM);
}
break; break;
} }