Commit graph

12484 commits

Author SHA1 Message Date
Rachael Alexanderson
4eef1d99ee Merge https://github.com/rheit/zdoom 2016-12-10 15:46:35 -05:00
Christoph Oelckers
952e47cfe4 - renamed internal MELEERANGE constant to deconflict with Actor's MeleeRange member. 2016-12-10 16:36:19 +01:00
Rachael Alexanderson
c48b528824 Merge https://github.com/rheit/zdoom 2016-12-10 08:04:51 -05:00
Rachael Alexanderson
843350b9ff Merge https://github.com/coelckers/gzdoom 2016-12-10 08:04:50 -05:00
Edoardo Prezioso
d92a814e8c - Fixed wrong argument format in voxeldef parser code.
It got revealed by the GCCPRINTF format addition to FScanner::ScriptMessage.
2016-12-10 14:02:12 +01:00
Edoardo Prezioso
8036719f45 - Add GCCPRINTF to ZScript compiler code.
This will help spotting errors in code using ZCCCompiler::{Warn,Error}.
2016-12-10 14:02:12 +01:00
Edoardo Prezioso
810c632beb - Added missing GCCPRINTF to FileWriter::Printf.
Luckily, this has shown no problems.
2016-12-10 14:02:12 +01:00
Edoardo Prezioso
45e5e5c6ee - Add missing GCCPRINTF to FraggleScript script_error function.
This will help spotting errors inside FraggleScript.
2016-12-10 14:02:12 +01:00
Edoardo Prezioso
d4a674740e - Add missing GCCPRINTF to timidity cmsg function.
Luckily, this has shown no problems.
2016-12-10 14:02:12 +01:00
Edoardo Prezioso
b78b8662dc - Add missing GCCPRINTF in scanner code.
This will help spotting erroneous usage of FScanner::{ScriptError,ScriptMessage} and FScriptPosition::Message.
2016-12-10 14:02:12 +01:00
Christoph Oelckers
7d4a5898ac - removed most inline assembly. Integer multiplication gets handled fine by all current compilers and fixed point division is too infrequently used to justify this mess.
That only leaves the Scale function which is still being used in a few places and which would create considerably worse code without assembly on 32 bit platforms. This is also far too primitive (2 or 3 assembly instructions) to claim any copyright on it, so I think m_fixed.h can now be considered free of Build-related issues. The deficated inline headers have been removed because that sole remaining function could be easily moved into m_fixed.h.
2016-12-10 13:58:18 +01:00
Christoph Oelckers
3563718049 - removed all fixed point inlines that aren't used anywhere. Note that most of the rest are only being used in one single function: R_DrawVoxel. 2016-12-10 12:12:29 +01:00
Christoph Oelckers
6c86a33f5d - fixed compilation of cursor scaling code. This reported 'std::vector' not defined, so now it just uses TArray, like the rest of ZDoom. 2016-12-10 12:05:46 +01:00
WilliamFeely
0e448a6450 Change DPI Awareness to per-monitor on Windows8.1+ 2016-12-10 10:30:23 +01:00
Magnus Norddahl
54759782b3 Fix cursor size 2016-12-10 10:29:43 +01:00
Magnus Norddahl
c4ca70101d Fix console window geometry size 2016-12-10 10:29:43 +01:00
Christoph Oelckers
a7c80ae858 - fixed: The message for invalid class extensions did not pass the class name to the error function. 2016-12-10 10:22:13 +01:00
Magnus Norddahl
7376414607 Added some missing static statements 2016-12-10 00:17:18 +01:00
Magnus Norddahl
012565228d Merge remote-tracking branch 'zdoom/master' into qzdoom
# Conflicts:
#	src/r_plane.cpp
#	src/r_segs.cpp
2016-12-10 00:08:56 +01:00
Christoph Oelckers
902a4b839c - fixed: Type determination of multi-dimensional arrays failed, apparently because ZCCCompiler::Simplify is too broken to leave the node's ring list intact.
Instead of trying to fix Simplify, which seems to be a lost cause, the ring list now gets unraveled into an array which is immune from this type of problem.
2016-12-09 23:01:12 +01:00
Major Cooke
b17bd65279 Fixed: A_CustomMissile's CMF_AIMDIRECTION's pitch calculations were also backwards. 2016-12-09 16:27:29 +01:00
Rachael Alexanderson
d1379e26f5 Revert "- moved wallscan code into its own file so that it can get an appropriate copyright notice and does not inflate an already large source file even more."
This reverts commit 15cf9d36a9.
2016-12-09 09:14:01 -05:00
Christoph Oelckers
c7cddcac0b - removed Build notice from r_segs.cpp because there is no Build code left in this file. 2016-12-09 15:12:16 +01:00
Magnus Norddahl
6806b498f8 Fix null pointer crash in rt column drawers if rt_init is not called before the first draw 2016-12-09 15:07:49 +01:00
Christoph Oelckers
5da9f71589 - renamed the WallMost functions because again: No more Build code -> no Build names! 2016-12-09 14:46:05 +01:00
Christoph Oelckers
56f37185b2 - let's be a bit clearer and not name non-Build stuff with Build terms.
(cherry picked from commit f3389ff5b7)
2016-12-09 08:42:35 -05:00
Rachael Alexanderson
2b5f9eebba - Correctly redid commit 34d551fe1f. 2016-12-09 08:41:59 -05:00
Christoph Oelckers
15cf9d36a9 - moved wallscan code into its own file so that it can get an appropriate copyright notice and does not inflate an already large source file even more.
(cherry picked from commit 34d551fe1f)

