zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-12-14 22:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity
18757 commits 34 branches 63 tags 172 MiB
Commit graph

272 commits

Author SHA1 Message Date
Christoph Oelckers
553bb2af19 - moved 'frags' into player_struct. 
Again for reducing the work with the script interface.
 2020-11-29 14:10:03 +01:00
Christoph Oelckers
7ad0750839 - grouped all of Duke's constant per-session state in a single struct. 
Mainly done so later the script export can be done more easily.
This also renames a few of the affected variables for clarity.
 2020-11-29 13:54:58 +01:00
Christoph Oelckers
a34f5debe8 - route the shared control CCMDs through the game interface instead of registering local variants for each game. 2020-11-29 13:35:09 +01:00
Christoph Oelckers
48b16d5233 - cleanup on player CVAR use. 2020-11-29 13:22:04 +01:00
Christoph Oelckers
b9477f147e - migrated Duke's interpolations to the common system and added handling for texture scrollers. 2020-11-26 18:32:36 +01:00
Christoph Oelckers
d8e331ef0f - changed Duke/RR palette handling to only retrieve the currently active palette right before rendering. 
Storing this in the player_struct is pointless and a relic from having to use real hardware palette switches.
With this now just being a translation index being passed to the backend it can be cheaply retrieved right when used and nowhere else.
Also making some changes to how RRRA's psychedelic cactus handles the projection. This fixes issues with occasionally passing a bad matrix.
 2020-11-05 07:31:48 +01:00
Christoph Oelckers
083454986b - made camsprite an actor variable. 2020-11-04 20:40:26 +01:00
Christoph Oelckers
0eb10f0313 - newowner and related code. 2020-11-04 20:40:25 +01:00
Christoph Oelckers
d0db810ab0 - ud.camerasprite -> actor. 2020-11-04 20:40:08 +01:00
Christoph Oelckers
4add2b5839 - two more 2020-11-04 20:40:07 +01:00
Christoph Oelckers
770897b8b9 - player.i, part 1 2020-11-04 20:39:42 +01:00
Christoph Oelckers
d8a7821b4f - cleaned up a few more loops. 2020-11-04 19:55:17 +01:00
Christoph Oelckers
bc6ae872ae - cleaned up the checkhitswitch interface to receive sprites as pointers. 2020-11-04 19:55:15 +01:00
Christoph Oelckers
635b53f78f - RR-movement + dummyplayersprite 2020-11-04 19:55:13 +01:00
Christoph Oelckers
29b08b2115 - access_spritenum 2020-11-03 22:49:17 +01:00
Christoph Oelckers
de92287d0b - fixed the messed up parameter order of OnEvent. 
This should serve as a textbook example why passing around indices is a very, very bad idea!
 2020-11-03 19:21:42 +01:00
Christoph Oelckers
8fd0fe5955 - changed the spriteq to use pointers instead of indices. 2020-10-24 09:40:10 +02:00
Christoph Oelckers
9cdaaff42b - migrated EGS and deletesprite to new actor interface. 
Inline wrappers for old code exist.
The backupplayer inline was moved into player.cpp because that's the only place it gets used.
 2020-10-21 19:14:41 +02:00
Christoph Oelckers
6f4a0c94e8 - something on player is now a pointer as well 2020-10-21 16:31:18 +02:00
Christoph Oelckers
72329eb01b - wackedbyactor, too. 2020-10-21 16:31:18 +02:00
Christoph Oelckers
e94274a543 - holoduke_on is now a pointer as well. 2020-10-21 16:31:18 +02:00
Christoph Oelckers
d7604a3160 - made on_crane a pointer as well. 2020-10-21 16:31:17 +02:00
Christoph Oelckers
7c88de0b42 - made player.actorsqu a pointer and added the needed infrastructure for that. 2020-10-21 16:31:17 +02:00
Christoph Oelckers
78afb67c7f - setup for Duke actor data transition to something more scripting friendly. 
The main problem here is that there's two data arrays representing an actor - sprite and hittype and the engine only uses indices for reference.
By setting up hittype to contain a sprite reference, the function and iterator interface can be rewritten to use a single pointer instead to represent an actor.
The main objective is to reduce the number of accesses to the global arrays which constitute the biggest refactoring blocker.
 2020-10-21 16:31:17 +02:00
