Commit graph

1475 commits

Author SHA1 Message Date
Christoph Oelckers
603afdde87 - weapon draw code tested and old version removed.
# Conflicts:
#	source/games/duke/src/zz_player.cpp
2020-06-22 00:06:27 +02:00
Christoph Oelckers
e827e7a59b - be gone 2020-06-22 00:05:08 +02:00
Christoph Oelckers
e3153f143d hudweapon
# Conflicts:
#	source/build/src/engine.cpp
2020-06-22 00:05:07 +02:00
Christoph Oelckers
4dee181405 - still needed 2020-06-22 00:00:57 +02:00
Christoph Oelckers
df545d34eb haskeys 2020-06-21 23:46:30 +02:00
Christoph Oelckers
7ec3232a3a - removed old process input code. 2020-06-21 23:46:30 +02:00
Christoph Oelckers
a966e34caa - broken palette checks fixed - the new input routine mostly works. 2020-06-21 23:46:29 +02:00
Christoph Oelckers
ed81022d71 - RRRA weapons work again. 2020-06-21 23:46:29 +02:00
Christoph Oelckers
960e656be6 - more gone 2020-06-21 23:46:29 +02:00
Christoph Oelckers
4ecee598af - P_ProcessWeapon transitioned. 2020-06-21 23:46:29 +02:00
Christoph Oelckers
244826cfa0 processinput_r 2020-06-21 23:46:28 +02:00
Christoph Oelckers
fadbe61b9c -processinput_d 2020-06-21 23:46:28 +02:00
Christoph Oelckers
df41875aa6 - weapon code cleaned up 2020-06-21 23:46:28 +02:00
Christoph Oelckers
1c29a44d3e - use access functions to change horizon. 2020-06-21 23:46:28 +02:00
Christoph Oelckers
2085167703 - safety commit, weapon code incompletely ported. 2020-06-21 23:46:27 +02:00
Christoph Oelckers
4acc10b99e 4 more pieces 2020-06-21 23:46:27 +02:00
Christoph Oelckers
c2d9f86832 - safety commit. 2020-06-21 23:46:27 +02:00
Christoph Oelckers
dbc84798c7 - deleted old version 2020-06-21 23:46:27 +02:00
Christoph Oelckers
dbbc5e0790 - doincrements
# Conflicts:
#	source/games/duke/src/zz_sbar.cpp
2020-06-21 23:46:26 +02:00
Christoph Oelckers
cb14555ef6 - world tour weapon code added and redundancy reduction. 2020-06-21 23:46:26 +02:00
Christoph Oelckers
eb6aac4c43 - fixed compile 2020-06-21 23:46:17 +02:00
Christoph Oelckers
d49c5f7e4c - removed RRDH code due to licensing conflicts.
# Conflicts:
#	source/games/duke/src/zz_d_menu.cpp
#	source/games/duke/src/zz_rrdh.cpp
2020-06-21 23:29:33 +02:00
Christoph Oelckers
a39f6062ce - fixed new input code and delete the old one. 2020-06-21 23:28:47 +02:00
Christoph Oelckers
2e15cec17a - safety commit 2020-06-21 23:28:47 +02:00
Christoph Oelckers
985fa2a159 - cheat and chat code from ZDoom.
Not active yet because it does not integrate with the current input code, but at least it's there now.

