Christoph Oelckers
32ec9ff369
- consolidated crosshair drawing and added ZDoom's crosshair code.
...
For Exhumed this is the default, for the other games it is an option.
Fixes #269 .
2020-09-05 13:57:26 +02:00
Christoph Oelckers
0263d8eed0
- Exhumed: Don't waste health powerup if fully healed.
...
Fixes #309
2020-09-05 12:29:09 +02:00
Christoph Oelckers
04dd939d65
- Exhumed: don't clear all button state when dead.
...
This makes it impossible to respawn.
Fixes #338
2020-09-05 12:14:30 +02:00
Christoph Oelckers
7c5635671e
- Exhumed: When Ramses is talking, hide the status bar.
2020-09-05 12:01:47 +02:00
Christoph Oelckers
adbedd30c4
- consolidated the 4 functions for handling the automap zoom.
2020-09-05 00:58:25 +02:00
Christoph Oelckers
6e6d74f058
- update the sector for the interpolated camera position in Exhumed.
...
Let's hope that fixes #272..
2020-09-05 00:21:10 +02:00
Christoph Oelckers
f72b283519
- fixed alignment of Exhumed's menu captions.
2020-09-04 23:31:41 +02:00
Christoph Oelckers
5a90f35aed
- fixed order of Exhumed cinema texts and their color.
...
Fixes #286
2020-09-04 23:16:21 +02:00
Christoph Oelckers
1eb99f69c2
- transitioned Exhumed to level change events.
2020-09-04 21:59:38 +02:00
Christoph Oelckers
8114309e89
- compat.h cleanup.
...
* use static_assert directly. Raze is C++17, no need for that macro shit.
* removed CONSTEXPR - I seriously fail to see the use here, many of the functions marked as CONSTEXPR cannot possibly even be constant evaluated so the declaration makes no sense. Removed most of these and replaced the valid ones with the official constexpr keyword.
* got rid of EDUKE_PREDICT_FALSE - this makes zero sense in script parsing code, at best it will save a few microseconds. Clean code wins.
* replaced Blrintf with xs_CRoundToInt. Shitty name is shitty name, even if derived from POSIX.
* replaced Bstr*casecmp with str*icmp. As these get defined in the CMake project based on actual compiler checks they are preferable here.
* removed lots of other stuff that is not needed with a minimum compiler requirement of C++17.
2020-09-04 21:24:48 +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
8f0a885f63
- route 'give' through the network for all games.
2020-09-03 17:39:41 +02:00
Christoph Oelckers
fb334e7f1a
- transitioned Blood's give command and changed SW's not to call the cheat handler.
2020-09-03 16:31:31 +02:00
Christoph Oelckers
3e5e956b72
- run most cheats through the network.
...
The remaining excpetions are the "give" CCMD and any level change action.
Unfortunately the implementation of most cheats is not multiplayer safe so right now it'd only be useful for demo recording (assuming that worked to begin with... ;))
2020-09-03 01:32:51 +02:00
Christoph Oelckers
a0874a26a7
- noclip cheat and splitting of Exhumed's cheat code into its own file.
2020-09-03 00:41:32 +02:00
Christoph Oelckers
66bf8113b8
- implemented the 'god' cheat as a network command.
...
This was mainly chosen as something simple to get the basics set up.
2020-09-03 00:29:17 +02:00
Christoph Oelckers
b3d89a6a0b
- removed the old main loop.
2020-09-02 23:03:48 +02:00
Christoph Oelckers
b49e050baf
- transitioned Exhumed to the new main loop.
...
Fixed #301
2020-09-02 22:55:57 +02:00
Christoph Oelckers
b1a3080671
- migrated Exhumed to a local ticker as well.
...
gameclock is history - all games now run on a timer that increments once per tick under their own control and not independently of the ticker routine.
2020-09-02 21:42:12 +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
e5612b82c7
- fixed: The tile manager created its backup arrays before loading .def files.
...
This could let such textures disappear with the new main loop.
2020-09-02 00:36:49 +02:00
Mitchell Richters
1354d52c05
- Major cleanup of Q16.16 utilisation within games and engine.
...
* Remove fix16.h/cpp and utilise library from m_fixed.h.
* Extend m_fixed.h with two inline functions for int to/from float operations.
* Replace fix16_floor operations with those from xs_Float.h
* Replace multiple Q16.16 conversions from 0 to just be 0.
* Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h
* Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion.
* Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly.
* Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 23:00:47 +10:00
Christoph Oelckers
d40e53eb53
- more Exhumed pitch change fixes.
2020-08-31 21:48:17 +02:00
Christoph Oelckers
6b1fa22aed
- fixed view centering in Exhumed.
...
Switched to GDX's code because the one present here looked quite weird.
This still does not feature interpolation.
Fixes #296
2020-08-31 21:41:39 +02:00
Christoph Oelckers
3204a3e5fc
- negated the meaning of SB_AIMMODE.
...
This is because 'classic' aim mode will reset the view if the mouseaim key is not pressed.
The problem with this is that an empty input packet will trigger a view reset. If the meaning is inverted the default aim mode is free mouse view which doesn't try to alter any view state and is therefore preferable for an empty packet.
Fixes #292
2020-08-31 20:51:22 +02:00
Christoph Oelckers
54d65bfcfc
- fixed some warnings
2020-08-31 19:28:05 +02:00
Christoph Oelckers
2f05a93547
Merge branch 'Packet' into back_to_basics2
...
# Conflicts:
# source/core/gamestruct.h
# source/games/duke/src/gameloop.cpp
# source/games/duke/src/player_d.cpp
2020-08-31 00:09:56 +02:00
Christoph Oelckers
b8258da997
- cleaning out some trash from compat.h.
...
The header from hell...
2020-08-30 23:34:40 +02:00
Christoph Oelckers
ba8dc788fe
- hotfixing some Exhumed map transition issues.
...
This avoids crashing on LEV20, but the whole thing is simply too poorly implemented to actually work - this needs to be redone so that the map transition does not occur in the middle of the game ticker.
2020-08-30 21:45:21 +02:00
Christoph Oelckers
511cb51e7f
- these 2 variables no longer exist.
2020-08-30 21:20:05 +02:00
Christoph Oelckers
26f6bac060
- Exhumed: save the status variables to savegames again.
...
Since this status bar depends on explicit updates, this data needs to be restored after loading, and just saving it out is the easiest way to ensure that.
Fixes #274
Fixes #276
2020-08-30 21:16:37 +02:00
Christoph Oelckers
a9bf1ab4bc
- Exhumed: Renamed changelevel CCMD to Levelwarp for consistency.
...
Fixes #278
2020-08-30 21:07:00 +02:00
Mitchell Richters
e32cd81cc7
- Unify stat fps
for all games.
2020-08-30 20:24:36 +02:00
Christoph Oelckers
747dac6c41
- Exhumed: Mark unused function arguments in standard C++ fashion.
2020-08-30 20:24:36 +02:00
Christoph Oelckers
ffe5b114f3
- the engine starts on the new main loop and is capable of running the intros and the menu, but not the game yet.
2020-08-30 12:49:21 +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
d49aedacea
- continued work on main loop - added a few new entry points to the game interface.
2020-08-30 00:55:49 +02:00
Christoph Oelckers
56d0647412
- migrated the last 3 remaining UI controls to CCMDs.
2020-08-29 17:49:15 +02:00
Christoph Oelckers
694444b62a
- converted the remaining input bits.
...
Looks like it is working in all games except Blood (not that it surprises me that it's Blood again which has issues...)
2020-08-29 13:32:55 +02:00
Christoph Oelckers
3a9bcb0b64
- moved Exhumed's cheat bits back into the game module.
...
They are no longer part of the packet interface.
2020-08-29 02:17:28 +02:00
Christoph Oelckers
dc1f56e8f9
Merge remote-tracking branch 'remotes/Github_private/back_to_basics2' into Packet
...
# Conflicts:
# source/core/inputstate.cpp
# source/exhumed/src/exhumed.h
2020-08-29 01:19:48 +02:00
Christoph Oelckers
fe7f3a2f9e
- handle the run key.
2020-08-29 00:57:07 +02:00
Christoph Oelckers
b9e0f493b2
- transitioned the 5 primary action keys: Open, Jump, Crouch and Fire/AltFire.
2020-08-28 23:25:08 +02:00
Christoph Oelckers
847fa48724
- cleaned out the remaining parts of baselayer.h
...
In particular this means to remove the option to disable widescreen aspect ratios. The way this was handled makes no sense with the current render backend.
The aspect ratio code will have to be redone entirely to properly obey the backend's settings.
2020-08-28 09:06:49 +02:00
Christoph Oelckers
536e7455f2
- moved I_StartFrame to the top of the loop and cleaned up baselayer.hj
2020-08-28 08:44:44 +02:00
Christoph Oelckers
d62d2eaec7
- processed all remaining local input CCMDs and removed some bits only needed for multiplayer.
...
These MP bits should be reimplemented as network commands later, they only take up valuable space in the bit field.
2020-08-28 00:03:35 +02:00
Christoph Oelckers
ee7d558282
- removed the remains of sending pause with the input packets.
...
None of this was really working anymore, but will have to be rethought once a network stream exists again.
But even then, this is better sent as a separate command, and in MP only.
2020-08-27 22:38:52 +02:00
Christoph Oelckers
447573aa36
- consolidation of invprev, invnext and invuse.
2020-08-27 22:19:24 +02:00
Christoph Oelckers
43de0d8312
- consolidation of inventory item activation through hotkeys.
...
This also adds hotkeys for Exhumed which never implemented them.
2020-08-27 21:25:09 +02:00
Christoph Oelckers
10df3e094a
- rework of weapon input to use common features in shared code.
...
This also adds stubs for all unimplemented features in the games for easier addition.
2020-08-27 00:53:35 +02:00
Christoph Oelckers
f597f7c265
- made the GameFunc constants global again.
...
With most of the more specific features being migrated to CCMDs the list is relatively clean now, with merely 2 buttons that are game specific.
2020-08-27 00:25:59 +02:00
Christoph Oelckers
4b299fa412
- Exhumed also handled.
2020-08-27 00:58:21 +02:00
Christoph Oelckers
78a024a50c
- fixed: Exhumed's sound module did not check the 'sound disabled' CVAR.
2020-08-26 22:26:28 +02:00
Christoph Oelckers
b4df1fd662
- fixed Ramses text display.
...
Fixes #265 .
2020-08-26 22:22:46 +02:00
Christoph Oelckers
1a25504d02
- looks like the nAngle field in the PLayerInput struct isn't used for anything anymore.
2020-08-26 21:32:18 +02:00
Christoph Oelckers
83c8770d02
- fixed Ramsed head display and not freezing the input when it is active.
2020-08-26 21:28:57 +02:00
Christoph Oelckers
096a2bd4e9
- fixed some of the sound issues in Exhumed
...
* ambient sounds were constantly restarted resulting in garbled sound.
* sound priorities were not checked. This was used to limit some sounds to one instance per actor or to allow terminating other sounds playing on the same actor.
2020-08-26 20:22:11 +02:00
Christoph Oelckers
e5a4276a5a
- fixed infinite loop.
2020-08-26 20:20:36 +02:00
Christoph Oelckers
4e846f8d66
- do not print game init messages to the notify display.
2020-08-26 20:19:54 +02:00
Mitchell Richters
e3fe1b2b60
- Exhumed: Correctly transform player velocities when running on single 30Hz timer.
...
Thanks, Graf :)
# Conflicts:
# source/exhumed/src/exhumed.cpp
2020-08-26 17:27:15 +02:00
Mitchell Richters
0c300c181f
- Exhumed: Unify game with single timer instead of getting forward/side velocity at 120Hz.
...
* Player movement is close, but not exactly as it was. Requires more work if it is to be considered.
# Conflicts:
# source/exhumed/src/exhumed.cpp
# source/exhumed/src/ps_input.h
2020-08-26 17:26:42 +02:00
Christoph Oelckers
abf715eace
- unified the packet structures of all games.
...
Currently the bit fields are still separate and they have to be merged, but for now the added memory does not matter.
Having this structure in the common parts will allow work on consolidating the input code, though.
2020-08-26 17:12:48 +02:00
Christoph Oelckers
2ae5f960c5
- renamed fields in Exhumed's packed struct.
...
One step closer to getting these merged.
2020-08-26 17:09:47 +02:00
Christoph Oelckers
5a77aace2f
- strip the structure for local input off the fields not needed here.
...
Now it's basically the same as Dukes.
2020-08-26 16:59:42 +02:00
Christoph Oelckers
c1b1182f90
- fix weapon selection in Exhumed.
...
Like Blood it looks like the request isn't processed immediately so it needs to stick around.
2020-08-26 16:59:42 +02:00
Christoph Oelckers
b76168f673
- moved the main event processing functions into the global main loop.
...
Now, with all the Build timer stuff removed these calls were all identical between games.
2020-08-26 16:59:41 +02:00
Mitchell Richters
60f334f57c
- Exhumed: Partially restore sound issues following cc5e6d19c3
.
...
* Restored call of `UpdateSounds()` to `GameLoop()` and not `DrawView()` like previously.
Partially addresses #253 .
2020-08-26 23:22:44 +10:00
Christoph Oelckers
cc5e6d19c3
- fixed sound updating by moving the engine's UpdateSound call into the main loop.
...
This needs to be called unconditionally for every frame being rendered, not all of the game modules did that.
Placing this call here ensures that it is independent of anything the games do.
2020-08-26 04:10:16 +02:00
Christoph Oelckers
de871c9ab9
- use the game timer, not the Build timer for the sound eviction delay.
...
This is supposed to wait for two game frames to be on the safe side.
2020-08-26 03:50:07 +02:00
Mitchell Richters
e0aaaf1f60
- All Games: Move gameclock
and lastTic
to gamecontrol.
2020-08-26 09:49:44 +10:00
Mitchell Richters
2bf11ad378
- All Games: Remove use of timerGetTicks()
.
2020-08-26 09:49:38 +10:00
Mitchell Richters
aba5c4c134
- All Games: Remove use of timerGetHiTicks()
.
2020-08-26 09:49:36 +10:00
Mitchell Richters
b883204f6a
- All Games: Remove remaining use of totalclock
and associated timing code.
2020-08-26 09:49:34 +10:00
Mitchell Richters
39541408f2
- Exhumed: Fix what I believe is a typo.
2020-08-26 09:49:02 +10:00
Mitchell Richters
2748d6dc64
- Exhumed: Rename remaining use of totalclock
locally in screenjobs to currentclock
like Duke.
2020-08-26 09:48:59 +10:00
Mitchell Richters
a6cc3c4128
- Exhumed: Migrate to GZDoom time code like Duke and SW.
2020-08-26 09:48:57 +10:00
Mitchell Richters
76b05dbcd6
- Build (and games): Remove totalclocklock
.
2020-08-26 09:48:56 +10:00
Christoph Oelckers
d38a3a1fb1
- added autoaim switch for Exhumed.
...
Pointers for the needed change taken from GDX.
This applies only to hitscan weapons the rest do not appear to autoaim.
Fixes #260
2020-08-26 00:22:11 +02:00
Christoph Oelckers
5af71c0af2
- Exhumed: Implement "Quit to title".
...
Fixes #252
2020-08-25 21:34:12 +02:00
Christoph Oelckers
efc83e1a5f
- Exhumed: properly terminate the "Ramses" save block.
...
Fixes #258
2020-08-25 21:30:00 +02:00
Christoph Oelckers
5df0a7241f
- disabled a few menu options for unsupported features in Exhumed.
...
Fixes #255
2020-08-25 20:40:30 +02:00
Christoph Oelckers
435e13dfa4
cleanup of the timer interface.
...
* rewrote all uses of timerSetCallback. Most were unnecessary or long obsolete, the sound updates need to run per frame, not per tic and the UI tickers need to be handled in the main loop anyway.
* Use a more precise timer to animate the menu transition.
* uncouple other menu animations from the game timer.
2020-08-25 19:42:11 +02:00
Christoph Oelckers
1a633ce6a6
- give Exhumed some automap labels as well.
...
This game didn't have them originally so here the 'native' mode does not exist.
2020-08-25 00:27:14 +02:00
Christoph Oelckers
76811a1881
- InputState cleanup
...
This removes most of the InputState class because it is no longer used.
The only remaining places still checking scan codes are the modifiers for sizeup and sizedown.
All the rest was remapped to safer methods. The multiplayer taunts are currently inoperable, they will need support of shift-bindings to get proper support.
2020-08-24 20:34:18 +02:00
Christoph Oelckers
c09a5150a9
- added some predefined fullscreen modes
...
This is to cut down on boilerplate code because these encode the virtual screen size in the mode parameter, making it unnecessary to specify a virtual size separately.
2020-08-24 20:25:53 +02:00
Christoph Oelckers
f1a988b221
- make use of map bindings
...
All automap controls have been moved there, and sizeup/sizedown have been made CCMDs, taking screen size management entirely out of the game modules
2020-08-24 20:20:15 +02:00
Christoph Oelckers
e158775e67
- … and for Exhumed
...
This game does not implement follow mode.
Note: Follow mode needs to be simplified across games!
2020-08-24 19:54:26 +02:00
Christoph Oelckers
7859a29e95
- use global variables to track automap state
...
So far implemented in Duke/RR.
2020-08-24 19:31:43 +02:00
Mitchell Richters
89a15335df
- Exhumed: Clear the screen in the 2D drawer prior to drawing in menu_DoPlasma()
.
...
Fixes #237 .
2020-08-24 17:44:39 +10:00
Mitchell Richters
e8057cd871
- Exhumed: Fix menu scaling upon opening following changes in 979cc63835
.
...
Fixes #238 .
2020-08-24 17:11:51 +10:00
Mitchell Richters
6cbd607f31
- Exhumed: Stop playing kSoundJonLaugh2
in DLobotomyScreen
screenjob if skiprequest
is true.
2020-08-24 16:51:38 +10:00
Mitchell Richters
b5823385e1
- Exhumed: Fix if statement in DrawWeapons()
following changes in e225e85ae1
.
2020-08-24 16:02:12 +10:00
Mitchell Richters
e225e85ae1
- Exhumed: Perform weapon bobbing with maximum precision and implement cl_weaponsway
.
2020-08-24 13:22:52 +10:00
Christoph Oelckers
fed70e6df7
- make Exhumed's intro block the UI.
...
Fixes #235 .
2020-08-24 00:36:47 +02:00
Christoph Oelckers
8b8f048393
- moved parts of videoNextPage to app_loop.
2020-08-23 18:08:08 +02:00
Christoph Oelckers
adb98a47ba
- restructured the main loop code so that the actual loop is in the common code.
2020-08-23 17:47:05 +02:00
Christoph Oelckers
85875da77a
- removed the old start-of-level-only savegame code.
...
This serves no purpose anymore, even with a checkpoint-based gameplay the full saves will do just as well.
2020-08-23 16:30:20 +02:00
Christoph Oelckers
f7fcd341ec
- removed redundant levelnum variable.
...
Better use the global map record.
2020-08-23 16:24:54 +02:00
Christoph Oelckers
1a0e413d5c
- use CCMDs for Exhumed's input where applicable.
...
- made crosshair toggle consistent across games.
2020-08-23 16:11:18 +02:00
Christoph Oelckers
a4a26ef6bc
- removed the last uses of the original rotatesprite function.
2020-08-23 14:55:19 +02:00
Christoph Oelckers
2a3f7a48c9
- implemented a proper kill counter.
...
Unfortunately the display is a bit limited by the available font characters.
2020-08-23 14:39:14 +02:00
Christoph Oelckers
e75cfd82f9
- the training map could not be started.
2020-08-23 14:00:53 +02:00
Christoph Oelckers
979cc63835
- use DrawTexture for rendering the menu items.
2020-08-23 13:57:56 +02:00
Christoph Oelckers
4d477bc15b
- fixed uninitialized GameAction variable.
2020-08-23 13:57:31 +02:00
Christoph Oelckers
212b3ae0f9
- Exhumed: fixed map startuo
2020-08-23 12:59:01 +02:00
Christoph Oelckers
5c7b613aa7
- reworked the main loop.
2020-08-23 12:26:52 +02:00
Christoph Oelckers
7889605ff4
- condensed main loop further, started laying out the new one.
2020-08-23 09:11:32 +02:00
Christoph Oelckers
9e5ca8c408
- moved game and level init code out of app_main.
2020-08-23 08:22:59 +02:00
Christoph Oelckers
5ba384db35
- moved the main game ticker out of app_main.
2020-08-23 07:49:58 +02:00
Christoph Oelckers
3a3ba43985
- Exhumed: moved the input code out of the main loop
2020-08-23 07:41:29 +02:00
Christoph Oelckers
fccd054381
- split off the entire game loop related code into its own file.
...
This should make it easier to work on this.
2020-08-22 22:40:22 +02:00
Christoph Oelckers
7401c0e133
- moved Ramses head code into its own file.
2020-08-22 21:39:14 +02:00
Christoph Oelckers
8589d43835
- migrated Exhumed's cheats to the global system.
...
This also eliminates the last pieces using that global string list. All relevant text is now in the external string table.
2020-08-22 21:13:11 +02:00
Christoph Oelckers
6d852c33dd
- added CCMDs for all 'holly' cheats that didn't have an equivalent yet.
2020-08-22 20:34:58 +02:00
Christoph Oelckers
6b1d6a44d7
- exported the item pickup messages to the string table and use the global 'nomonsters' flag.
2020-08-22 20:14:00 +02:00
Christoph Oelckers
bddd196539
- ported the credits screen.
2020-08-22 19:50:04 +02:00
Christoph Oelckers
d94077f833
- exported cinema texts to the string table as well.
2020-08-22 18:30:48 +02:00
Christoph Oelckers
0843f5f04a
- ported the final level's text screen and exported its text to the string table.
2020-08-22 18:12:19 +02:00
Christoph Oelckers
6f039164a3
- set up the computer font as SmallFont2.
...
Unlike the sheet font, this one is needed.
2020-08-22 16:24:42 +02:00
Christoph Oelckers
7e7f9670c1
- transitioned the text intermission screen to use DScreenJob and interpolate the scrolling text display.
2020-08-22 11:56:54 +02:00
Christoph Oelckers
8e34288a1c
- moved the end level handler further out in the main loop.
2020-08-22 10:39:37 +02:00
Christoph Oelckers
8b3e3b6d4a
- cleaned out some waiting code.
...
There's still too many loops but this at least gets rid of the empty ones.
2020-08-22 10:17:24 +02:00
Christoph Oelckers
c74a1f03e3
- defer FinishLevel handling to the main loop instead of doing it deep inside the game logic code.
2020-08-22 10:03:21 +02:00
Christoph Oelckers
9f682083c8
- same procedure as last time.
2020-08-22 09:41:18 +02:00
sirlemonhead
80dd794550
PCExhumed: Handle integer overflow in PlotCourseToSprite()
2020-08-22 09:40:35 +02:00
Christoph Oelckers
2a1ef00542
- redirect messages from last commit to debug mode.
2020-08-22 09:39:49 +02:00
sirlemonhead
b1c9ec1f47
PCExhumed: Handle the rest of the possible overflows for ksqrt()
2020-08-22 09:38:11 +02:00
sirlemonhead
fc530a362d
PCExhumed: Fix Selkis boss AI stupid typo
2020-08-22 09:34:09 +02:00
Christoph Oelckers
b96f12aa34
- removed Exhumed's demo loop.
...
It was broken already anyway and also looks like a first grade refactoring blocker.
2020-08-22 09:31:17 +02:00
Christoph Oelckers
e1fd0d8d80
- replaced most of the old text and graphics display functionality in Exhumed.
2020-08-21 22:40:09 +02:00
Christoph Oelckers
ca943317e7
- ported Exhumed's map to the ScreenJob interface.
2020-08-21 22:30:51 +02:00
Christoph Oelckers
a4d0e47389
- Exhumed: Play sound on Lobotomy logo
...
Fixes #224 .
2020-08-21 19:40:18 +02:00
Mitchell Richters
3067bad9b9
- Blood/Duke/Exhumed/SW: Fix map
CCMD so the game doesn't return to the menu if incorrect map specified (or crash in the case of Exhumed).
2020-08-21 15:11:02 +10:00
Christoph Oelckers
2713c2d3c3
- deleted unused printext function.
2020-08-21 00:54:57 +02:00
Christoph Oelckers
33dcb413d8
- final cleanup on Exhumed's intro sequence.
2020-08-21 00:49:07 +02:00
Christoph Oelckers
80055b97e8
- fixed the title screen
2020-08-21 00:30:46 +02:00
Christoph Oelckers
98c064dcbc
- fixed the missing plasma effect in Exhumed's title screen.
2020-08-21 00:13:05 +02:00
Christoph Oelckers
6947b9cf98
- title screen WIP
2020-08-20 23:45:52 +02:00
Christoph Oelckers
31e792223a
- converted Exhumed intro to use the ScreenJob framework.
2020-08-20 21:05:14 +02:00
Christoph Oelckers
4267b7d5fc
- put the movie player in a class so that it can be allocated on the stack.
2020-08-20 18:35:52 +02:00
Christoph Oelckers
966cf5e262
- fixed the sound in Exhumed's intro movie.
...
Taking a cue from GDX to properly synchronize it because PCExhumed's approach looked broken by design.
It had no frame rate sync and solely depended on the low level audio stream for it.
2020-08-20 17:52:56 +02:00
Christoph Oelckers
3a5c0b30bb
- statusbar fixup.
2020-08-20 17:04:21 +02:00
Christoph Oelckers
78bfbdb253
- Exhumed status bar work.
...
Unfortunately this is a bit limited due to how the data was designed.
2020-08-20 17:04:21 +02:00
Christoph Oelckers
f888df9f5b
- fixed screen resize actions to work outside the automap.
2020-08-19 20:38:36 +02:00
Christoph Oelckers
d645674c1c
- consolidated the DEF parser parts in the backend.
...
Only Blood had some special handling - better implement callbacks here instead of requiring a second parsing pass.
2020-08-19 20:29:37 +02:00
Christoph Oelckers
aa5f42e5f4
- more header consolidation and cleanup.
...
In particular, this removes the pointless kTrue and kFalse constants.
2020-08-18 18:56:56 +02:00
Christoph Oelckers
4ea93ebccc
Exhumed code cleanup
...
merging all AI headers and removing several unused files
2020-08-18 18:56:39 +02:00
Christoph Oelckers
ef78e8602a
- major cleanup and consolidation of the screen/hud resizing code.
...
This is now being handled by the backend, except for the processing of the key bindings which cannot be done yet.
2020-08-16 02:55:50 +02:00
Christoph Oelckers
3455610031
- base palette cleanup.
...
Avoid passing this anywhere in the client code. It should only be set right before rendering the 3D view and the only code using the base palette should be the 3D renderer and hud_drawsprite.
Also make the palette override CVARs 3D view only in debug mode.
2020-08-14 21:18:14 +02:00
Mitchell Richters
157933e902
- fixed regression from b9eef9c6a3
where the angle wouldn't apply if horizon was specified.
2020-08-04 23:13:22 +10:00
Mitchell Richters
b9eef9c6a3
- make ang and horiz optional on each game's warptocoords
CCMD as suggested in commentary for 1dc6edfa56
.
2020-08-04 22:33:17 +10:00
Mitchell Richters
3e44d850b3
- fix issues with Exhumed and SW warptocoords
CCMDs when cherry-picking from public branch.
2020-08-04 18:04:44 +10:00
Mitchell Richters
af830518a6
- create Exhumed dynamic CCMD warptocoords
.
2020-08-04 17:53:37 +10:00
Christoph Oelckers
218a9c84fd
- removed the last remaining Blood helpers from the file system, also deleted a few short files whose contents could be moved.
2020-07-27 19:38:41 +02:00
Christoph Oelckers
f9d48e1f68
- removed all the intermediate variables for the status bar size.
...
hud_size now gets used directly by the status bar code.
2020-07-25 13:26:56 +02:00
Christoph Oelckers
be9094cb97
Silenced lots of warnings pointed out by XCode.
2020-07-23 17:02:59 +02:00
Christoph Oelckers
6227f9f7fd
- optimizations for better savegame performance.
2020-07-21 21:32:38 +02:00
Christoph Oelckers
55feadd11c
- render the weapons with the DrawTexture interface and properly handle rotatesprite's alignment modes
2020-07-16 13:23:26 +02:00
Christoph Oelckers
a0cd407632
- cleanup on pausing code.
2020-07-15 18:10:31 +02:00
Christoph Oelckers
99161e2e4a
- made ps an array of player_struct like it originally was.
2020-07-15 00:26:58 +02:00
Christoph Oelckers
2fd2ad2212
- sky code cleanup and transitioning of Duke's.
2020-07-15 00:06:19 +02:00
Christoph Oelckers
5655015691
- YAX is also gone now.
2020-07-14 16:06:14 +02:00
Christoph Oelckers
1a0b388570
- removed a few tabledivide uses in the game modules
2020-07-14 14:08:59 +02:00
Christoph Oelckers
aa01adb2f1
- removed osd.h as it was merely a minimal wrapper around c_dispatch, giving some alias names.
...
Nothing that's needed when cutting ties to upstream.
2020-07-14 14:00:27 +02:00
Christoph Oelckers
2e05ff532b
- got rid of the struct trackers.
...
They were only used for handling an undefined case in the renderer but the overhead and side effects were too severe.
2020-07-14 13:51:03 +02:00
Christoph Oelckers
34874d1a21
- migrated displayrest and took the opportunity to un-fuck the palette management.
2020-07-07 04:54:12 +02:00
Christoph Oelckers
8a1206edbc
Merge remote-tracking branch 'remotes/origin/master' into back_to_basics2
2020-07-05 11:55:41 +02:00
Mitchell Richters
c70cc474a0
- change mouse input from int to float and adjust games accordingly.
...
* Calculate game-side mousex/mousey divisions into the calculations performed in `InputState::GetMouseDelta()`.
* Fix mouse speed when `in_mousesmoothing` is true (wasn't factoring in / 3.f division used in non-true vector.
* Standard mouse forward/side movement speeds in Exhumed & SW with that of other games.
* Remove `strafeyaw` code from Duke/Exhumed/RR as it's not necessary and was leading to situations where the player would continually keep moving sideways even without input.
* Change mouse forward/side velocities to -= current value as is done with controller input and the player's angle/aim velocities.
2020-07-04 18:28:00 +02:00
Christoph Oelckers
43f899f2ce
- Do not start multiple instances of the same sound on the same source in Exhumed.
...
From the looks of it the engine calls the sound function repeatedly while the sound plays to perform distance checks.
With the OpenAL backend these checks are totally unnecessary and shouldn't do anything.
2020-06-24 22:02:23 +02:00
Mitchell Richters
8c723f52d1
- make controller input identical across all games.
...
* Convert axes in ControlInfo struct from int32_t to float as what's received from the backend.
* Remove all the scale up/down math since we don't need that with floats and replace with float constants that match old behaviour.
* Store q16mlook scaling as a constant for use with mouse and upcoming controller code.
* Add required controller code to Blood as the only game not to have working controllers.
* Fix typos in (gInput.forward > input.forward) for `ctrlGetInput()` in Blood.
* Remove use of `scaleAdjustmentToInterval()` on Exhumed and Shadow Warrior as they only process forward/side velocities within the game's ticrate.
* Repair angvel/aimvel scaling mistakes from d79a5d256d
.
* Scale dyaw and dpitch by 25% for Shadow Warrior as the game runs 25% faster than the other games, leading to faster input.
2020-06-24 20:08:56 +02:00
Christoph Oelckers
e146e73345
- consolidated the 'music' parsing in Defs (pending a refactor of the MAPINFO system.)
...
- removed the remaining parts of the game Defs parser because we do not want anything EDuke in here.
2020-06-24 00:40:22 +02:00
Christoph Oelckers
990cb2acb8
-'shoot' replaced.
...
# Conflicts:
# source/build/src/palette.cpp
2020-06-21 23:24:49 +02:00
Mitchell Richters
3325ef272e
- make r_ambientlight work globally for all games by performing adjustment engine-side.
2020-06-21 10:12:54 +02:00
Christoph Oelckers
550576d94d
- allow skipping the Exhumed logos.
2020-06-17 17:10:31 +02:00
Christoph Oelckers
b9a567463c
- fixed compile error.
2020-06-17 12:26:06 +02:00
Richard C. Gobeille
9a2c2d5a98
exhumed: fix overflow in feebtag()
2020-06-17 12:26:06 +02:00
sirlemonhead
d2806393bb
PCExhumed: Add code to draw serpent cam status text on screen
...
# Conflicts:
# source/exhumed/src/sound.cpp
# source/exhumed/src/status.h
2020-06-17 12:26:06 +02:00
sirlemonhead
9df13d0dfe
PCExhumed: Don't restore mid level save point if re-entering a just completed level
2020-06-17 12:26:05 +02:00
sirlemonhead
2e514e539e
PCExhumed: Fix cheat messages
2020-06-17 12:26:05 +02:00
Christoph Oelckers
2c2b871083
- fixed texture validation checks.
2020-06-17 12:26:02 +02:00
Christoph Oelckers
946da7d622
- moved the textures used for the animations into the texture manager.
...
This is to allow giving them a texture ID so that they can be used from ZScript which has no access to naked textures.
This also consolidates AnimTexture and VpxTexture.
2020-06-14 20:27:13 +02:00
Christoph Oelckers
d4cdb31464
- backend update to make the ZScript compiler work.
2020-06-14 18:58:30 +02:00
Christoph Oelckers
35471ce7e2
- clear the screen for Exhumed's logos.
2020-06-13 00:08:47 +02:00
Christoph Oelckers
ee98db589f
- fixed the Exhumed startup to do proper fading of the publisher logos, which PCExhumed only implemented for the software renderer.
...
Made it faster than PCExhumed, though
2020-06-12 23:06:11 +02:00
Christoph Oelckers
1311db9ac9
- changed all places clearing the screen in 2D display code to use the 2D drawer's ClearScreen method.
2020-06-12 20:52:01 +02:00
Christoph Oelckers
4f0e3adfbb
- removed pointless constexpr declaration on numeric constants.
2020-06-12 16:49:35 +02:00
Mitchell Richters
d79a5d256d
- fix joystick scaling for all games.
...
* Repairs https://forum.zdoom.org/viewtopic.php?f=340&t=67239 and https://forum.zdoom.org/viewtopic.php?f=340&t=67933
* Values that come from GZDoom backend are too low to be suitable for the Build games which were dividing by 'analogExtent'.
* Remove definition of analogExtent from all games and define in inputstate.h, then define joyaxesScale as 75% of analogExtent to provide a bit of headroom and not have a scale of 1.0 be full speed.
* Invert the returned results of GetAxes() as the returned floats are reversed for build games.
* Leverage scaleAdjustmentToInverval() on game-side code to consistently scale the input irrespective of frame rate, vsync etc.
2020-06-12 16:44:08 +02:00
Christoph Oelckers
f159496f6e
- moved the ShadeDiv array into the lookup table and took the numshades-2 divisor out of the stored value.
...
The value was changed to allow easier reuse in scenarios where the size of the shade table does not matter anymore.
2020-06-05 23:18:21 +02:00
Christoph Oelckers
cf6855904d
- took projection and view matrix out of the render state.
...
This is a preparation to migrate to GZDoom's HWViewpointUniforms buffer.
2020-06-04 18:46:44 +02:00
Christoph Oelckers
68c97e3c25
Merge branch 'master' of https://github.com/coelckers/Raze
...
# Conflicts:
# source/core/gamecontrol.h
# source/duke3d/src/game.cpp
# source/exhumed/src/exhumed.cpp
# source/rr/src/game.cpp
2020-05-31 23:30:10 +02:00
Mitchell Richters
ce48f081fc
Exhumed: Amend how game pauses.
2020-05-31 23:19:54 +02:00
Christoph Oelckers
efa1cd3048
- moved video files to 'common'.
...
# Conflicts:
# source/blood/src/screen.cpp
2020-05-31 09:19:16 +02:00
Christoph Oelckers
1e2a3da5fd
- video base code unified.
...
# Conflicts:
# source/core/rendering/v_video.cpp
2020-05-31 09:18:43 +02:00
Christoph Oelckers
edb2cb31ee
- backend update with GZDoom model code.
2020-05-31 08:55:00 +02:00
sirlemonhead
86f2a7a578
PCExhumed: MoveSector() updates player position variables. Fixes #366
2020-05-30 23:34:26 +02:00
Christoph Oelckers
a3e6829817
- fixed Exhumed menu by adding a proper layout mode to the drawer instead of hacking the broken tile offsets.
2020-05-27 23:30:36 +02:00
Christoph Oelckers
193b940eef
- palette code cleanup.
2020-05-27 22:19:02 +02:00
Christoph Oelckers
29db3febb8
- updated the platform code to be mostly identical with GZDoom
2020-05-26 00:08:26 +02:00
Christoph Oelckers
55a3c62b59
- use GZDoom's 2D drawer.
...
Console and menu font colors are not ok yet, aside from that it works.
2020-05-25 17:11:32 +02:00
Christoph Oelckers
266364fc2e
- properly implement texture offsets
2020-05-24 13:26:45 +02:00
Christoph Oelckers
498b19873d
- split up textures.h.
2020-05-24 07:58:56 +02:00
Christoph Oelckers
f929419a0a
- refactoring of the lookup tables.
2020-05-23 22:43:04 +02:00
Christoph Oelckers
c1f7cf1c3a
- added DObject as a preparation for the ZScript compiler. Currently large parts are disabled because the backing features are not present yet.
...
# Conflicts:
# source/CMakeLists.txt
2020-05-23 22:43:01 +02:00
Christoph Oelckers
b971bc2717
- avoid using global palette settings when drawing 2D content with a custom palette.
...
Instead pass the palette info with the render call to avoid stale global state.
2020-05-23 22:43:01 +02:00
Christoph Oelckers
8bd5f12b42
- matching sound backend code with GZDoom.
...
# Conflicts:
# source/core/sound/s_soundinternal.h
2020-05-23 12:59:11 +02:00
Christoph Oelckers
cfe02cebf1
- moved music code to "common"
2020-05-23 12:37:47 +02:00
Christoph Oelckers
6a8efb7520
- update of music code, in particular separating the engine-specific lookup from the backend.
...
# Conflicts:
# source/core/music/music.cpp
# Conflicts:
# source/build/src/palette.cpp
2020-05-23 12:37:47 +02:00
Christoph Oelckers
d0406e27b6
- all base palette data has been transitioned to GPalette.
2020-05-23 12:31:05 +02:00
Christoph Oelckers
6f9ee4b60f
- store palettes in the palette container.
2020-05-23 12:31:05 +02:00
sirlemonhead
73a56f76af
PCExhumed: Avoid some original memory read bugs and correct some bullet code branching.
2020-05-22 17:22:00 +02:00
sirlemonhead
20cfbc1786
PCExhumed: Fix the timing of credits text when not using CD audio.
...
# Conflicts:
# source/exhumed/src/exhumed.cpp
2020-05-22 17:17:54 +02:00
Mitchell Richters
bece408548
Exhumed: Set scaleAdjustmentToInterval to correct value for game's ticrate.
2020-05-13 15:10:18 +02:00
Richard C. Gobeille
98f4bac708
Exhumed: fix stupid input scaling bug
2020-05-11 21:27:29 +02:00
Mitchell Richters
8730bd9dda
- allow game's clock to keep running while paused (restores interpolations/animations in menus).
2020-05-08 21:23:02 +02:00
Mitchell Richters
7b35e04c0c
- reset buttonMap button states after returning from pause for Exhumed (stops keys acting stuck down if down prior to pausing).
2020-05-06 10:51:08 +02:00
Mitchell Richters
419329b5b2
- standardise main loop for Exhumed following changes to Duke3D/RR/SW main loops.
2020-05-06 10:51:08 +02:00
Mitchell Richters
db428a4f03
All Games: Make more precise use of 'scaleAdjustmentToInterval()'.
...
- Inline function returns a double, therefore we should use it and not potentially truncate the mantissa.
- Use divisors to get true numbers of some floats (3.333 -> 10/3, etc).
- Remove a few brackets/parentheses where possible from what are already exceedingly bracketed lines.
2020-04-14 00:00:21 +02:00
Christoph Oelckers
156a225ff4
- renamed global palookup variable.
...
Since the same word gets used in text messages and local variables in the game code it is easier this way to search for it and facilitate its transition to the translation table management in PaletteContainer.
2020-04-13 23:58:46 +02:00
Christoph Oelckers
fda4293013
- draw the movie franes outside of the tile system to reduce the palette maintenance.
...
The movie code has always been the part causing the most issues because it alters the palettes - the rest treats them as static data.
2020-04-13 23:58:45 +02:00
Christoph Oelckers
fac004b4d2
- palette code cleanup
2020-04-13 23:58:44 +02:00
Christoph Oelckers
f74ba52990
- compile fixes.
2020-04-12 05:40:16 +02:00
Christoph Oelckers
57cb22f135
- console code matching with GZDoom
...
Refactored the buttons to be definable locally per game for easier handling of differing input.
2020-04-12 08:30:41 +02:00
Christoph Oelckers
8e87674d4c
- backend code matching with GZDoom
2020-04-12 08:30:40 +02:00
Christoph Oelckers
0ca4bbd0c4
- changed some menu related names to match GZDoom.
2020-04-12 08:30:40 +02:00
Christoph Oelckers
5584c726ba
- file system update and adjustment.
2020-04-12 08:30:40 +02:00
Christoph Oelckers
f671eb622f
- migrated to GZDoom's utility code.
2020-04-12 08:30:39 +02:00
Christoph Oelckers
66ecb05eb8
- use Printf as the only command to print to the console.
...
All uses of OSD_Printf, initprintf etc. have been renamed.
2020-04-12 08:30:38 +02:00
Christoph Oelckers
e2f5e8fe34
- renamed 'common' to 'core'.
...
We'll need 'common' for something else.
2020-04-12 08:30:36 +02:00
Mitchell Richters
b801a73db9
Exhumed: Fix look up/down in line with input amendments.
2020-04-06 08:06:38 +02:00
Mitchell Richters
2ddc442e48
Exhumed: Improve player input.
...
- Input velocity now consistent irrespective of frame rate.
- Angle and horizon calculated at frame rate.
- Replace usage of F16() macro with fix16_from_int() in GetInterruptKeys().
Note: Known issues with look up/down keys that is to be repaired.
2020-04-06 08:06:38 +02:00
Christoph Oelckers
41545b644a
- cleaned out most of the software renderer's static global variables.
2020-03-29 16:59:49 +02: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
Christoph Oelckers
a203e37aeb
- removed buggy diagnostics print.
2020-03-05 01:01:04 +01:00
nukeykt
b88eeea9a2
Exhumed: Correctly set player action id for mummified state
2020-03-04 17:57:16 +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
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
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
4bc0531bf7
- disabled help screen in Exhumed and save menus in Deer Huntin'.
2020-02-29 12:55:12 +01:00
Christoph Oelckers
69e018d0c4
- added serialization of playing sounds.
...
For ambient sounds that can be cleanly restarted a new 'transient' flag was added so that these do not get written out.
Tested on SW so far, other games yet to do.
2020-02-29 12:33:35 +01:00
Christoph Oelckers
1a66878205
- fixed some issues with Exhumed's ambient and creepy sounds.
...
Both now refer to a proper target for bookkeeping.
2020-02-28 19:56:37 +01:00
sirlemonhead
69aba5f3ea
PCExhumed: Don't modify coordinates with abs() in runlist_CheckRadialDamage(), correct to original behaviour.
2020-02-28 18:42:45 +01:00
sirlemonhead
cd4090e531
PCExhumed: Fix Anubis drum not moving correctly when shot (bad angle calc).
2020-02-27 18:27:33 +01:00
Christoph Oelckers
0ed3b3b3ea
- manual merge of * PCExhumed: Don't shrink/expand screen viewable area if in map mode. Fixes #327
...
Code was too different for cherry-picking.
2020-02-26 20:51:19 +01:00
Christoph Oelckers
6315bd3960
- Exhumed - fixed wrong sound origin for special effect sound
2020-02-26 00:20:52 +01:00
Christoph Oelckers
b4a2a5c187
- fixed Exhumed's creepy sounds.
2020-02-25 20:10:36 +01:00
Christoph Oelckers
71083f2b23
- use sound rolloff settings for Exhumed that actually work.
...
I cannot say if this is correct because the sound in PCExhumed doesn't seem right so the rolloff distance was more or less guesswork based on what sounds ok.
2020-02-25 19:40:39 +01:00
Christoph Oelckers
7d725bfe8a
Exhumed sound coordinate fixes
2020-02-25 00:40:51 +01:00
sirlemonhead
999840a9b5
PCExhumed: Corrected sector tag number handling for enemy death triggered sectors. Fixes issue #328
2020-02-24 22:13:32 +01:00