From bd7648d5d2fb5af064e6a180f48411df66d8d8aa Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 4 Apr 2017 21:50:41 +0200 Subject: [PATCH 1/5] Add install target --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e29bae..b0ac4c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,3 +221,5 @@ set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEB_C_FLAGS} -D_DEBUG" ) add_executable( zdbsp ${SOURCES} ${HEADERS} ) target_link_libraries( zdbsp ${ZDBSP_LIBS} ${PROF_LIB} ) include_directories( "${ZLIB_INCLUDE_DIR}" ) + +install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/zdbsp" DESTINATION bin) From 12d7d978a7657969fb6a0f972c80511b6b50a13d Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 4 Apr 2017 21:48:32 +0200 Subject: [PATCH 2/5] Fix address in license --- COPYING | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/COPYING b/COPYING index d60c31a..d159169 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. From d297dfffabdbff14456c4142dd2be2e533d4cdc1 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 15 Jul 2017 22:35:51 +0200 Subject: [PATCH 3/5] - fixed bad inline function, which fortunately was not used. --- xs_Float.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xs_Float.h b/xs_Float.h index 19300b2..1f57f92 100644 --- a/xs_Float.h +++ b/xs_Float.h @@ -209,7 +209,7 @@ finline static uint32 xs_FloorToUInt(real64 val) finline static uint32 xs_CeilToUInt(real64 val) { - return (uint32)xs_CeilToUInt(val); + return (uint32)xs_CeilToInt(val); } finline static uint32 xs_RoundToUInt(real64 val) From e3acdeffd623ebb8e728f0cdf7cbe5993f88a429 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 12 Aug 2017 09:32:14 +0200 Subject: [PATCH 4/5] - increase the string buffer of sc_man to 40960 to parse longer string elements. --- sc_man.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sc_man.cpp b/sc_man.cpp index 204f4f9..c371675 100644 --- a/sc_man.cpp +++ b/sc_man.cpp @@ -34,7 +34,7 @@ // MACROS ------------------------------------------------------------------ -#define MAX_STRING_SIZE 4096 +#define MAX_STRING_SIZE 40960 #define ASCII_COMMENT (';') #define CPP_COMMENT ('/') #define C_COMMENT ('*') From ea4d41c589b0a0788a1083facfbcc3952cd1e2ff Mon Sep 17 00:00:00 2001 From: Ioan Chera Date: Sat, 27 Oct 2018 19:08:00 +0300 Subject: [PATCH 5/5] Fix overwriting of newseg side causing problems with linedefs with the same sidedefs on both parts --- nodebuild_extract.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/nodebuild_extract.cpp b/nodebuild_extract.cpp index 035fd7c..d81869b 100644 --- a/nodebuild_extract.cpp +++ b/nodebuild_extract.cpp @@ -521,8 +521,6 @@ int FNodeBuilder::StripMinisegs (TArray &segs, int subsector, short bb newseg.side = ld->sidenum[1] == org->sidedef ? 1 : 0; } - - newseg.side = Level.Lines[org->linedef].sidenum[1] == org->sidedef ? 1 : 0; segs.Push (newseg); ++count; }