Commit graph

3942 commits

Author SHA1 Message Date
terminx
7dc1a3c904 Make gamestructures a proper object
git-svn-id: https://svn.eduke32.com/eduke32@8734 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	GNUmakefile
#	platform/Windows/eduke32.vcxproj
#	platform/Windows/eduke32.vcxproj.filters
#	source/duke3d/src/gamedef.cpp
#	source/duke3d/src/gameexec.cpp
#	source/duke3d/src/gamevars.cpp
#	source/duke3d/src/m32def.cpp
#	source/duke3d/src/m32def.h
#	source/duke3d/src/m32exec.cpp
#	source/duke3d/src/m32structures.cpp
2020-03-20 17:37:54 +01:00
terminx
21ec33ac51 Eliminate unnecessary goto
git-svn-id: https://svn.eduke32.com/eduke32@8731 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:35:25 +01:00
terminx
2e17467a8f Fix return type of A_CheckHitSprite()
Since the returned value is a distance, it should be int32_t.

git-svn-id: https://svn.eduke32.com/eduke32@8730 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:35:09 +01:00
terminx
4bdffa4f0f Patch from Nuke.YKT to fix a y-flipped voxel rendering issue in Polymost
git-svn-id: https://svn.eduke32.com/eduke32@8727 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:34:48 +01:00
terminx
a7e1d3f307 Patch from Nuke.YKT to fix a couple of NAM/WW2GI issues
git-svn-id: https://svn.eduke32.com/eduke32@8726 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:34:27 +01:00
terminx
3941fccc4c Patch from Striker to improve sprite interpolation
git-svn-id: https://svn.eduke32.com/eduke32@8724 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:34:19 +01:00
terminx
8c5e3116c9 Make SE_13_EXPLOSIVE call A_GetZLimits() for all statnum 0-2 sprites in sector when triggering
This fixes the fire sprites inside exploding walls not waking up after the wall explodes.

git-svn-id: https://svn.eduke32.com/eduke32@8723 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:33:51 +01:00
terminx
7ed8f5aec4 Fix a bug with swinging doors
This fixes a bug with swinging doors where multiple swinging doors linked together could become out of sync with each other if you block one door from moving and activate the second door again while the first is still blocked.

git-svn-id: https://svn.eduke32.com/eduke32@8721 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:33:25 +01:00
terminx
086141e205 Fix off-by-one error in various CON text truncation warnings
git-svn-id: https://svn.eduke32.com/eduke32@8720 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/duke3d/src/gamedef.cpp
2020-03-20 17:33:15 +01:00
terminx
19630b0d4e Add missing diagnostic information for getactor/setactor
Internally, there are several different permutations of the opcodes that implement CON_GETACTOR and CON_SETACTOR. This maps the internal opcodes back to the external keywords that generated them and makes sure they all have the script line number attached to them for use in diagnostic warning and error messages.

git-svn-id: https://svn.eduke32.com/eduke32@8719 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:32:13 +01:00
terminx
e88535a228 Fix tripbomb laser
git-svn-id: https://svn.eduke32.com/eduke32@8718 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:31:46 +01:00
terminx
8def930980 Replace MERGE_NODES macro with vsmerge() function
git-svn-id: https://svn.eduke32.com/eduke32@8715 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/src/polymost.cpp
2020-03-20 17:31:21 +01:00
terminx
05b59467f5 Merge fix16.cpp and fix16_str.cpp
git-svn-id: https://svn.eduke32.com/eduke32@8709 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	GNUmakefile
#	platform/Windows/build.vcxproj
#	platform/Windows/build.vcxproj.filters
#	source/thirdparty/src/fix16_str.cpp
2020-03-20 17:29:20 +01:00
Mitchell Richters
88502f9962 Manually merge missed aliasing from EDuke32 SVN commit 8555. 2020-03-20 17:04:34 +01:00
Mitchell Richters
8bef451ed9 Manually merge EDuke32 SVN commit 8619. 2020-03-20 17:04:33 +01:00
Mitchell Richters
029b0bbb45 Manually merge EDuke32 SVN commit 8617. 2020-03-20 17:04:33 +01:00
Mitchell Richters
15a362f9ac Manually merge EDuke32 SVN commit 8605. 2020-03-20 17:04:33 +01:00
Mitchell Richters
a5612b1a02 Manually merge EDuke32 SVN commit 8565. 2020-03-20 17:04:33 +01:00
Mitchell Richters
1222a3a56a Manually merge parts of EDuke32 SVN commit 8559. 2020-03-20 17:04:33 +01:00
Mitchell Richters
062850c30a Manually merge parts of EDuke32 SVN commit 8243. 2020-03-20 17:04:32 +01:00
Mitchell Richters
53c9d8425c Manually merge EDuke32 SVN commit 8555. 2020-03-20 17:04:32 +01:00
Mitchell Richters
2124862a9a Manually merge EDuke32 SVN commit 8554. 2020-03-20 17:04:32 +01:00
Mitchell Richters
e964837219 Manually merge EDuke32 SVN commit 8552. 2020-03-20 17:04:32 +01:00
Mitchell Richters
84c518a067 Manually merge EDuke32 SVN commit 8551. 2020-03-20 17:04:31 +01:00
Mitchell Richters
61135e2635 Manually merge EDuke32 SVN commit 8541. 2020-03-20 17:04:31 +01:00
Mitchell Richters
71ada1d674 Manually merge EDuke32 SVN commit 8539. 2020-03-20 17:04:31 +01:00
Mitchell Richters
63edfcf7c7 Manually merge EDuke32 SVN commit 7775. 2020-03-20 17:04:31 +01:00
terminx
cefb1a5551 Fix stupid typo that broke conveyor belts
git-svn-id: https://svn.eduke32.com/eduke32@8620 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:01:12 +01:00
terminx
9630126a6d Improve player input locking logic
This fixes the issue with mouse input and viewscreens.

