zdoom
/
zdbsp
mirror of https://github.com/ZDoom/zdbsp.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ZDBSP fix: ShoveSegBehind needs to check for a positive result from Heuristic, not non-zero. 

SVN r335 (trunk)
This commit is contained in:
Randy Heit 2006-09-23 02:32:22 +00:00
parent 6858d9b1c7
commit d975a01709
5 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nodebuild.cpp
View File

@ -196,6 +196,10 @@ void FNodeBuilder::CreateSubsectorsForReal ()
// Convert seg pointers into indices
D(printf ("Output subsector %d:\n", Subsectors.Size()));
if (SegList[sub.firstline].SegPtr->linedef == -1)
{
printf (" Failure: Subsector %d is all minisegs!\n", Subsectors.Size());
}
for (unsigned int i = sub.firstline; i < SegList.Size(); ++i)
{
D(printf (" Seg %5d%c(%5d,%5d)-(%5d,%5d)\n", SegList[i].SegPtr - &Segs[0],
@ -403,7 +407,7 @@ bool FNodeBuilder::ShoveSegBehind (DWORD set, node_t &node, DWORD seg, DWORD mat
node.dx = -node.dx;
node.dy = -node.dy;
}
return Heuristic (node, set, false) != 0;
return Heuristic (node, set, false) > 0;
}
// Splitters are chosen to coincide with segs in the given set. To reduce the
@ -1009,7 +1013,7 @@ void FNodeBuilder::PrintSet (int l, DWORD set)
Printf ("set %d:\n", l);
for (; set != DWORD_MAX; set = Segs[set].next)
{
Printf ("\t%u(%d)%c%d(%d,%d)-%d(%d,%d)\n", set,
Printf ("\t%5u(%d)%c%d(%d,%d)-%d(%d,%d)\n", set,
Segs[set].frontsector,
Segs[set].linedef == -1 ? '+' : ':',
Segs[set].v1,
@ -1020,7 +1024,7 @@ void FNodeBuilder::PrintSet (int l, DWORD set)
Printf ("*\n");
}
#if defined(_WIN32) && !defined(__SSE2__) && !defined(DISABLE_SSE) && !defined(DISABLE_BACKPATCH) && !defined(_M_X64) && defined(__GNUC__)
#if defined(_WIN32) && !defined(__SSE2__) && !defined(DISABLE_SSE) && !defined(DISABLE_BACKPATCH) && defined(__i386__) && defined(__GNUC__)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>

10
resource.rc
View File

@ -93,8 +93,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,8,0,0
PRODUCTVERSION 1,8,0,0
FILEVERSION 1,10,0,0
PRODUCTVERSION 1,10,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -110,12 +110,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "ZDBSP Node Builder"
VALUE "FileVersion", "1.8"
VALUE "FileVersion", "1.10"
VALUE "InternalName", "zdbsp"
VALUE "LegalCopyright", "Copyright (C) 2002-2006"
VALUE "LegalCopyright", "Copyright (C) 2002-2006 Randy Heit"
VALUE "OriginalFilename", "zdbsp.exe"
VALUE "ProductName", "ZDBSP"
VALUE "ProductVersion", "1.8"
VALUE "ProductVersion", "1.10"
END
END
BLOCK "VarFileInfo"

2
zdbsp.h
View File

@ -16,7 +16,7 @@ typedef __int32 int32_t;
#include <stdint.h>
#endif
#define ZDBSP_VERSION "1.9"
#define ZDBSP_VERSION "1.10"
enum EBlockmapMode
{

3
zdbsp.vcproj
View File

@ -475,6 +475,9 @@
RelativePath=".\zlib\zutil.c">
</File>
</Filter>
<File
RelativePath=".\Makefile">
</File>
<File
RelativePath=".\zdbsp.html">
</File>

4
zipsrc.bat
View File

@ -1,4 +1,4 @@
zip -9 %1 COPYING *.cpp *.h *.c *.rc *.ds? *.sln *.vcproj unused/* zlib/*
kzip b%1 COPYING *.cpp *.h *.c *.rc *.ds? *.sln *.vcproj unused/* zlib/*
zip -9 %1 COPYING Makefile *.cpp *.h *.c *.rc *.ds? *.sln *.vcproj unused/* zlib/*.c zlib/*.h
kzip b%1 COPYING Makefile *.cpp *.h *.c *.rc *.ds? *.sln *.vcproj unused/* zlib/*.c zlib/*.h
zipmix %1 b%1
del b%1