Commit graph

5976 commits

Author SHA1 Message Date
terminx
5c6d8c96ad The great cleanup continues. This one also adds a new feature, SFLAG_WAKEUPBADGUYS. When awoken (changed to an active actor), any sprite with this flag set will wake up any enemy it has line of sight with.
git-svn-id: https://svn.eduke32.com/eduke32@5826 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:40:46 +00:00
terminx
52f678a743 Massive readability cleanup of game code part 1. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5825 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:40:35 +00:00
terminx
8e92183835 Android build fix. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5824 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:40:18 +00:00
terminx
9d0916b6b7 Mapster32: add home/end modifier keys to 3d mode slope keys ([ and ]), plus a third increment modifier (home and end at the same time)
git-svn-id: https://svn.eduke32.com/eduke32@5823 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:40:15 +00:00
terminx
47edac436b Support hex constants in scriptfile_getsymbolvalue()
git-svn-id: https://svn.eduke32.com/eduke32@5822 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:40:11 +00:00
terminx
ae5f941ad0 You're just going to have to trust me that this is 10000 lines worth of formatting and variable name cleanup, and not 10000 lines of functional changes.
git-svn-id: https://svn.eduke32.com/eduke32@5821 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:40:06 +00:00
terminx
d7595edc41 Update _clang-format file. DONT_BUILD.
git-svn-id: https://svn.eduke32.com/eduke32@5820 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:39:59 +00:00
terminx
51c47a9ef7 ldist/dist tweak
git-svn-id: https://svn.eduke32.com/eduke32@5819 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:39:56 +00:00
terminx
3f641d314f Fix EVENT_DISPLAYROOMS and EVENT_DISPLAYROOMSCAMERA RETURN values
git-svn-id: https://svn.eduke32.com/eduke32@5818 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:39:53 +00:00
terminx
ae7fcd43a6 Windows MIDI cleanup. Removal of some remaining unused functionality lingering from the DOS days and some formatting changes that happened along the way. If anything breaks with music on Windows, this is probably the commit to look at.
git-svn-id: https://svn.eduke32.com/eduke32@5817 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:39:50 +00:00
terminx
9a0a62fdcb Windows MIDI support: remove a few unused structure members and the code that relied on them
git-svn-id: https://svn.eduke32.com/eduke32@5816 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:39:45 +00:00
terminx
51992210b8 basic cleanup and formatting
git-svn-id: https://svn.eduke32.com/eduke32@5815 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:39:41 +00:00
terminx
a58e1ff580 audiolib:
consolidate all multivoc invalid file errors into MV_InvalidFile
renamed FX_PlayLooped to FX_Play and removed original FX_Play
removed device type parameter from FX_Init
moved several FX_ multivoc wrapper functions to the header and made them FORCE_INLINE

git-svn-id: https://svn.eduke32.com/eduke32@5814 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:39:38 +00:00
terminx
1305d32e84 audiolib: initialization is better than assignment
git-svn-id: https://svn.eduke32.com/eduke32@5813 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:39:30 +00:00
terminx
065db7d5e8 Sound cleanup: remove some unused functions
git-svn-id: https://svn.eduke32.com/eduke32@5812 1a8010ca-5511-0410-912e-c29ae57300e0
2016-08-27 01:39:24 +00:00
helixhorned
531814ecc4 Mapster32: on TROR point insertion, mark more points.
This fixes a bug reported by Micky C on 2016-01-11 where too
few points were marked to be inserted. See AMC TC SVN r2308.

git-svn-id: https://svn.eduke32.com/eduke32@5811 1a8010ca-5511-0410-912e-c29ae57300e0
2016-07-04 14:09:08 +00:00
helixhorned
eda5300b33 Mapster32: pull out some code from M32_InsertPoint() into M32_MarkPointInsertion().
git-svn-id: https://svn.eduke32.com/eduke32@5810 1a8010ca-5511-0410-912e-c29ae57300e0
2016-07-04 14:09:08 +00:00
helixhorned
edd7a82be8 Lunatic: fix map-text loading.
The file descriptor was closed from Lua code, causing the
subsequent kfilelength() to fail and attempt an allocation
of (size_t)-1 bytes.

git-svn-id: https://svn.eduke32.com/eduke32@5809 1a8010ca-5511-0410-912e-c29ae57300e0
2016-07-04 14:09:07 +00:00
helixhorned
f0cb3ea994 SDL2 layer: in Mapster32, fix menu Ctrl-F in case NumLock is on.
git-svn-id: https://svn.eduke32.com/eduke32@5808 1a8010ca-5511-0410-912e-c29ae57300e0
2016-07-04 14:09:06 +00:00
helixhorned
46f39b725c engine.c: fix potential smostwall[-1] access. Found by ASan.
git-svn-id: https://svn.eduke32.com/eduke32@5807 1a8010ca-5511-0410-912e-c29ae57300e0
2016-07-04 14:09:05 +00:00
helixhorned
bcce4cd531 Fix non-HAVE_CLIPSHAPE_FEATURE build.
Used for example with DEBUGGINGAIDS=2, i.e. sanitizers enabled.