git-svn-id: https://svn.eduke32.com/eduke32@8619 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:01:12 +01:00
terminx
bcb561014d Fix hilarious bug where holding the strafe modifier and pressing turn left/right moved the player in the wrong direction
git-svn-id: https://svn.eduke32.com/eduke32@8617 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:01:11 +01:00
terminx
ce2c378dcb Emulate previous behavior for player oang/ohoriz/angvel struct members
git-svn-id: https://svn.eduke32.com/eduke32@8605 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:01:11 +01:00
terminx
b48de3ca3c Take CRANE sprites into account before applying mouse input
git-svn-id: https://svn.eduke32.com/eduke32@8565 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:01:11 +01:00
terminx
d04bf2cfb9 Ion Fury compatibility improvements
git-svn-id: https://svn.eduke32.com/eduke32@8559 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:01:11 +01:00
terminx
ae9b6915ce Get rid of the globals used when implementing the framerate based input polling
git-svn-id: https://svn.eduke32.com/eduke32@8555 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:01:11 +01:00
terminx
e94ce88b27 Use the saturating versions of the fix16 functions for player input
git-svn-id: https://svn.eduke32.com/eduke32@8554 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:01:10 +01:00
terminx
659ebf82d8 Improve player view recentering
git-svn-id: https://svn.eduke32.com/eduke32@8552 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:01:10 +01:00
terminx
3b43bba32f Tie player input to the frame rate instead of the game tickrate
This voodoo bullshit entirely eliminates any and all player viewport input latency.

git-svn-id: https://svn.eduke32.com/eduke32@8551 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-20 17:01:10 +01:00
Christoph Oelckers
de2c07aa6a - revert all consolidation efforts between Duke and RR frontends.
Too many problems with different code.
2020-03-18 08:24:31 +01:00
Christoph Oelckers
ef63e47cbf - fixed per-level music in RR. 2020-03-14 18:14:50 +01:00
Christoph Oelckers
c9a69d96b2 - SW: copied fix from SWR to always spawn anime girls for the addons. 2020-03-08 20:53:04 +01:00
Christoph Oelckers
80cc12001f - a bit of cleanup. 2020-03-08 13:54:00 +01:00
Christoph Oelckers
62fa254497 - 0.5.1 2020-03-08 08:05:19 +01:00
ny00123
d98bf9ba62 sw/src/draw.cpp:ResizeView: Make map zooming less dependent
on the frame rate

git-svn-id: https://svn.eduke32.com/eduke32@8700 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/draw.cpp
2020-03-08 08:02:01 +01:00
Christoph Oelckers
93eea97477 - allow selecting frontend for Duke3D in gameinfo.txt 2020-03-07 20:14:03 +01:00
ny00123
68f249873c sw/src/weapon.cpp: Comment out unused MissileSeek and ComboMissileSeek
params, but leave them for documentation. Note that currently, the
only use of ComboMissileSeek is in the saveable_weapon_code array.