Christoph Oelckers
3d36381752 - converted all stat iterators outside sector*.cpp. 2020-10-15 01:34:28 +02:00
Christoph Oelckers
8e1c71b867 Merge branch 'InputContinuation' 2020-10-11 15:24:51 +02:00
Christoph Oelckers
fc82b3bc8a - Duke: replaced the game type macros with inline functions. 2020-10-11 14:30:42 +02:00
Mitchell Richters
fca846272e - gamecontrol: Initial setup of PlayerAngle struct and deployment within Duke. 
* Struct made up of binangle class units.
* Create signed clone of binangle for use with look_ang and rotscrnang.
* Append currently outgoing function names with `2` at the end to avoid conflict.
 2020-10-07 23:13:29 +11:00
Mitchell Richters
f39939d114 - gamecontrol: Initial setup of PlayerHorizon struct and deployment within Duke. 
* Started with the most complicated game first.
* Struct made up of fixedhoriz class units.
* Append currently outgoing function names with `2` at the end to avoid conflict.
 2020-10-07 17:12:48 +11:00
Mitchell Richters
09a05f354c - Re-standardise horizon around 0 and not 100. 
* Blood had this right. It makes sense that the horizon be based around as it's easier to work with.
* Removed all associated game math to deduct default horizon of 100 when doing weapon zvel etc, meaning actual horizon can just be used.
* Re-did return to center function to work on the already converted pitch. Return speed should be 1:1 with previous code.
 2020-10-07 13:28:45 +11:00
Christoph Oelckers
6488f52055 - fixed: Restarting after dying unset the currently selected skill level. 2020-09-29 18:30:00 +02:00
Christoph Oelckers
9ab29f5975 - reset ud.eog after playing the end of game cutscene. 
If this persists, all following levels will also immediately end the game as well.
 2020-09-27 20:34:48 +02:00
Christoph Oelckers
b93a9b478a - implemented World Tour's developer commentaries. 2020-09-26 17:43:34 +02:00
Mitchell Richters
362fda4378 - Duke: Change fix in 6e9576b871 to be outside of donewgame() in case player is loading a map from the command line. 2020-09-26 09:17:50 +10:00
Mitchell Richters
6e9576b871 - Duke: Fix skill level coming in from main loop. 2020-09-26 08:55:10 +10:00
Mitchell Richters
16cee1148b - Duke: Change a few ps[] to use the p alias available following changes in f4fff5ee30. 2020-09-25 00:09:31 +10:00
Christoph Oelckers
f4fff5ee30 - moved sync structure into the playerstruct for easier maintenance. 2020-09-23 18:18:23 +02:00
Christoph Oelckers
5e6317b8b9 Merge remote-tracking branch 'remotes/Github_private/Blood_InputReworking' 2020-09-22 23:32:28 +02:00
Christoph Oelckers
880b811e0d - rewrote map loader to work independently of data structure sizes. 
This is needed to extend a few fields that are too narrow - e.g. the texture offset fields have no room for interpolating scrolling textures.
Blood not done yet, will also need to be changed to get rid of the limits.
 2020-09-22 22:40:53 +02:00
Mitchell Richters
0ab3b33a6c - Blood/Duke/RR/SW: Unify the player's horizon function. 
* For Duke/SW, we continually apply `SB_CENTERVIEW` only if it was previously a toggled action, similar to Blood.
* For SW, we remove two SW-specific bits (`PF_LOCK_HORIZ` and `PF_LOOKING`) that are no longer needed.
* For Duke, we remove `return_to_center` and just use the `SB_CENTERVIEW` action bit as required.
* For `sethorizon()`, feature set and adjustment speeds are an averaged out accumulation across Duke/SW:
** GameTicRate is factored in for adjustment decisions to provide consistency for SW being the faster game.
** Adjustment amounts are half way between Duke/SW.
 2020-09-20 20:01:36 +10:00
Christoph Oelckers
a4754d7f34 - rewrote the map hack parser using sc_man. 
This unexpectedly turned out a complete rewrite so now it is under my own license.
Also moved the remaining parts of map hack loading into the engine.

Overall I have to say that the feature is not what I expected, it's merely used to fudge the positioning of model sprites and for adding Polymer lights.
 2020-09-13 13:01:44 +02:00