# Conflicts:
#	source/build/include/baselayer.h
2020-06-21 23:28:45 +02:00
Christoph Oelckers
732905c3d1 - removed the old shoot function and all its subfunctions. 2020-06-21 23:24:49 +02:00
Christoph Oelckers
990cb2acb8 -'shoot' replaced.
# Conflicts:
#	source/build/src/palette.cpp
2020-06-21 23:24:49 +02:00
Christoph Oelckers
f56a8360b0 - spawnglass functions and fta_sounds. 2020-06-21 23:23:21 +02:00
Christoph Oelckers
1c4dcde743 - wall switch check turned into a flag. 2020-06-21 23:23:21 +02:00
Christoph Oelckers
8a0baf3aad - flag setter cleanup.
# Conflicts:
#	source/games/duke/src/zz_game.cpp
2020-06-21 23:23:20 +02:00
Christoph Oelckers
ebb226fdaf - be gone! 2020-06-21 23:21:11 +02:00
Christoph Oelckers
edff48ee37 EGS
.
2020-06-21 23:21:10 +02:00
Christoph Oelckers
d5e066b13f - fixed flipped parameters 2020-06-21 23:21:10 +02:00
Christoph Oelckers
26f3bc1857 - spawn function transitioned. 2020-06-21 23:21:10 +02:00
Christoph Oelckers
cd55c21a5e - removed a large bunch of Polymer code, which unfortunately is license poison. 2020-06-21 23:20:49 +02:00
Christoph Oelckers
95ba82b925 -sound cleanup 2020-06-21 23:17:51 +02:00
Christoph Oelckers
5c48d355f1 - reserved script space must be nulled. 2020-06-21 23:17:51 +02:00
Christoph Oelckers
693b15a556 - use 4 byte entries for the script.
We no longer store pointers in here.
2020-06-21 23:17:51 +02:00
Christoph Oelckers
cb1824ca25 - store script code in a dynamic array.
# Conflicts:
#	source/games/duke/src/zz_game.cpp
2020-06-21 23:17:50 +02:00
Christoph Oelckers
b2290cca3f - fixed compile 2020-06-21 23:17:39 +02:00
Christoph Oelckers
6b2fdf24fd - cleanup after removing EDukes's script code.
# Conflicts:
#	source/games/duke/src/zz_game.cpp
#	source/games/duke/src/zz_gameexec.cpp
2020-06-21 23:07:46 +02:00
Christoph Oelckers
ed6262e0bf - got rid of the old interpreter code. 2020-06-21 23:07:45 +02:00
Christoph Oelckers
b9deaba834 - all commands now get run by the original code. 2020-06-21 23:07:45 +02:00
Christoph Oelckers
1fd0c279d7 - fixed some bugs. 2020-06-21 23:07:45 +02:00
Christoph Oelckers
cba4f0616b - more 2020-06-21 23:07:45 +02:00
Christoph Oelckers
3651ab821e - fall command, also some safety work for npt deleting sprites prematurely. 2020-06-21 23:07:44 +02:00
Christoph Oelckers
1970101076 - MORE 2020-06-21 23:07:44 +02:00
Christoph Oelckers
d4b728dd88 - another block 2020-06-21 23:07:44 +02:00
Christoph Oelckers
89ae407fd5 - a few more. 2020-06-21 23:07:44 +02:00
Christoph Oelckers
ae47264c78 - fix3 2020-06-21 23:07:43 +02:00
Christoph Oelckers
53f1db9b85 - uninitialized local variable 2020-06-21 23:07:43 +02:00
Christoph Oelckers
44b8053404 - inverted logic. 2020-06-21 23:07:43 +02:00
Christoph Oelckers
5c780e5c5f - fixed mixed up tile numbers.
For consistency all shared numbers now use the TILE_ prefix.
2020-06-21 23:07:43 +02:00
Christoph Oelckers
1b135ecb0b - step 1. 2020-06-21 23:07:42 +02:00
Christoph Oelckers
18d6a8e65d - another safety commit.
# Conflicts:
#	source/games/duke/src/zz_actors.cpp
2020-06-21 23:07:42 +02:00
Christoph Oelckers
e1c76e4c26 - safety commit.
# Conflicts:
#	source/games/duke/src/zz_sbar.cpp
2020-06-21 23:07:42 +02:00
Christoph Oelckers
e007b9bceb - safety commit 2020-06-21 23:07:41 +02:00
Christoph Oelckers
15c744f3da - movement code of the VM transitioned 2020-06-21 23:07:41 +02:00
Christoph Oelckers
3c8c7acaf8 - gamevars should be working now, there was a bad case of out of bounds access in the implementation 2020-06-21 23:07:41 +02:00
Christoph Oelckers
d3652f0ed9 - fixed include 2020-06-21 23:07:30 +02:00
Christoph Oelckers
c59928c6ff - removed most of the old and very messy gamevar code.
# Conflicts:
#	source/games/duke/src/zz_gamevars.cpp
2020-06-21 22:59:22 +02:00
Christoph Oelckers
c9bb23ee42 - more gamevar cleanup. 2020-06-21 22:59:10 +02:00
Christoph Oelckers
d01d4bf44c - preparations for gamevar code replacement - thinning out of code that's to be removed 2020-06-21 22:59:09 +02:00
Christoph Oelckers
c28ea5792a - copyright 2020-06-21 22:59:09 +02:00
Christoph Oelckers
e625f94e84 - migrated fully away from EDuke's script compiler
# Conflicts:
#	source/games/duke/src/zz_gamedef.cpp
2020-06-21 22:59:09 +02:00
Christoph Oelckers
6d066d4b7b - cleaned out the old parser.
# Conflicts:
#	source/games/duke/src/zz_gamedef.cpp
2020-06-21 22:56:50 +02:00
Christoph Oelckers
a1a19ab630 - transitioned the gamevar instructions, still with the old backend.
# Conflicts:
#	source/games/duke/src/zz_gamedef.cpp
2020-06-21 22:56:42 +02:00
Christoph Oelckers
05360e14b5 - game startup, include and moving formerly global variables back to global.
# Conflicts:
#	source/games/duke/src/zz_gamedef.cpp
2020-06-21 22:56:36 +02:00
Christoph Oelckers
3a95664b0b - fixing the ifelse check, consolidating the tail code for 'if' instructions. 2020-06-21 22:56:28 +02:00
Christoph Oelckers
2f9d62a40a - the last simple ones. 2020-06-21 22:56:28 +02:00
Christoph Oelckers
422faa99e1 - a lot more commands transitioned
# Conflicts:
#	source/games/duke/src/zz_gamedef.cpp
2020-06-21 22:56:28 +02:00
Christoph Oelckers
79c7748e90 - most 'if's.
# Conflicts:
#	source/games/duke/src/zz_gamedef.cpp
2020-06-21 22:55:30 +02:00
Christoph Oelckers
72514b0a1d - more instructions, 2020-06-21 22:55:24 +02:00
Christoph Oelckers
11255cbf6a - hack for buggy scripts in production code. 2020-06-21 22:55:24 +02:00
Christoph Oelckers
248e0503d8 - safety commit 2020-06-21 22:55:24 +02:00
Christoph Oelckers
56975d3ee2 - progress
# Conflicts:
#	source/games/duke/src/zz_gamedef.cpp
2020-06-21 22:55:23 +02:00
Christoph Oelckers
49e7fa20e8 - #2 2020-06-21 22:55:17 +02:00
Christoph Oelckers
6a6bbbe71a - the first command in the parser is done. 2020-06-21 22:55:17 +02:00
Christoph Oelckers
1cedacb7f4 - removed the hash table for the labels.
Again, the old code doesn't have it and it'd complicate porting over the code.
2020-06-21 22:55:16 +02:00
Christoph Oelckers
4a5953adb4 - some more preparations on the parser code. 2020-06-21 22:55:16 +02:00
Christoph Oelckers
53e4b8bf19 - deactivated the label type checks because the original code doesn't have them and they'd get in the way of testing. 2020-06-21 22:55:16 +02:00
Christoph Oelckers
3ab19a2f0d - hooked up the original CON parser for instruction-by-instruction substitution.
# Conflicts:
#	source/games/duke/src/zz_gamedef.cpp
2020-06-21 22:55:15 +02:00
Christoph Oelckers
358d1a460f - tabification of new sources and replacement of the CON instruction symbols.
# Conflicts:
#	source/games/duke/src/zz_gamedef.cpp
2020-06-21 22:55:09 +02:00
Christoph Oelckers
deef1b5936 - World Tour commentary stubs.
# Conflicts:
#	source/core/gamecontrol.cpp
2020-06-21 22:54:22 +02:00
Christoph Oelckers
0dacfb0049 - fixed compile 2020-06-21 22:53:08 +02:00
Christoph Oelckers
4c47361132 - added null check to findplayer. 2020-06-21 22:40:13 +02:00
Christoph Oelckers
577a800843 - the rest of sector.cpp, except for the input function. 2020-06-21 22:40:12 +02:00
Christoph Oelckers
92f5236b24 - more sector stuff. 2020-06-21 22:40:12 +02:00
Christoph Oelckers
c9a47d2e44 checkhitswitch
intentionally not merged because this is too messy.
2020-06-21 22:40:11 +02:00
Christoph Oelckers
536e3c886c 20% of sector.cpp
# Conflicts:
#	source/games/duke/src/zz_sector.cpp
2020-06-21 22:40:11 +02:00
Christoph Oelckers
c8cb0e4efd - the beginning of sector.cpp
The math backend functions have been moved out of Build because they originally have a good license.