git-svn-id: https://svn.eduke32.com/eduke32@8698 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-07 19:49:24 +01:00
ny00123
cf093e9ea6 SW: Comment out function parameters accessed only in commented out code
git-svn-id: https://svn.eduke32.com/eduke32@8697 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-07 19:48:28 +01:00
ny00123
4842f18f1b SW: Mark function parameters as unused in cases we can't easily change
the functions' signatures (often due to being used as callbacks/hooks)

git-svn-id: https://svn.eduke32.com/eduke32@8696 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/jnstub.cpp
#	source/sw/src/menus.cpp
#	source/sw/src/panel.cpp
#	source/sw/src/text.cpp
2020-03-07 19:48:14 +01:00
ny00123
3e8dc4e509 SW: Remove a bunch of unused function parameters
git-svn-id: https://svn.eduke32.com/eduke32@8694 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/brooms.cpp
#	source/sw/src/draw.cpp
#	source/sw/src/game.cpp
#	source/sw/src/inv.cpp
#	source/sw/src/save.cpp
#	source/sw/src/spike.cpp
#	source/sw/src/text.cpp
#	source/sw/src/weapon.cpp
2020-03-07 19:45:38 +01:00
ny00123
f9155048fc sw/src/weapon.cpp: Remove conditional set of unused variable hsp
in InitMineShrap, as well as unused variable sp in TestDontStick

git-svn-id: https://svn.eduke32.com/eduke32@8693 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-07 19:38:46 +01:00
ny00123
9c7553c776 sw/src/weapon.cpp: Insert unused SHRAP structs into #if 0 blocks
git-svn-id: https://svn.eduke32.com/eduke32@8692 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-07 19:38:21 +01:00
Christoph Oelckers
73a4e0d1fe - made Blood's FullMap flag global and removed the hacks to show the full automap.
Also refactor show2dsector into a bit array to get rid of the bit shifting code at play here.
2020-03-07 19:30:18 +01:00
ny00123
14a2560d5f sw/src/player.cpp: Remove unused globals related to mouse status
git-svn-id: https://svn.eduke32.com/eduke32@8690 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-07 19:30:18 +01:00
ny00123
f5df1b5a19 sw/src/player.cpp: A bit more complicated cases of unused vars
git-svn-id: https://svn.eduke32.com/eduke32@8689 1a8010ca-5511-0410-912e-c29ae57300e0
2020-03-07 19:30:18 +01:00
ny00123
ed6e9df07c SW: Handle cases in which the result of an expression
with (possible) side-effects is written to an unused var.

git-svn-id: https://svn.eduke32.com/eduke32@8688 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/console.cpp
#	source/sw/src/jnstub.cpp
#	source/sw/src/save.cpp
#	source/sw/src/sounds.cpp
#	source/sw/src/swconfig.cpp
2020-03-07 19:30:18 +01:00
ny00123
d55871927a SW: Comment out unused vars, which would become
used if previously commented out code was uncommented
(including a few instances of uninitialized var reads).