Christoph Oelckers
9ce8202eb1 - Duke: Added a file check for the map to be entered when ending a level. 
World Tour contains a map definition for E5L9 but no map for it.
 2020-09-10 21:39:52 +02:00
Christoph Oelckers
b52a2b0d9a - set up the loadscreen code. 
This isn't active, though, because load times are so short these days that all this results in is an irritating screen flash before the level starts.
It may be activated later when hires assets are in use.

Fixes #10 (or not...? ;) )
 2020-09-09 22:42:01 +02:00
Christoph Oelckers
8d2d36457f - consolidated the map name display on startup 
Fixes #275
 2020-09-08 18:28:41 +02:00
Christoph Oelckers
809f8b5d4b - hooked up the new automap framework. 2020-09-06 12:44:58 +02:00
Christoph Oelckers
8f6f368445 - cleaned out the remaining parts of automap handling in Duke and Exhumed. 2020-09-06 10:42:39 +02:00
Christoph Oelckers
d947cc4765 - also took out the zoom variable so that no automap data remains in the playsim code. 2020-09-06 10:22:05 +02:00
Christoph Oelckers
607d30ef8e - fixed broken end of level timer in Duke. 
Fixes #342
 2020-09-05 17:56:35 +02:00
Christoph Oelckers
fa50cde93f - fixed skill selection in Duke. 
Screw these old shadowing menu variables. Well, the one for skill is gone now.
Fixes #344
 2020-09-05 16:31:01 +02:00
Christoph Oelckers
c1786001b2 - route all game state changes through game actions. 
This is to avoid problems with the main loop not calling Ticker and Render in sync.
 2020-09-05 15:43:34 +02:00
Christoph Oelckers
e5e8c02f1d - WIP level transition refactored to a game independent event system. 2020-09-04 19:43:35 +02:00
Christoph Oelckers
e19923ce4b - removed setGameClockStart. 
This won't be needed anymore.
 2020-09-02 20:57:03 +02:00
Christoph Oelckers
aabbbcb2ff - reset the network timer after lengthy operations. 
This includes loading a level and busy-waiting for a sound to play.
Also block these loops and the sounds they wait for in network games to avoid problems from longer delays here.
The problem seems to be directly inherited from ZDoom which shows the same issue with screen wipes.

Fixes #297
 2020-09-02 10:00:07 +02:00
Christoph Oelckers
ac5abd8aac - removed ready2send variable. 
It's a leftover from the old netcode.
 2020-08-31 20:25:08 +02:00
Christoph Oelckers
03aad6559b - added a global leveltimer variable to Duke. 
This timer only gets incremented by the main game ticker when the playsim is running.

This timer gets used for all playsim-related timing and animations so that these are decoupled from imprecisions in the global timer.
 2020-08-31 00:33:41 +02:00
Christoph Oelckers
d59284c96b - transitioned Duke to the new main loop. 
Everything compiles, but hasn't been tested. Doing a safety commit first.
 2020-08-30 12:02:32 +02:00
Christoph Oelckers
cc04d41903 - Duke: moved the clock reset to a separate function and deleted the unused lockclock variable. 2020-08-30 07:53:20 +02:00
Mitchell Richters
c207437a57 - Duke: Rename cloudtotalclock to cloudclock. 
* Mostly so it doesn't come up on searches for `totalclock`.
 2020-08-26 09:49:32 +10:00
Christoph Oelckers
6b0e1baf02 - added a timerUpdateClock call to the main loop so that Blood and Exhumed work again. 
This may only be removed when nothing uses totalclock anymore. We're not there yet.
 2020-08-25 21:24:45 +02:00
Mitchell Richters
d3b506eb2b - Duke (and Engine): Eliminate use of totalclock for game. 
* Breaks every other game except Duke unless/until they get migrated. Done for the purpose of demonstrating PR #244.

# Conflicts:
#	source/build/src/timer.cpp
#	source/games/duke/src/game.cpp
 2020-08-25 19:51:12 +02:00
Mitchell Richters
2231386830 - Duke: Create function to reset timer and apply in game where timer restarts are needed. 2020-08-25 19:48:15 +02:00
Mitchell Richters
afb09456e0 - Duke: Migrate away from using totalclock and use new game-specific gameclock with underlying timer code in common. 
* Build timer still requires initialisation due to multiple `timerSetCallback()` that still need to work.