git-svn-id: https://svn.eduke32.com/eduke32@5806 1a8010ca-5511-0410-912e-c29ae57300e0
2016-07-04 14:09:03 +00:00
Plagman
1b947c7b07 nice nice good stuff
git-svn-id: https://svn.eduke32.com/eduke32@5805 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 05:31:54 +00:00
terminx
0d41360676 Build fix
git-svn-id: https://svn.eduke32.com/eduke32@5804 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 04:29:06 +00:00
terminx
95f7cf0982 "return" is not a function.
git-svn-id: https://svn.eduke32.com/eduke32@5803 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:34:41 +00:00
terminx
951ad678c4 Usual cleanup type stuff involving vectors and variable scopes.
git-svn-id: https://svn.eduke32.com/eduke32@5802 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:34:29 +00:00
terminx
0e713e698f Separate art tile related functions out from engine.c and into tiles.c
git-svn-id: https://svn.eduke32.com/eduke32@5801 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:34:25 +00:00
terminx
03daded192 Vectorize a few more things.
git-svn-id: https://svn.eduke32.com/eduke32@5800 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:34:18 +00:00
terminx
29a9b93517 FORCE_INLINE a couple of Polymost support functions.
git-svn-id: https://svn.eduke32.com/eduke32@5799 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:34:10 +00:00
terminx
d5ceeebfcb Miscellaneous tomfoolery of little consequence.
git-svn-id: https://svn.eduke32.com/eduke32@5798 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:34:07 +00:00
terminx
e1fc28776c Fix MSVC build
git-svn-id: https://svn.eduke32.com/eduke32@5797 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:34:03 +00:00
terminx
5800cd588c tsectortype -> usectortype
twalltype -> uwalltype
tspritetype -> uspritetype

No other changes.

git-svn-id: https://svn.eduke32.com/eduke32@5796 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:33:58 +00:00
terminx
0562de125f More changes similar to the previous commit
git-svn-id: https://svn.eduke32.com/eduke32@5795 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:33:45 +00:00
terminx
dd1d02a0e7 Change a bunch of engine functions that access sprites, walls, and sectors in a read-only fashion to use the untracked versions of those structs.
git-svn-id: https://svn.eduke32.com/eduke32@5794 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:33:39 +00:00
terminx
3b7aa279b1 Clipping function tweaks. Fixes building without HAVE_CLIPSHAPE_FEATURE.
git-svn-id: https://svn.eduke32.com/eduke32@5793 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:33:35 +00:00
terminx
32450bdd68 Relocate maphack related code into mhk.c.
This commit also relocates clipping related code into clip.c and makes a few other minor changes, because I fucked up and merged the commits together. God damn it.

git-svn-id: https://svn.eduke32.com/eduke32@5792 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:33:30 +00:00
terminx
cb2382285f Separate screen capture code from engine.c into screenshot.c
git-svn-id: https://svn.eduke32.com/eduke32@5791 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:33:19 +00:00
terminx
3eb979f8da Split 2d mode editor stuff that remained in engine.c into 2d.c.
git-svn-id: https://svn.eduke32.com/eduke32@5790 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:33:14 +00:00
terminx
205a757109 Move palette related functionality from engine.c to palette.c/h.
git-svn-id: https://svn.eduke32.com/eduke32@5789 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:33:06 +00:00
terminx
cdcc983a22 Move hash table stuff out of engine.c and into hash.c/h.
git-svn-id: https://svn.eduke32.com/eduke32@5788 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:32:53 +00:00
terminx
aca0807a81 Performance fix for Polymost wall sprite z-fighting avoidance
git-svn-id: https://svn.eduke32.com/eduke32@5787 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:32:47 +00:00
terminx
212e84ce21 Minor CON optimization bs.
git-svn-id: https://svn.eduke32.com/eduke32@5786 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:32:44 +00:00
terminx
85d0543763 This is stupid as fuck, but I swear I profiled it and it was faster this way. Looked like a cache miss on the first access of the pointers.
git-svn-id: https://svn.eduke32.com/eduke32@5785 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:32:40 +00:00
terminx
42ece182e4 Pragma tweaks
git-svn-id: https://svn.eduke32.com/eduke32@5784 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:32:37 +00:00
terminx
74b01416d0 Allow non-player hitscan projectiles to spawn sprites when impacting walls or sectors, and allow them to break sector textures (they could already break wall textures)
git-svn-id: https://svn.eduke32.com/eduke32@5783 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:32:33 +00:00
terminx
3c9f97a58e Allow SFLAG_NOCLIP to apply to projectile movement
git-svn-id: https://svn.eduke32.com/eduke32@5782 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-21 00:32:28 +00:00
hendricks266
e06cabb8aa Remove x86 asm pragmas for readpixel and drawpixel and replace them with their C versions.
This fixes a crash in the editor's 2D mode, reported by Paul B.

git-svn-id: https://svn.eduke32.com/eduke32@5781 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-15 07:08:48 +00:00
hendricks266
3dba49a1e3 Replace uses of the HAVE_DS and HAVE_SDL preprocessor macros with MIXERTYPEWIN and MIXERTYPESDL.
git-svn-id: https://svn.eduke32.com/eduke32@5780 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-15 07:08:45 +00:00
hendricks266
4afd27e16f Delete all SDL_mixer Windows libs from our repo since they're not part of our automated build process, and are not recommended.
git-svn-id: https://svn.eduke32.com/eduke32@5779 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-15 07:08:40 +00:00
hendricks266
8ef2032035 Makefile: Revamp setup of all things SDL.
Highlights:
*Building with msys2 can now take advantage of sdl-config and sdl2-config if present.
*Add a header check to error out if SDL_mixer's major version does not match SDL.
*Building with frameworks on OS X works again.

Notes:
*Those cross compiling, particularly targeting Windows, may need to invoke make with SDLCONFIG='' to avoid bringing in libs and headers from the host.

git-svn-id: https://svn.eduke32.com/eduke32@5778 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-15 07:08:35 +00:00
hendricks266
6e3e490b93 Makefile: Add NULLSTREAM to factor out the NUL part of DONT_PRINT.
git-svn-id: https://svn.eduke32.com/eduke32@5777 1a8010ca-5511-0410-912e-c29ae57300e0
2016-06-15 07:08:31 +00:00