git-svn-id: https://svn.eduke32.com/eduke32@8686 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/brooms.cpp
#	source/sw/src/cheats.cpp
#	source/sw/src/draw.cpp
#	source/sw/src/game.cpp
#	source/sw/src/jnstub.cpp
#	source/sw/src/menus.cpp
#	source/sw/src/rts.cpp
#	source/sw/src/sector.cpp
#	source/sw/src/setup.cpp
#	source/sw/src/sounds.cpp
#	source/sw/src/weapon.cpp
2020-03-07 19:30:17 +01:00
ny00123
896de8aa1c SW: Remove a ton of unused vars
git-svn-id: https://svn.eduke32.com/eduke32@8685 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/anim.cpp
#	source/sw/src/border.cpp
#	source/sw/src/brooms.cpp
#	source/sw/src/config.cpp
#	source/sw/src/console.cpp
#	source/sw/src/coolie.cpp
#	source/sw/src/draw.cpp
#	source/sw/src/game.cpp
#	source/sw/src/hornet.cpp
#	source/sw/src/jbhlp.cpp
#	source/sw/src/jnstub.cpp
#	source/sw/src/jsector.cpp
#	source/sw/src/menus.cpp
#	source/sw/src/miscactr.cpp
#	source/sw/src/network.cpp
#	source/sw/src/ninja.cpp
#	source/sw/src/player.cpp
#	source/sw/src/save.cpp
#	source/sw/src/serp.cpp
#	source/sw/src/setup.cpp
#	source/sw/src/sounds.cpp
#	source/sw/src/sprite.cpp
#	source/sw/src/swconfig.cpp
#	source/sw/src/weapon.cpp
2020-03-07 19:30:17 +01:00
Christoph Oelckers
5a6096c740 - no Lunatic 2020-03-07 19:30:17 +01:00
alexey.lysiuk
53cda00747 - added detection of Redneck Deer Huntin' installed from Steam 2020-03-07 11:31:46 +02:00
Christoph Oelckers
2c203fbf80 - more consolidation between RR and Duke. 2020-03-06 19:29:13 +01:00
Christoph Oelckers
cb322a1a1b Merge branch 'master' of https://github.com/coelckers/Raze 2020-03-06 17:44:53 +01:00
Christoph Oelckers
6095808503 - consolidation of dynamic sound remapping 2020-03-06 17:23:30 +01:00
Christoph Oelckers
a5c2152530 - consolidated the dynamic tile handling for Duke and RR frontends 2020-03-06 17:12:38 +01:00
alexey.lysiuk
12a655b58f - fixed build with GCC and Clang
source/duke3d/src/gameexec.h:109:35: error: expected primary-expression before ‘)’ token
source/duke3d/src/gameexec.h:115:35: error: expected primary-expression before ‘)’ token
2020-03-06 13:26:32 +02:00
NoOneBlood
aa5b7033de - Condition type update (WIP)
- IncDec type update (can iterate multiple data fields)
- Fix compile warning (?)
2020-03-05 22:11:22 +01:00
Christoph Oelckers
86278fc79c - fixed bad annotation. 2020-03-05 21:14:45 +01:00
Christoph Oelckers
a519861571 - I think this is needed... 2020-03-05 21:14:34 +01:00
Christoph Oelckers
b3c1d5001e - used double frame buffering for VPX playback.
With a single buffer this tends to run into situations where an unrendered texture gets deleted before it is drawn.
2020-03-05 20:56:41 +01:00
Christoph Oelckers
e2fab16fd4 - fixed crashes with VM asserts.
No idea what went wrong here - formatting the string in two stages works fine, though.
2020-03-05 20:28:37 +01:00
Christoph Oelckers
4a76674f4b - deleted a few unused files 2020-03-05 01:20:58 +01:00
Christoph Oelckers
4788dc42fb - cleanup of the screentext consolidation
Since SetIfGreater is only used by the text code, the redundant copies could be removed.
2020-03-05 01:17:31 +01:00
Christoph Oelckers
822079abe0 fixed some compiler warnings listed by XCode 2020-03-05 01:01:05 +01:00
Christoph Oelckers
2c50554c6f - Hmmm... Clang... 2020-03-05 01:01:05 +01:00
Christoph Oelckers
a00bb4cbea - started consolidation of EDuke/RedNukem code by moving the identical parts of actor.h to a shared namespace. 2020-03-05 01:01:05 +01:00
Christoph Oelckers
a203e37aeb - removed buggy diagnostics print. 2020-03-05 01:01:04 +01:00
Christoph Oelckers
f59bfa1224 - consolidation of screentext code 2020-03-05 00:58:38 +01:00
nukeykt
b88eeea9a2 Exhumed: Correctly set player action id for mummified state 2020-03-04 17:57:16 +01:00
nukeykt
2bf65c9108 Exhumed: Use old ksqrt implementation 2020-03-04 17:57:15 +01:00
NoOneBlood
bdca9420f5 - Event redirection support for modern types
- New modern type "Condition" (WIP)
- Fix damage scale for custom dude
- Extend Impact and Vector flags so they can be used with dudes
- Impact condition can be triggered with missiles and explosions
- Updates for Teleport Target type (gModernMap)
- Updates for Effect Gen type
- Updates for Wind Gen type