# Conflicts:
#	source/core/menu/menu.cpp
#	source/games/duke/src/game.cpp
 2020-08-25 19:47:31 +02:00
Mitchell Richters
b03450f200 - Repair minor Duke3D regression where timerUpdateClock() was no longer called in newgame() once 7bb6b6a1ee removed `handleevents()'. 
Repairs issue when starting new games and the clock isn't right (particularly noticable on E1L1 start).
 2020-08-17 21:53:47 +10:00
Christoph Oelckers
7bb6b6a1ee - do not call handleEvents outside the main loop. 
In other places I_GetEvent should be used to call the system's message pump and keep the app responsive, but all game side processing should be skipped.
 2020-08-16 10:00:13 +02:00
Mitchell Richters
ddd30e742c - ensure player's angle input while playing with cl_syncinput 0 is scaled appropriately when sector's lotag is ST_2_UNDERWATER. 2020-08-05 22:57:47 +10:00
Mitchell Richters
03bccb3a06 - functionalise significant portions of 0ee3ab4df8. 2020-08-05 19:24:42 +10:00
Mitchell Richters
6bd050e201 - fix some interpolation harshness with p->weapon_pos. 2020-08-03 15:06:25 +10:00
Mitchell Richters
7efa905a01 - fix some interpolation harshness with p->kickback_pic. 2020-08-03 15:06:25 +10:00
Mitchell Richters
24b0e4438e - Reset p->oq16horizoff to p->q16horizoff in resetplayerstats(). 2020-07-31 14:23:58 +10:00
Mitchell Richters
ecf8bb699a - Reset p->oq16look_ang to p->q16look_ang in resetplayerstats(). 2020-07-31 14:21:10 +10:00
Mitchell Richters
2260c2353d - re-factor interpolation backups into discrete functions for calling from multiple places. 
Fixes #66.
 2020-07-30 08:24:27 +10:00
Mitchell Richters
f49ded7962 - make cl_syncinput work for Duke. 
* Current setup was broken and unusable.
* Fixed interpolation issues.
* Only call `GetInput()` at frame-rate when `cl_syncinput` is 0.
* Create `oq16look_ang` and interpolate it for enhanced smoothness.
* Always reset `horizAngleAdjust` and `horizSkew` in `processinput_d()`.
* Don't pre-scale `sb_avel` in `processinput_d()` and `processinput_r()`.
* Promote `p->angvel` from short to fixed_t.
* Don't descale `sync[snum].q16horz` in `processinput_d()` and `processinput_r()`.
* Ensure `false` bool is provided to `sethorizon()` call  in `processinput_d()` and `processinput_r()`.
* Reset `p->q16angvel` in `resetplayerstats()`.
 2020-07-28 22:12:09 +10:00
Christoph Oelckers
feffc7c5c2 - fixed: The level number for a secret exit is 1-based, not 0-based as the internal map data. 
Fixes #35.
 2020-07-26 18:13:21 +02:00
Christoph Oelckers
af970b091e - set proper game state after ending the level summary screen. 
Fixes #20.
 2020-07-26 12:43:32 +02:00
Christoph Oelckers
6e276545cd - fixed typo in savegame metadata reader and an issue with code execution order when exiting a level. 2020-07-26 12:15:24 +02:00
Mitchell Richters
f67a53a7c0 - fix sound and music pausing with tweaks to updatePauseStatus(). Also removed unneeded game-side function. Fixes #11. 2020-07-26 17:20:53 +10:00
Christoph Oelckers
c7a9b5678b - reimplemented autoaim mode 2 (hitscan only) 2020-07-26 09:06:08 +02:00
Christoph Oelckers
b9f0e35d4b - fixed the crosshair. 2020-07-24 19:43:33 +02:00
Christoph Oelckers
6227f9f7fd - optimizations for better savegame performance. 2020-07-21 21:32:38 +02:00
Christoph Oelckers
ba7997b611 - implemented most of the savegame code and deleted the old one. 2020-07-20 23:07:44 +02:00
Christoph Oelckers
06fa1391f5 - did some cleanup on the global variables. 2020-07-20 18:43:50 +02:00
Christoph Oelckers
16efa87701 - started sorting variables in globals.h and removed player.h after cleaning it out. 2020-07-20 18:43:50 +02:00
Christoph Oelckers
a40343ae00 - premap.h is also gone because it didn't contain anything relevant anymore. 2020-07-20 18:43:49 +02:00
Christoph Oelckers
31b9995406 - rewrote the ScreenJob player as a class that can be called by an asynchronous dispatcher. 
Works, except for timing issues with ANMs.
 2020-07-20 18:43:48 +02:00
Christoph Oelckers
72bf70811e - restructured exitlevel for asynchronous handling of the summary screen. 2020-07-19 00:53:13 +02:00
Christoph Oelckers
a1001c5fdd - changed startnewgame to handle the screen jobs asynchronously. 2020-07-19 00:26:36 +02:00
Christoph Oelckers
a3e9ea97a8 - merged the two main loops into one. 
Yet to do: Run the screen jobs from the main loop as well.
 2020-07-18 23:50:46 +02:00
Christoph Oelckers
e97e663b49 - more restructuring of asynchronously playing sequences. 2020-07-18 22:38:19 +02:00
Christoph Oelckers
c767ead84f - properly route gameexitfrommenu through the callbacks. 2020-07-18 21:28:57 +02:00
Christoph Oelckers
39a6ab6f0e - input update - safety commit 2020-07-15 23:44:07 +02:00
Christoph Oelckers
a0cd407632 - cleanup on pausing code. 2020-07-15 18:10:31 +02:00
Christoph Oelckers
2fd2ad2212 - sky code cleanup and transitioning of Duke's. 2020-07-15 00:06:19 +02:00
Christoph Oelckers
4598cf13d7 - reverted the frags array to its original form, moved InitRRRASkies to zz_common.cpp and deleted zz_premap.cpp. 2020-07-14 21:42:46 +02:00
Christoph Oelckers
319e2e2745 - minor cleanup 2020-07-07 23:01:34 +02:00
Christoph Oelckers
ecddd8687c - newgame is clean now. 2020-07-07 22:41:31 +02:00
Christoph Oelckers
63eaec916b - fixed a few things. 
Basic level progression is working, special cases still need testing, but for now it's good enough.
 2020-07-07 21:38:20 +02:00
Christoph Oelckers
01fce31f43 - everything compiles again. 
Still needs testing.
 2020-07-07 20:27:21 +02:00
Christoph Oelckers
915b566612 - another safety commit. 2020-07-07 17:56:20 +02:00
Christoph Oelckers
6b86d7606f - safety commit - does not compile! 2020-07-07 13:19:09 +02:00
Christoph Oelckers
642ae03d90 - use player_struct from JFDuke. 2020-07-06 23:05:48 +02:00
Christoph Oelckers
631398a35a - renamed a few things. 2020-07-06 23:04:19 +02:00
Christoph Oelckers
1644c1d33a - cleanup continues. 2020-07-06 23:02:41 +02:00
Christoph Oelckers
2e98b2f8da - quote cleanup. 2020-06-30 22:53:15 +02:00
Christoph Oelckers
6be1a9a9e4 - copyright 2020-06-28 09:03:31 +02:00
Christoph Oelckers
9e08d81a6b - prelevel 2020-06-22 00:27:11 +02:00
Christoph Oelckers
19b6064129 -resetpspritevars 2020-06-22 00:16:22 +02:00
Christoph Oelckers
913253bb0c next... 2020-06-22 00:07:26 +02:00
Christoph Oelckers
42bbc1e6ce resetprestat 2020-06-22 00:07:26 +02:00
Christoph Oelckers
4af227fec6 - resetinventory. 2020-06-22 00:07:25 +02:00
Christoph Oelckers
fe49d0d2d9 - resetinventory. 2020-06-22 00:07:25 +02:00
Christoph Oelckers
16bad04da8 - premap stuff. 
# Conflicts:
#	source/glbackend/glbackend.cpp
 2020-06-22 00:06:51 +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
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
4d89c076f3 - removed old movestandables version. 2020-06-21 22:36:10 +02:00
Christoph Oelckers
2cc4176ed8 - addweapon. 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
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
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
Renamed from source/duke/src/premap.cpp (Browse further)