# Conflicts:
#	source/build/src/mdsprite.cpp
#	source/build/src/polymost.cpp
2020-06-21 22:39:05 +02:00
Christoph Oelckers
9c3189475a - renamed unprocessed files and added missing WT firefly effect. 2020-06-21 22:38:05 +02:00
Christoph Oelckers
8cc273955d - moveeffectors, actors.c complete. 2020-06-21 22:38:04 +02:00
Christoph Oelckers
4c99eae4f6 - moveexplosions 2020-06-21 22:38:04 +02:00
Christoph Oelckers
242f78de13 - make moveactors work and RR weapon name cleanup.
# Conflicts:
#	source/games/duke/src/sbar.cpp
2020-06-21 22:38:04 +02:00
Christoph Oelckers
7b75a0683a moveactors plus backing code. 2020-06-21 22:37:29 +02:00
Christoph Oelckers
ca0af4bd7c - fixed compile. 2020-06-21 22:36:11 +02:00
Christoph Oelckers
cfead10cc2 - movetransports. 2020-06-21 22:36:11 +02:00
Christoph Oelckers
d396df057f - deleted old moveweapons function. 2020-06-21 22:36:11 +02:00
Christoph Oelckers
63f45f57d8 - separated Duke and RR implementations because the more complex functions would become too messy otherwise. 2020-06-21 22:36:11 +02:00
Christoph Oelckers
bda3374f9b - reshuffling stuff. 2020-06-21 22:36:10 +02:00
Christoph Oelckers
37b496b971 - moveweapons. 2020-06-21 22:36:10 +02:00
Christoph Oelckers
4d89c076f3 - removed old movestandables version. 2020-06-21 22:36:10 +02:00
Christoph Oelckers
9104fda1a0 - movestandables - old code not removed yet. Plus some World Tour handling. 2020-06-21 22:36:10 +02:00
Christoph Oelckers
8d42055dd7 - moveplayer 2020-06-21 22:36:09 +02:00
Christoph Oelckers
4b235c0771 - ifhitbyweapon and shorter game checks with inline functions. 2020-06-21 22:36:09 +02:00
Christoph Oelckers
89e555761d - guts and moves 2020-06-21 22:36:09 +02:00
Christoph Oelckers
754c8bd9c1 - lotsofstuff 2020-06-21 22:36:09 +02:00
Christoph Oelckers
c11963b41a - movesprite 2020-06-21 22:36:08 +02:00
Christoph Oelckers
68de42075e - delete the old one. 2020-06-21 22:36:08 +02:00
Christoph Oelckers
b29351f3bc - hitradius.
This one was really messy...
2020-06-21 22:36:08 +02:00
Christoph Oelckers
51d4853375 - checkavailweapon 2020-06-21 22:36:08 +02:00
Christoph Oelckers
2cc4176ed8 - addweapon. 2020-06-21 22:36:07 +02:00
Christoph Oelckers
294a7e4c9c - reinstated RR code after seeing that the weapon array can be shared without problems. 2020-06-21 22:36:07 +02:00
Christoph Oelckers
7493956613 - removed the dynamic weapon map indirection. 2020-06-21 22:36:07 +02:00
Christoph Oelckers
cb54a03d60 - wip
# Conflicts:
#	source/games/duke/src/sbar.cpp
2020-06-21 22:36:07 +02:00
Christoph Oelckers
cde100598c - two more functions reverted. 2020-06-21 22:36:06 +02:00
Christoph Oelckers
bb3d14c0c4 - original tile name definitions. 2020-06-21 22:36:06 +02:00
Christoph Oelckers
30cf62d9c2 - renamed all tile variables so that the engine can be reverted to the old constant setup instead of the mostly useless tile remapping feature.
If this is supposed to be made customizable it has to be done very differently.

# Conflicts:
#	source/games/duke/src/game.cpp
#	source/games/duke/src/sbar.cpp
2020-06-21 22:36:06 +02:00
Christoph Oelckers
27c313d74e - moved interpolation code to its own file.
Mainly to get it out of the way. This needs to be redone later in a more serialization-friendly way.
2020-06-21 22:36:05 +02:00
Christoph Oelckers
bd6047a097 - started porting functions - using a simple one as the first case. 2020-06-21 22:36:05 +02:00
Christoph Oelckers
e72869c947 - renamed file to allow getting the right thing into its place. 2020-06-21 22:36:05 +02:00
Christoph Oelckers
0596078978 - prepared folder for merging. 2020-06-21 22:18:12 +02:00
Christoph Oelckers
99958342a9 - prepare the branch for adding new commits
# Conflicts:
#	source/core/gamecontrol.cpp
2020-06-21 20:59:16 +02:00
Christoph Oelckers
b8b38e075d - moving to the right place. 2020-06-21 20:59:08 +02:00