# Conflicts:
#	source/blood/src/actor.cpp
#	source/blood/src/aiunicult.h
2020-03-02 23:53:33 +01:00
Christoph Oelckers
8eef69b1a6 - compile fixes. 2020-03-02 23:05:07 +01:00
sirlemonhead
df34d8ca85 PCExhumed: Big bunch of AI tidying, code consistency changes and misc fixes. Aiming to get compatibility with new demos from DOS exe.
# Conflicts:
#	source/exhumed/src/anubis.cpp
#	source/exhumed/src/bubbles.cpp
#	source/exhumed/src/bubbles.h
#	source/exhumed/src/bullet.cpp
#	source/exhumed/src/bullet.h
#	source/exhumed/src/fish.cpp
#	source/exhumed/src/fish.h
#	source/exhumed/src/grenade.cpp
#	source/exhumed/src/grenade.h
#	source/exhumed/src/lavadude.cpp
#	source/exhumed/src/lavadude.h
#	source/exhumed/src/lion.cpp
#	source/exhumed/src/lion.h
#	source/exhumed/src/mummy.cpp
#	source/exhumed/src/mummy.h
#	source/exhumed/src/queen.cpp
#	source/exhumed/src/queen.h
#	source/exhumed/src/ra.cpp
#	source/exhumed/src/ra.h
#	source/exhumed/src/rat.cpp
#	source/exhumed/src/rat.h
#	source/exhumed/src/rex.cpp
#	source/exhumed/src/roach.cpp
#	source/exhumed/src/roach.h
#	source/exhumed/src/runlist.cpp
#	source/exhumed/src/scorp.cpp
#	source/exhumed/src/set.cpp
#	source/exhumed/src/set.h
#	source/exhumed/src/snake.cpp
#	source/exhumed/src/snake.h
#	source/exhumed/src/spider.cpp
#	source/exhumed/src/spider.h
#	source/exhumed/src/wasp.cpp
#	source/exhumed/src/wasp.h
2020-03-02 23:01:55 +01:00
Christoph Oelckers
6656547908 - fixed some warnings in Deer Huntin' code 2020-03-02 15:41:30 +01:00
Christoph Oelckers
348325c879 - removed some editor-only code from engine.cpp 2020-03-01 19:12:18 +01:00
Christoph Oelckers
375bf639de - that was stupid. 2020-03-01 18:40:49 +01:00
Christoph Oelckers
951d28f15d - Exhumed movie fix. 2020-03-01 18:32:43 +01:00
Christoph Oelckers
cf662de165 - commented out diagnostic messages. 2020-03-01 17:22:31 +01:00
Christoph Oelckers
edf513a789 - Clang complained again. :( 2020-03-01 16:43:34 +01:00
Christoph Oelckers
f89915ac8f - fixed game start check for Exhumed's ingame menu. 2020-03-01 16:40:19 +01:00
Christoph Oelckers
ee191f0681 - SW: map cheat partially reimplemented. 2020-03-01 16:33:06 +01:00
Christoph Oelckers
12af524dcc - fixed Exhumed's ingame menu.
The bad setup here didn't let the menu's exit action pass to the game code, it still needed ugly workarounds.
2020-03-01 16:32:41 +01:00
Christoph Oelckers
2e8ace603b - fixed SW sound crash. 2020-03-01 13:10:07 +01:00
Christoph Oelckers
f1e2c0c226 - use the proper way to register an empty song on Blood maps without music. 2020-03-01 12:57:23 +01:00
Christoph Oelckers
3596be48bf - Clang did not like this. 2020-03-01 11:33:46 +01:00
Christoph Oelckers
fde633041b - SW: fixed ownership of non-following sounds. 2020-03-01 10:59:53 +01:00
Christoph Oelckers
b06c84ad8c - fix case sensitive path composition. 2020-03-01 10:17:26 +01:00
Christoph Oelckers
809d2fc555 - fixed SW: DoPlayerFall should only stop the scream sound, but nothing else. 2020-03-01 09:59:52 +01:00
Christoph Oelckers
d6b17c0406 - fixed bad vector comparison in SW's sound code. 2020-03-01 09:18:23 +01:00
Christoph Oelckers
cd5ff69c98 - Duke: Do not let the max kill counter underflow.
The entire thing looks broken anyway but this at least prevents the broken values from showing up in the statistics.
2020-03-01 08:35:05 +01:00
Christoph Oelckers
70f684d137 - check both upper and lower case versions of file names on non-Windows platforms when looking for addons. 2020-03-01 07:40:13 +01:00
Christoph Oelckers
83d56f56d5 - fixed uninitialized 'isInitialized' variable in FGameConfigFile. 2020-03-01 07:28:40 +01:00
Christoph Oelckers
61fbbc56c0 - fixed intermittent ambient sounds in SW. 2020-02-29 17:55:31 +01:00