# Conflicts:
#	src/r_segs.cpp
2016-12-09 08:39:58 -05:00
Christoph Oelckers
356e55f0a2 - made the general entry point to the wall drawer a single function instead of requiring the caller to check for NPOT textures.
- renamed all functions in r_walldraw.cpp to give them names more in line with Doom's naming conventions. Since this is not Build code anymore it also shouldn't use Build names to avoid giving a false impression.
2016-12-09 14:25:51 +01:00
Christoph Oelckers
1ea559dea4 - removed several unused fixed point math functions from the inlines headers.
(cherry picked from commit 86909ecdb2)
2016-12-09 08:13:33 -05:00
Christoph Oelckers
cfd6bcec5e - more Build cleanup: Moved clearbufshort out of Build derived headers, removed the inline version for GCC 32 bit which was actually Build derived and renamed the C-version of this function, which does not originate from Build to 'fillshort'.
- cleaned out a lot the SafeDivScale stuff in m_fixed.h. The only SafeDivScale variant still in use was #16 for FixedDiv, so all the SafeDivScale stuff has been removed and the 16 variant renamed to FixedDiv because that's the only form in which it is still being used. (2x in R_DrawVoxel and 1x in ACS's FixedDiv PCode.)
- removed Build notice from m_fixed.h because aside from the inlines includes there is nothing here from Build anymore.

(cherry picked from commit eab06ef086)
2016-12-09 08:13:22 -05:00
Christoph Oelckers
c61f30a627 - got rid of clearbuf.
This was used in only 4 places, 3 of which could easily be replaced with a memset, and the fourth, in the Strife status bar, suffering from a pointless performance optimization, rendering the code unreadable - the code spent here per frame is utterly insignificant so clarity should win here.

(cherry picked from commit 12a99c3f3c)
2016-12-09 08:13:08 -05:00
Christoph Oelckers
695b08ed4b - removed some unused functions from m_fixed.h.
- removed the Build license note from r_bsp.cpp.

This note was for code in R_AddLine which had been both refactored into several subfunctions and completely replaced with a floating point version. What is left is just some basic common math without any traits that resemble anything in Build.

