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

- fixed check for GL nodebuild

Browse source 
SVN r2613 (trunk)
This commit is contained in:
Christoph Oelckers 2010-08-27 17:34:25 +00:00
parent 3afa8149de
commit ece980d372
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/p_setup.cpp
View file

@ -3803,8 +3803,10 @@ void P_SetupLevel (char *lumpname, int position)
unsigned int startTime=0, endTime=0; unsigned int startTime=0, endTime=0;
bool BuildGLNodes;
if (ForceNodeBuild) if (ForceNodeBuild)
{ {
BuildGLNodes = am_textured || multiplayer || demoplayback || demorecording || genglnodes;
startTime = I_FPSTime (); startTime = I_FPSTime ();
TArray<FNodeBuilder::FPolyStart> polyspots, anchors; TArray<FNodeBuilder::FPolyStart> polyspots, anchors;
@ -3819,7 +3821,6 @@ void P_SetupLevel (char *lumpname, int position)
// We need GL nodes if am_textured is on. // We need GL nodes if am_textured is on.
// In case a sync critical game mode is started, also build GL nodes to avoid problems // In case a sync critical game mode is started, also build GL nodes to avoid problems
// if the different machines' am_textured setting differs. // if the different machines' am_textured setting differs.
bool BuildGLNodes = am_textured || multiplayer || demoplayback || demorecording || genglnodes;
FNodeBuilder builder (leveldata, polyspots, anchors, BuildGLNodes); FNodeBuilder builder (leveldata, polyspots, anchors, BuildGLNodes);
delete[] vertexes; delete[] vertexes;
builder.Extract (nodes, numnodes, builder.Extract (nodes, numnodes,
@ -3832,6 +3833,7 @@ void P_SetupLevel (char *lumpname, int position)
} }
else else
{ {
BuildGLNodes = false;
// Older ZDBSPs had problems with compressed sidedefs and assigned wrong sides to the segs if both sides were the same sidedef. // Older ZDBSPs had problems with compressed sidedefs and assigned wrong sides to the segs if both sides were the same sidedef.
for(i=0;i<numsegs;i++) for(i=0;i<numsegs;i++)
{ {
@ -3872,7 +3874,7 @@ void P_SetupLevel (char *lumpname, int position)
// If the original nodes being loaded are not GL nodes they will be kept around for // If the original nodes being loaded are not GL nodes they will be kept around for
// use in P_PointInSubsector to avoid problems with maps that depend on the specific // use in P_PointInSubsector to avoid problems with maps that depend on the specific
// nodes they were built with (P:AR E1M3 is a good example for a map where this is the case.) // nodes they were built with (P:AR E1M3 is a good example for a map where this is the case.)
reloop |= P_CheckNodes(map, ForceNodeBuild, endTime - startTime); reloop |= P_CheckNodes(map, BuildGLNodes, endTime - startTime);
hasglnodes = true; hasglnodes = true;
} }
else else