(cherry picked from commit 8748b9ef6d)
2016-12-09 08:11:57 -05:00
Christoph Oelckers
5d210c64e0 - got rid of ksgn.
Because every bit of Build code that can be removed is a good thing.
This was only used in two places, one of which could be done better, the other one in the voxel drawer setup now uses a local C-inline version.

(cherry picked from commit 5536184bee)
2016-12-09 08:11:45 -05:00
Christoph Oelckers
b709db3fd3 Merge branch 'master' of https://github.com/rheit/zdoom 2016-12-09 13:32:05 +01:00
Christoph Oelckers
86909ecdb2 - removed several unused fixed point math functions from the inlines headers. 2016-12-09 13:27:30 +01:00
Christoph Oelckers
eab06ef086 - more Build cleanup: Moved clearbufshort out of Build derived headers, removed the inline version for GCC 32 bit which was actually Build derived and renamed the C-version of this function, which does not originate from Build to 'fillshort'.
- cleaned out a lot the SafeDivScale stuff in m_fixed.h. The only SafeDivScale variant still in use was #16 for FixedDiv, so all the SafeDivScale stuff has been removed and the 16 variant renamed to FixedDiv because that's the only form in which it is still being used. (2x in R_DrawVoxel and 1x in ACS's FixedDiv PCode.)
- removed Build notice from m_fixed.h because aside from the inlines includes there is nothing here from Build anymore.
2016-12-09 13:04:53 +01:00
Christoph Oelckers
12a99c3f3c - got rid of clearbuf.
This was used in only 4 places, 3 of which could easily be replaced with a memset, and the fourth, in the Strife status bar, suffering from a pointless performance optimization, rendering the code unreadable - the code spent here per frame is utterly insignificant so clarity should win here.
2016-12-09 12:48:10 +01:00
Christoph Oelckers
f3389ff5b7 - let's be a bit clearer and not name non-Build stuff with Build terms. 2016-12-09 12:21:27 +01:00
Christoph Oelckers
34d551fe1f - moved wallscan code into its own file so that it can get an appropriate copyright notice and does not inflate an already large source file even more. 2016-12-09 11:49:18 +01:00
Magnus Norddahl
b7d5110a49 Merge remote-tracking branch 'origin/rt_drawer_crashfix' into qzdoom 2016-12-09 10:36:19 +01:00
Christoph Oelckers
8748b9ef6d - removed some unused functions from m_fixed.h.
- removed the Build license note from r_bsp.cpp.

This note was for code in R_AddLine which had been both refactored into several subfunctions and completely replaced with a floating point version. What is left is just some basic common math without any traits that resemble anything in Build.
2016-12-09 10:31:17 +01:00
Magnus Norddahl
6609403fbe Fix null pointer crash in rt column drawers if rt_init is not called before the first draw 2016-12-09 10:27:18 +01:00
Rachael Alexanderson
c53030d550 Merge branch 'master' of https://github.com/rheit/zdoom 2016-12-09 03:00:05 -05:00
Rachael Alexanderson
c109ebf7cb Merge branch 'master' of https://github.com/coelckers/gzdoom 2016-12-09 03:00:02 -05:00
Magnus Norddahl
f1df400cc7 Add some portal segment culling and disable sector portals for now 2016-12-09 03:17:35 +01:00
Christoph Oelckers
5536184bee - got rid of ksgn.
Because every bit of Build code that can be removed is a good thing.
This was only used in two places, one of which could be done better, the other one in the voxel drawer setup now uses a local C-inline version.
2016-12-09 00:43:54 +01:00
Edoardo Prezioso
67b2e2f52e - Remove valgrind code, now that the assembly stuff is gone. 2016-12-08 22:44:23 +01:00
Christoph Oelckers
48d17f8fcb Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	src/r_data/sprites.cpp
2016-12-08 21:06:35 +01:00
Christoph Oelckers
8a6d3b8e7b - sprites.cpp 2016-12-08 21:05:53 +01:00