86dc909559
- added detection logic for zipped versions of the Cryptic Passage add-on for Blood and the Route66 add-on for Redneck Rampage.
...
- added command line options to load the original file dump of both mods in the game directory.
- both also require loading additional non-standard-named .art files
2019-12-11 23:41:05 +01:00
7942bc9490
- completed work on Shadow Warrior main menu.
...
This one will definitely be a problem for localization because the font is extremely large.
2019-12-11 20:35:25 +01:00
ec96ae8992
- cleanup of -map setup.
2019-12-11 01:11:35 +01:00
cb051b44ea
- removed unused compression records from savegame header
2019-12-11 01:10:59 +01:00
5c0cd5114d
- transitioned Blood to the common mapinfo system.
2019-12-11 00:57:53 +01:00
cc33c6a0ed
- deactivate statistics for user maps.
...
This really isn't controllable.
2019-12-10 23:11:02 +01:00
0e19d4262e
- savegame and mapinfo cleanup in DN3D and RR frontends.
...
Also added an "end game" flag to the mapinfo. For those who like to assemble single levels into custom episodes. More features for that to come. ;)
2019-12-10 22:22:59 +01:00
4cc22e155f
- better handling for maps without names.
...
Use the file's base part as name if that happens.
2019-12-10 17:35:28 +01:00
4f04fe66de
- transitioned RR to the new mapinfo
2019-12-10 00:31:55 +01:00
3b57f38e55
- started transitioning to a global mapinfo list.
...
This will make it a lot easier for cross-game parts of the engine to query game state.
So far the EDuke frontend has been ported over.
2019-12-10 00:01:45 +01:00
782dfcdc54
- changed licenses in a few files.
...
These originated from GZDoom and originally contained original Doom code, but for Demolition the offending parts are no longer present so the ZDoom-BSD license applies now.
2019-12-09 17:29:31 +01:00
5e9b874610
- exported most of Blood's text to the string table
...
MP messages with %s yet to do.
2019-12-09 02:01:30 +01:00
0604c72586
- code cleanup
...
removed some unused definitions
replaced the copybuf* functions with memcpy. These days doing homegrown copy loops is not efficient anymore.
2019-12-09 01:39:40 +01:00
66218dd074
- connect SW with statistics code and added missing function for Blood
...
# Conflicts:
# source/blood/src/blood.h
# source/common/menu/messagebox.cpp
# source/sw/src/game.cpp
# source/sw/src/game.h
2019-12-09 01:03:18 +01:00
4ef9ec6708
- call STAT_StartNewGame globally from the menu
2019-12-09 01:00:46 +01:00
9f25c9c117
- some string rework
...
* removed temporary placeholder content from string init function. All this gets properly read from definition files now.
* preinitialize a few quotes that are used for status display purposes and are needed in all games
* only use the global episode name table in Blood to avoid redundancy
* let SW's swcustom parser write to the global tables instead of local ones.
2019-12-09 01:00:46 +01:00
f2d0665557
- connected the screen size CVAR and slider with Shadow Warrior's internal setting.
2019-12-07 21:39:17 +01:00
8f90cc8324
- more Shadow Warrior cleanup.
2019-12-07 20:48:16 +01:00
0157446ad1
- thorough cleanup of the Shadow Warrior music code.
...
This was one huge mess where nothing fit together.
Also added an enhancement that the CD Audio boss theme tracks are also played when CD music is generally off, because these have no equivalent in MIDI. This needs to be checked if it's stylistically ok, though.
2019-12-07 19:57:19 +01:00
ff50a1681f
- simplified the music playing interface a bit.
...
#
2019-12-07 18:28:30 +01:00
a05dab66f7
- color tweaking for the options menu.
2019-12-07 15:45:29 +01:00
9960b505e8
- added captions to SW's game menus.
...
- made Duke Nukem's quote strings localizable.
2019-12-07 12:42:25 +01:00
0342b96335
- cleaned out the remaining wrappers from cache1d.h and use the file system directly instead.
2019-12-07 10:49:23 +01:00
30cbcb54b1
- renamed the remaining file system access wrappers in cache1d.h
2019-12-07 10:31:27 +01:00
749eda32c5
- moved kopenfilereader into the FileSystem class.
2019-12-07 10:14:51 +01:00
ef87d2d4f9
- always pause the game when the console is open.
2019-12-07 10:01:03 +01:00
ddfb2223db
- added a directory list function to the file system.
...
- fixed lookup for resources by ID - it always picked the first candidate from the hash chain without checking the actual ID.
2019-12-07 09:44:43 +01:00
7d7507d453
- always add movie and music subdirectories.
2019-12-07 00:57:45 +01:00
7a8208eb2f
- fixed out of bounds memory access.
2019-12-06 23:20:18 +01:00
66756bfa13
- final fixes for Blood's and Duke Nukem's menus.
2019-12-06 18:36:49 +01:00
a0fe7f4048
- more mouse fixes. Most of the menu is now mouse controllable again.
...
The exceptions are the text screens which do not react to the mouse and the confirmation screen which treats a mouse click as a cancel event.
2019-12-06 00:06:41 +01:00
7a9138cde0
- made the confirmation screen functional.
...
This works but still needs a bit of visual work.
2019-12-05 23:17:55 +01:00
db425a1228
- fixed keybinding and mouse cursor display.
...
- fixed some merge issues in Shadow Warrior.
2019-12-05 21:39:02 +01:00
1b9d1943c9
- initialize all dynamic music related menus.
2019-12-05 20:50:19 +01:00
54177cd27d
- added the animated player display.
2019-12-05 19:52:46 +01:00
169d68f583
- fixed stuff and cleaned out most of the old menu code.
2019-12-05 19:00:40 +01:00
6914408453
- fixed writeback of hud_size CVAR
...
G_ChangeHudLayout must ensure that the written value is ok, otherwise the auto validation in the CVAR can screw things up.
2019-12-05 00:54:55 +01:00
628bd9efc6
Filled in the rest of the menus
...
Sound is only partially functional, video mode completely nonfunctional, but it makes no sense adjusting them to the current backend code when it's due for replacement.
2019-12-05 00:47:05 +01:00
1b1fad6e13
- forgot to save this.
2019-12-05 01:17:28 +01:00
cb0538d0f2
- mouse aiming cleanup.
...
Reverted this to a sane setting, as it was in the original games and in all other games I have ever seen, i.e. there is a global setting to enable mouse view, and a button to manually trigger it. The toggle can be easily handled by flipping the CVAR directly.
The main problem here was that it triggered a few cases for mouse-less gameplay in the default case with a mouse present, because the mouseaim CVAR was no longer what the game expected.
This misguided change seems to have originated in JFDuke but by now had propagated to all the other games as well, the code was in all 4 frontends.
2019-12-05 01:08:35 +01:00
525cf28d29
- commented FBaseCVar::GetHumanString back in.
...
This had to be deactivated when adding the code, but was forgotten when everything was ready.
2019-12-04 23:09:09 +01:00
3ea526055f
- added a generic message display, using ZDoom's code.
...
This is mainly meant for Nam and WW2GI which have an ugly-as-hell font for these texts.
2019-12-04 23:07:02 +01:00
6d04f0f159
- added option to print custom messages with Duke Nukem's quote system.
...
- hooked up all front ends with a generic message printing function so that common code can access the native message displays. This is needed for consolidation of some input actions which are mostly identical but print messages.
- preparations for a generic message system.
2019-12-04 21:35:35 +01:00
dca118881a
- added graphics for the mouse back button and reactivated the code for it.
2019-12-04 17:55:43 +01:00
7d1eb74b5e
- more menus implemented
2019-12-04 01:38:51 +01:00
6a6d6e3694
- fixed quote init.
2019-12-04 00:38:43 +01:00
72857db17b
- refactor of the quote storage.
...
This was consolidated for both EDuke and RedNukem frontends, put into a class with strict access control and the length limit was lifted.
The new class will eventually allow better localization control.
2019-12-04 00:28:28 +01:00
c561255018
- moved the application of in_mousebias and in_mousedeadzone into the backend code.
...
This piece was repeated 6x for each call to CONTROL_GetInput, creating quite a bit of redundancy.
2019-12-03 20:58:43 +01:00
fb5d944170
- made the mouse sensitivity CVARs floating point so that the menu can display them properly.
...
- disabled the mouse movement sensitivity CVARs pending a refactoring of the code to handle them in the input backend instead of the individual input handlers.
2019-12-03 20:49:56 +01:00
49e0e551d6
- fixed the sliders.
2019-12-03 20:32:35 +01:00
6245a0e2e2
- added mouse and controller menus
...
The controller menu obviously does not work yet, it needs quite a bit of backing code fron GZDoom first.
2019-12-03 01:21:27 +01:00
65ae00fb74
- completion of controls menu
...
- some message printing cleanup in SW frontend. This still has its native console that needs to be removed.
2019-12-03 00:57:03 +01:00
79ced02d36
- implemented the Shadow Warrior menu interface.
2019-12-03 00:01:04 +01:00
bc3a921a72
- fixed newly added menu content.
2019-12-02 19:21:45 +01:00
026cc7153c
- externalized the controller bindings and removed all code responsible for maintaining them separately.
...
Bindings were changed a bit because what was there was a very poor default for my own controller.
2019-12-02 18:33:11 +01:00
26daff79db
- fixed compile errors and updated string table.
2019-12-02 18:11:10 +01:00
00b2467eea
- WIP keybinding cleanup
2019-12-02 02:07:32 +01:00
71c2a8f33a
- made the main option menu work.
2019-12-02 00:16:48 +01:00
e743268c4b
- Blood load/save works.
2019-12-01 22:54:52 +01:00
eb668180c8
- implemented help and credits menu for Blood.
2019-12-01 21:44:50 +01:00
e8c5939695
- more work on Blood menus. Game start works.
2019-12-01 20:17:30 +01:00
e2be025433
- fixed the Ion Fury credit screens.
...
The entire 'fix' here consisted of hacks to give the CON script exactly what it needs to show them as intended.
2019-12-01 17:48:56 +01:00
b372cb5f35
- the primary Blood menus are working.
...
Now this was magnitudes easier than the EDuke menu - NBlood's menu is actually clean and usable code but still nothing compared to a unified menu system.
2019-12-01 15:31:08 +01:00
5d0d37df25
- disconnected Blood's menu.
...
This is due for replacement next.
2019-12-01 10:18:38 +01:00
79fd4e830a
- removed the code for Doom's help screens.
2019-12-01 08:23:35 +01:00
0fc439a969
- fixed Redneck Rampage ingame menu and added selection validation to the load menu.
2019-11-30 23:59:22 +01:00
06d5705ae6
- formatting fix and null check for aborted transition.
2019-11-30 23:45:43 +01:00
c36402eb5c
- fixed savegame validation and recursive ticker calls.
2019-11-30 23:33:04 +01:00
41b116e2f2
- save menu in Duke Nukem is working.
2019-11-30 22:46:00 +01:00
2a9e4fca46
WIP safety commit
2019-11-30 19:23:54 +01:00
d5c3991c2e
- fixed compile errors in menu code.
2019-11-30 10:03:20 +01:00
b3c335cd1d
Merge branch 'menu_for_real' of https://github.com/coelckers/demolition into menu_for_real
...
# Conflicts:
# source/common/menu/loadsavemenu.cpp
# source/duke3d/src/d_menu.cpp
# source/rr/src/d_menu.cpp
2019-11-30 01:06:37 +01:00
e266044391
- update of load/save menu to latest GZDoom code.
...
Input in save menu working.
2019-11-30 00:49:50 +01:00
ebcc25f36d
- prototyping the Blood fullscreen menu entries
...
These are a bit more sophisticated than what the other games have. ;)
2019-11-29 02:12:38 +01:00
90c5ea6acc
- updated option menu code to latest scripted version
...
This mainly means being able to use the generic font.
This also adds more generalization to the menu sound handling, plus an option to turn menu sound off. This is motivated by the pig sounds which RR uses in the menu.
2019-11-29 01:28:13 +01:00
0cedad6390
- started work on load/save menus.
2019-11-29 00:37:19 +01:00
943cb64eda
- image scroller menus working.
2019-11-28 23:27:10 +01:00
1f1b927b6b
- fixed a few issues.
2019-11-28 20:11:27 +01:00
59ebb10512
- fixed compilation and unhooked the Redneck Rampage menu so that it can be replaced.
2019-11-28 19:35:35 +01:00
cd4ff92266
- handle Blood.
2019-11-28 03:32:02 +01:00
324056ad88
- more cleanup on music code
...
* removed some redundant functionality (e.g. Shift-F5 to change - use the console for that!)
* removed a few more leftover parts of the old music system
* savegames should not do more than resuming the music at the point of saving. (DN3D and RR only so far. Blood to be done.)
* handle music enabling/disabling in the backend, which simply knows better what to do. This was only working in the menu, so changing the CVAR had no effect.
2019-11-28 03:18:58 +01:00
a59917b35d
- more cleanup of sound code
...
removed the remaining parts of the old music system in EDuke32 and RedNukem frontends.
2019-11-28 03:02:33 +01:00
6ad9c1c0e3
- set up d_menu.cpp for Redneck Rampage
2019-11-28 02:14:30 +01:00
4e5f59a373
- Menu WIP
...
* implemented single image screens
* implemented skeleton of the image scroller
* added RR-specific definitions to the menus (need to copy and adjust d_menu.cpp)
* added definitions for credits screens.
2019-11-28 01:02:45 +01:00
5f5fe271f7
- fixed handling of the custom game mode menus in Ion Fury.
...
Sadly the scripting which necessitates this all is such a hack that it's probably necessary to fix again if the next project comes along that uses the same kind of "creativity" instead of providing a robust implementation.
2019-11-27 23:35:12 +01:00
2c36e986b9
- fixed most issues with Ion Fury's game startup menus.
2019-11-27 22:41:15 +01:00
723b210c95
- major work on savegame code
...
Not tested yet!
* Added a JSON-based header to the savegames so that the unified menu can read from a common data source.
* moved loading and saving of frontend independent data to the wrapper so that support is automatic.
2019-11-27 00:41:26 +01:00
3b7aa74c27
- connecting the dots in the menu. Duke Nukem can now start a level.
2019-11-26 23:20:54 +01:00
46d1f8517a
- animated transitions are working.
2019-11-26 22:05:52 +01:00
a5a0c38474
- removed DObject.
...
Just for the menu this can be done much simpler - the entire setup here doesn't work well with the game frontends being compiled as separate modules anyway.
2019-11-26 21:25:45 +01:00
1adceb82ef
- consolidation of defbinds definitions.
...
Putting all the generic definitions in files used by all games greatly reduces the clutter and chance for errors.
2019-11-26 21:06:43 +01:00
0597b4cf12
- enabled the menu transitions.
2019-11-26 00:43:20 +01:00
2ed598bb6c
- menu transition animation added.
2019-11-26 00:29:51 +01:00
dce633de8b
- use a floating point origin in the menu's implementation
...
Using fixed point here makes no sense, let's keep that to the code that still lives in the 90's.
2019-11-26 00:20:21 +01:00
a74a670c99
-- more work on the menu - episode and skill menus are working in DN3D.
2019-11-25 23:21:51 +01:00
d73f915c66
- episode menu setup.
2019-11-25 18:41:39 +01:00
556c61b60b
- fixed compile errors.
...
(Include dependencies suck, it's time for modules to become an option.)
2019-11-25 17:19:48 +01:00
a9ee5940fc
- localization wrappers
...
Currently a no-op, but if it's in it won't be forgotten later.
2019-11-25 00:28:59 +01:00
1f1e39fac0
- consolidation of texts for episode and skill menus
...
So far without localization capability - the engine cannot handle it yet.
2019-11-25 00:02:00 +01:00
42b3d12630
- Ion Fury's main menu now looks correct.
2019-11-24 22:31:27 +01:00
57b542671c
- Ion Fury main menu fixes.
2019-11-24 20:40:53 +01:00
8d11990494
- more work on making Exhumed compile.
...
Almost done, down to 20 compile errors.
2019-11-24 13:59:36 +01:00
40772d9f0c
- making more things compile.
2019-11-24 10:03:19 +01:00
6280b0b516
- started fixing things.
2019-11-24 00:04:15 +01:00
52cfb7fb92
- completely disconnected the old menu from the rest of the game to allow rebuilding the new one.
...
Sadly this uncovered a few more places where script events are allowed too broad access to the game state.
2019-11-23 23:05:24 +01:00
326d0f5f76
- the new menu displays something.
2019-11-23 17:50:36 +01:00
9529adb3e1
- font tables moved.
2019-11-23 12:41:13 +01:00
f2fc3fc2cb
- WIP commit.
2019-11-23 12:38:38 +01:00
0ad7f25a8a
- added project and namespace wrappers to all Exhumed files.
2019-11-23 00:11:37 +01:00
ceb07280cf
- more work on the menu.
...
Duke Nukem's menu title is getting rendered.
2019-11-22 22:52:11 +01:00
5f9b57519a
- hooked up the menu code so that it can receive events.
...
Nothing pretty yet but a start is made.
2019-11-21 22:31:46 +01:00
2740913c60
- added a redirection hack for rotatesprite so that it can be transitionally used in the 2D drawer.
2019-11-21 19:30:27 +01:00
81ddf22d5d
- added ZDoom's menu system as a base to build a new menu on.
...
# Conflicts:
# source/CMakeLists.txt
# source/build/src/engine.cpp
2019-11-21 18:03:09 +01:00
4be63d55d3
- added a stripped down version of ZDoom's DObject.
...
This only retains the objecct factory feature, but removes the garbage collector which I have no use for.
# Conflicts:
# source/CMakeLists.txt
2019-11-21 18:02:22 +01:00
2da4294ba5
- hooked up the event processing for Shadow Warrior, so keyboard input is working now. Mouse movement is not being processed yet.
...
Also removed some leftover code from the old input system.
2019-11-20 22:01:44 +01:00
caa450dcb9
- debugprintf
2019-11-20 20:07:33 +01:00
fd31d4fa6a
- replaced 32 bit SDL library - the preincluded one appeared to be broken.
...
- fixed main group autochoice.
- fixed uninitialized player links for Shadow Warrior.
2019-11-19 22:35:52 +01:00
f24de03501
- fixed auto-picking of game GRPS from the command line.
2019-11-19 21:35:35 +01:00
dc60c7f72e
- fixed use of brightmaps.
...
Due to the blending they are essentially inactive on translucent content and Duke Nukem heavily abuses this.
2019-11-15 20:51:02 +01:00
ab9c532d89
- save custom data as JSON.
...
This makes it a lot easier to debug and test than binary blobs.
2019-11-15 18:57:26 +01:00
619a7541f1
- "fixed" keybinding not responding for all keys.
...
This looks like an ImGui bug - it doesn't like two identically labelled buttons on the same page, it seems. I now work around this by using strings with different numbers of spaces. Stupid but effective.
2019-11-14 22:48:23 +01:00
ba117554b0
- fixed savegame issues.
...
Since the code is extremely volatile I changed the setup so that the save is a zip file with the regular snapshot plus all added data as separate entries.
This allows compressing everything properly without savegame breaking interference.
Blood does not yet load its savegames, need to check.
2019-11-14 21:07:43 +01:00
5002dd866c
- fix compile on vs2017, change pow2char to static
...
- include nullptr check for mapname in music.cpp
2019-11-13 16:40:08 -05:00
8055d10362
- hooked up the secret hint system
2019-11-13 00:44:33 +01:00
35bc7f56fc
- added secret hint code.
...
Not hooked up yet.
2019-11-12 23:23:22 +01:00
dee1cba849
- hooked up Blood with the statistics code.
2019-11-12 22:59:51 +01:00
6ccef7201e
- hooked up the statistics code with EDuke and RedNukem frontends.
...
Not sure about the end of game conditions, I wasn't able to test that part yet.
2019-11-12 22:45:11 +01:00
74ed8fd1d9
- added GZDoom's statistics code
...
Not hooked up yet.
2019-11-12 22:00:33 +01:00
0bdec4ea2e
- fixed: Events were processed as key events without checking their type.
2019-11-12 20:17:17 +01:00
22ccea8677
- reworked music interface a bit.
...
Conmsidering how hard it is in Duke Nukem based games to modify the level music, there is now a setting for this in mussetting.txt to make the job easier and even allow setting level music in Redneck Rampage without replacing game data.
2019-11-12 00:43:07 +01:00
3be9deb070
- removed the different shadeDiv for Ion Fury.
...
This isn't necessary and was apparently caused by a bug that got fixed in the mean time.
2019-11-11 23:24:31 +01:00
0f2c4f7760
- added stripped down SNDINFO parser so that the music related settings can be specified.
2019-11-11 22:52:07 +01:00
cee5891409
- so music is finally working but I don't know - adding a second sound backend because the existing one is such a piece of shit is certainly not the best solution.
...
I'll probably replace the SDL and DirectSound outputs with OpenAL later - let's hope that the mixer is at least flexible enough to handle that...
2019-11-11 21:50:20 +01:00
16a6cd909a
- this should work but doesn't...
2019-11-11 20:37:57 +01:00
51a5fecc02
- something can be heard, but it's crap.
...
This sound code is really strange.
2019-11-11 19:53:06 +01:00
ec6ce8b1ec
- hooked up ZMusic.
2019-11-11 19:10:46 +01:00
29d16868c9
- fixed compile errors.
2019-11-11 17:51:30 +01:00
f6a9bb770d
- fixed most issues with newly added music files
2019-11-11 01:01:18 +01:00
ae06d19008
- added remaining music files to project
2019-11-11 00:31:36 +01:00
5e95ef5322
- added the rest of GZDoom's music interface.
...
This still needs to be integrated.
2019-11-11 00:23:52 +01:00
9f9748ede6
- initial ZMusic hookup.
2019-11-10 23:58:51 +01:00
5fc81d1bd4
- made brightmaps operational.
...
The logic is not yet optimal but at least it works.
2019-11-10 19:42:26 +01:00
21ac5e87b5
- added blend table translucency estimation instead of using a lame default.
...
- draw fullscreen blends below the console.
- moved all mouse event processing out of the SDL backend to D_PostEvent.
- removed all remaining code for dealing with mouse buttons directly.
2019-11-10 15:15:14 +01:00
55018aae7e
- fixed mouse scaling
2019-11-10 11:59:22 +01:00
a1a9770b44
- reworked the FPS display to use ZDoom's fstat class to get rid of the microscopic font it used.
...
- changed time display for rendering to exclude VSync and playsim times to get more meaningful information.
2019-11-10 11:42:25 +01:00
cae710bd59
- fixed alpha threshold.
...
Not only is this a deprecated feature - it also does not work right when complex lighting is at play, it must be done in the shader to get proper results.
2019-11-10 10:01:31 +01:00
7e70c217fe
- fixed console event processing and added a texture memory calculator.
2019-11-09 23:58:26 +01:00
39df3d0560
- added 'logfile' CCMD.
2019-11-09 22:27:33 +01:00
2997bb6292
- the keybinding menu is finally working.
...
Obviously the existing menu implementation from Duke Nukem needs to be tossed out at some point, but at least the functionality is there again.
2019-11-09 22:22:51 +01:00
299f596afc
- Changed EDuke menu to receive all settings storage locations as CVARs.
...
With this out of the way the only part that needs a real replacement immediately is the keybinds menu.
2019-11-09 19:15:03 +01:00
d3e6807f61
- fixed infinite loop in compression code.
2019-11-08 17:50:32 +01:00
f52a58d9ac
- fixed compilation.
2019-11-08 17:41:19 +01:00
9aa275f996
- got rid of some editor-only code and the entire buildvfs header
...
Nearly all file write access now uses the FileWriter class, which is UTF-8-safe on all platforms - unlike stdio.
2019-11-08 02:02:54 +01:00
4fc56203c2
- implemented savegame compression
...
Unfortunately necessary because Ion Fury savegames store 120 GB(!!) of data, mostly zeros.
Unlike the old method, this compresses the entire savegame as one block using a ZLib stream so it should be a lot more efficient now.
2019-11-08 01:36:32 +01:00
a40be954f1
- same change for RedNukem front end.
2019-11-08 01:04:27 +01:00
47227fc90f
- replaced FILE * with FileReader in savegame code.
...
FILE* is too inflexible, with FileReader I can plug in a transparent compressor.
2019-11-08 00:26:14 +01:00
d2cbd71dbf
- adjustments
2019-11-07 20:30:56 +01:00
b6a3a60251
- console output is functional.
2019-11-06 23:40:10 +01:00
81e9c867da
- fixed key binding
2019-11-06 20:34:00 +01:00
5d31119a49
- fixed the Shadow Warrior menu, but it doesn't do much good. The game appears to be thoroughly broken.
2019-11-06 19:22:14 +01:00
88bf056176
- added a class for cleaner savegame writing
2019-11-06 12:29:08 +01:00
e87642e197
- cleaned out the remains of the savegame compression hacks
...
This broke the savegame reader which still assumed it was working on compressed data. Everything will now take the uncompressed path.
In-stream optional compression is not a good idea anyway, this can and should be done better.
Also: Why is the savegame format architecture dependent???
2019-11-06 01:01:16 +01:00
f252eaffbc
- fixed font translation setup.
2019-11-06 00:00:33 +01:00
de829128ea
- hooked up the 2D drawer
...
compiles but not tested yet.
2019-11-05 23:35:38 +01:00
3a0b8364f7
- removed the OSD entirely.
2019-11-05 20:31:30 +01:00
8321bc6208
- removed most of the old OSD's hooks.
2019-11-05 20:25:57 +01:00
c46b22e52e
- more cleanup of obsolete OSD code.
2019-11-05 20:16:53 +01:00
a4483f131d
- Printf related cleanup.
2019-11-05 20:07:16 +01:00
d943fe036d
- added the ZDoom console and made all needed changes to get it compiled.
2019-11-05 19:57:48 +01:00
ffa16b2a53
- removed all command related code from the OSD.
...
None of this was used anymore.
2019-11-05 00:48:27 +01:00
e37cb782ca
- fixed dependency problems with OSD definitions being used in another header.
2019-11-05 00:39:00 +01:00
5b67d653ed
- removed the bind command set from the osdcmd files to make sure that they don't get called anympre. All input should be routed through the new console code now.
...
# Conflicts:
# source/blood/src/osdcmd.cpp
# source/build/src/osd.cpp
# source/common/console/c_cmdline.h
# source/common/console/c_dispatch.cpp
# source/common/console/c_dispatch.h
# source/duke3d/src/osdcmds.cpp
# source/rr/src/osdcmds.cpp
2019-11-05 00:22:42 +01:00
44f81ebd56
- let OSD_Dispatch forward everything to the ZDoom-based command dispatcher.
...
Essentially making the OSD a dumb terminal. :P
2019-11-05 00:12:20 +01:00
189ce21acf
- reactivated the binding reladed CCMDs.
2019-11-04 23:52:08 +01:00
8d089a11fa
- for initializing tab commands a separate static lookup function must be used to get the button names.
...
Because order of initialization for static objects is undefined.
2019-11-04 23:11:10 +01:00
570696fc09
- added ZDoom's CCMD code.
...
Not tested yet.
2019-11-04 23:01:50 +01:00
bbf0a73471
- input works again.
2019-11-04 20:29:07 +01:00
25341c7221
- hook up the buttons.
...
This is still just glue code, the Build implementation suffers from poor support for multiple keys bound to a single button so they are due for replacement as soon as input is working again.
2019-11-04 18:17:14 +01:00
1ee4efebb0
- fixed compilation.
2019-11-04 17:58:18 +01:00
29b7e1cf79
- moved all mouse button handling to the input state
...
Yet again an unbelievable piece of code working around how input works on modern systems to keep the old 90's code alive.
2019-11-04 01:01:54 +01:00
b4f91de7d3
- major refactoring on the input code.
...
* moved the ASCII conversion hackery in SDLayer to a subfunction because this made things just messy.
* integrated the keyboard callback's functionality directly into inputState for consolidation purposes. This was yet another independent layer in the keyboard management.
* hook up D_PostEvent as the central place to dispatch keyboard input. This is now the only function that is getting called from the backend and a major prerequiside for swapping out the backend for GZDoom's.
Todo: Route mouse input through that, too.
2019-11-04 00:55:49 +01:00
b747df60ee
- moved all keyboard related code into the InputState class, so that looking for this stuff is easier.
...
Sadly there's 1ß00 lines of code using this...
2019-11-04 00:53:55 +01:00
1b958a7f9f
- removed more backing data for the old keybinding code.
...
Unfortunately this means that the keybinding menus in all games except Blood are shot to shit right now because of how they passed the data on to its destination.
These menus are not fixable, this will have to wait until the replacement is up.
2019-11-03 20:58:10 +01:00
eb049abc3a
- it compiles again (safety commit)
2019-11-03 20:24:50 +01:00
73e64ff0b2
- added ZDoom's keybinding class and some needed support code.
...
Not hooked up yet with the game.
2019-11-03 18:19:29 +01:00
12a02cb456
- fixed: lump filters without any dot in the name did not work.
2019-11-03 15:54:18 +01:00
3c7151810f
- made the game interfaces classes instead of function pointer lists because that is far better at error catching.
...
- fixed: Blood's monster flag is a 'have_monsters', not 'nomonsters' flag. As a result none were spawned.
2019-11-03 12:32:58 +01:00
d7e7c516a0
- fixed: In case no game data can be found, the config needs to be written, to ensure there is one for editing.
2019-11-03 10:51:47 +01:00
94aa556953
- some work on a generic cache manager.
...
For main resource data this is probably unnecessary - most resources are never cached with the exception of sounds and textures, which are loaded permanently anyway.
But for hardware textures this is different. Due to the poor precaching it is impossible to selectively evict hardware textures that are not needed any longer, so for this an MRU cache is really needed so that they do not accumulate and congest the video RAM in the process.
2019-11-03 10:00:19 +01:00
e24b1e8903
- replaced all uses of xxhash with SuperFastHash.
...
That's one more third party dependency down.
Not only are two hashing algorithms redundant, there was also a large size discrepancy: SuperFastHash is 3 kb of source code while xxhash is 120kb and generally extremely awful code.
It was easy to make a choice here. None of the use cases require this kind of performance tweaking, the longest hashed block of data is a 768 byte palette.
2019-11-02 22:52:13 +01:00
3530c52264
- no need to have 2 CRC32 implementations.
...
Just let Bcrc32 point to zlib instead of having its own implementation.
2019-11-02 22:10:53 +01:00
cfbcf33c8c
- fixed CVAR saving.
...
- do not use snd_enabled for temporarily hacking the sound state. userConfig.noSound is better suited for such antics.
2019-11-02 21:21:48 +01:00
e35a5bac79
- fixed: 0 is a valid resource ID for Blood.
...
Unfortunately this means that looking up ID 0 can be a bit more costly than the rest because all ID-less entries in RFF files also use 0.
For other file types -1 is used.
2019-11-02 20:37:15 +01:00
dc9d75685e
- fixed keybind setup.
2019-11-02 20:13:00 +01:00
4cf62fca77
- do not load subdirectories of the game directory. They cannot contain anything useful because the original assets never used subdirectories.
...
- fixed RRRA game flags.
2019-11-02 19:12:01 +01:00
c5838df0c8
- fixed addition of main directory.
2019-11-02 18:46:11 +01:00
395ba5541c
- fixed startup and sound issues with Redneck Rampage.
2019-11-02 18:28:50 +01:00
63d4fc1e1b
- fixed flag parsing for grpinfo.
2019-11-02 18:03:41 +01:00
536c7d61a0
- Duke Nukem starts again.
...
Now for the other frontends.
2019-11-02 17:41:38 +01:00
d246ff1212
- fixed file system hasher.
2019-11-02 16:52:22 +01:00
e4ecc5d8df
- some reshuffling on OSD code.
...
* moved the binding commands to osd.cpp. They were in the global namespace already and this way everything to be tossed out is in the same place when the time comes.
* removed support for the OSDs native CVARs. The only ones left were some internal ones I won't need until this code can be replaced.
* same for the custpmization code the games added. Duke Nukem was the only one anyway to have a decent font for it.
2019-11-02 14:25:35 +01:00
906e56a2b1
- fixed some startup errors.
2019-11-02 13:27:40 +01:00
8fb54b51c3
- rewrote the screenshot code to use m_png as its backend.
...
Mainly to finally get rid of kplib. There's really no use to keep such code around if alternatives are already present.
2019-11-02 12:59:59 +01:00
edcfad6e11
- updated m_png.cpp from GZDoom.
2019-11-02 12:07:15 +01:00
f44d309558
- made some adjustments to the RFS parser for the file system.
...
It's still not active but now should produce correct results when working inside the file system.
What it is missing is a file scanner that picks the data it needs to process.
2019-11-02 10:20:32 +01:00
c54ae1be83
- removed the remaining parts of cache1d. The only thing left is the dummy cacheAllocateBlock function that needs to stick around until a working cache is present.
...
- disabled the user maps menu because it is hopelessly dependent on functionality that cannot be fixed. Better wait until the menu refactor to do it right - it'd be a waste of time fixing the current menus.
2019-11-02 01:30:21 +01:00
1149b4f4aa
- various fixes and improvements related to file location management:
...
* saving of demos and savegames no longer mindlessly writes to the mod directory. All such access is now being rerouted through the special paths interface so that the game data can reside in write protected locations.
* refactored all occurences of klistpath except fnlist_getnames.
* do not allow CON scripts to write to arbitrary files. This is a massive exploit and can be used to cause real damage if someone knows how to play this thing - it's far easier than people may think! It will now write any such data to a special section in the main config which is safe and cannot be manipulated to write to random locations on the hard drive.
2019-11-02 00:38:30 +01:00
cfca8060ba
- gutted cache1d. The old file system is gone, excepr for klistpath, which still gets used in a few places.
...
- consolidated the 3 identical S_OpenAudio implementations. The replacement code is disabled for the time being because it needs a rewrite. The replacement logic is uses is a bit too volatile.
- removed the old GRP scan code.
2019-11-01 22:17:15 +01:00
2d7c0e26d2
- cleanup of the old file system initialization.
...
The real fun part is yet to come, i.e. removing the remaining dependencies on the old file system code.
2019-11-01 19:25:42 +01:00
8d5e665caa
- various initialization related changes
...
* reroute several error conditions to I_Error.
* removed some soon-to-be obsolete GRP loading code.
* explicitly trigger the SetDefaults script events which depended on side effects from the config implementation.
* removed the nonsensical file system switch. All this does is create instabilities because it is non-obvious from where data is loaded. If a resource is mounted, it should be checked for content no matter what. While this may affect the stray weird mod out there it is a necessity if we want to allow transparent project repackaging.
2019-11-01 09:30:28 +01:00
67acad3984
- startup cleanup.
2019-11-01 00:32:56 +01:00
57f879fa8b
- moved the startup dialog out of the game front ends, now that there is a global cross-game list of playable configurations.
2019-10-31 23:25:21 +01:00
ba00fe4e66
- hooked up the file system with Blood's resource access.
2019-10-31 20:17:49 +01:00
d7e183d46d
- fixed compilation of file system code.
2019-10-31 18:06:05 +01:00
8ef40c5083
- merged most of Blood's resource manager into the file system
2019-10-31 17:13:48 +01:00
261af9e401
- rework of the file system code.
...
Made more efficient by basing the lookup on names, not strings and some additions for acting as a stand-in for Blood's resource manager.
2019-10-31 01:48:10 +01:00
693095bffb
- added access wrappers to the two fields of DICTNODE that are accessed from the outside.
...
The idea here is to completely merge the resource management into the file system so that Blood's DICTNODE is merely an alias to the internal FResourceLump.
A two-tiered resource system is not something I consider worthwile, it made sense to get around Builds crappy cache but in the long term this is not a good solution for a multi-game port to have a resource management system in the backend and another one put over it in the front end, both with their own caching logic that might interfere with each other. Better merge it into one that can handle everything.
2019-10-31 00:50:45 +01:00
c6753a3fec
- tested and fixed game list loader.
2019-10-31 00:41:56 +01:00
2a7beeff69
- cleaned out some chunks of unused or useless code, most importantly the Build cache which was only used by the sound code for permanently loading the data into memory.
2019-10-30 21:51:04 +01:00
5b1036093c
- fixed startup.
2019-10-30 19:55:03 +01:00
266dc9e04e
- added SW search paths to new code and cleaned up the init code.
2019-10-30 19:26:55 +01:00
ea10e01cc3
- adjustments for last commit.
2019-10-30 18:27:52 +01:00
418ec0d829
- adjustment to cherry-picked commit.
2019-10-30 18:21:59 +01:00
3e5d5a9a3d
- it's "loadgrp".
2019-10-30 18:09:38 +01:00
7f250fc3e8
- WIP on game data search.
2019-10-30 18:09:00 +01:00
5e76fd659a
- search path WIP.
2019-10-29 23:57:28 +01:00
b56dae0e9a
- changed path scanner to return only absolute paths and fixed the directory iterator to construct the proper path.
...
Also avoid collecting duplicate paths.
2019-10-29 21:06:14 +01:00
ac87665972
- use std::filesystem for directory traversal.
...
So far implemented for scanning search paths
2019-10-29 19:53:46 +01:00
35342526a5
- WIP search path code
...
The Steam/GOG path getters were taken out of the frontends.
This also switches the Windows directory reader touse the wide string version to get Unicode file names.
Some paths were added to the config file instead of hard coding them.
2019-10-29 01:00:44 +01:00
cfd9edbe71
- added the main FileSystem class.
2019-10-29 00:15:36 +01:00
82c844e405
- added GZDoom's resource management classes.
2019-10-28 23:46:15 +01:00
762f174743
- moved the command line parser out of the game frontends.
...
Some part are not done yet, and the file system data is currently ignored - there's no way to properly set this up with the file system code Build came with.
2019-10-28 22:19:50 +01:00
a72863112b
- fix compilation
2019-10-28 17:50:08 +01:00
21f6178ade
- avoid writing directly to a backend status variable
2019-10-28 07:10:56 +01:00
901b86577e
- more cleanup
...
Moving init code and key binding getter to backend
2019-10-28 07:05:32 +01:00
4f4fc1a8d4
- Cleanup
2019-10-28 07:02:42 +01:00
c589a6ab82
- replaced KEY_PRESSED globally
...
This was just a redundant name getting in the way.
2019-10-28 07:01:01 +01:00
065721c62b
- simplified the button state maintenance
...
This removes all unused parts of the implementation and moves the rest to the InputState class for easier replacement later. All MACT is doing now here is to call the UpdateStatus function, the internal workings are no longer relevant.
2019-10-28 07:00:31 +01:00
f8203ac766
- fixed the compile errors and consolidated the key binding CCMDs.
2019-10-28 06:47:49 +01:00
e7f75cbf4d
WIP
2019-10-28 01:12:31 +01:00
113b5d9037
- added an input state class which will contain all game-facing input data state.
...
Having this grouped in a single object will make refactoring a lot easier.
Access functions have been provided to avoid changing client code for the reorganization.
2019-10-28 00:24:09 +01:00
43da4b68a2
feature: show player names ( #234 )
...
# Conflicts:
# source/blood/src/config.cpp
# source/blood/src/config.h
# source/blood/src/menu.cpp
# source/blood/src/osdcmd.cpp
2019-10-27 22:24:30 +01:00
bfea07570a
- mapped the remaining Shadow Warrior options to the CVARs.
2019-10-27 16:53:00 +01:00
2e7ba30068
- a bit more config cleanup.
2019-10-27 14:09:56 +01:00
5386366ec4
- fix for last commit.
2019-10-27 13:48:03 +01:00
c0d5ca8ab8
- Config work almost done.
...
The only thing still referencing the old config file is Shadow Warrior's config read function.
2019-10-27 13:40:24 +01:00
038c1ba4ba
- more CVARs.
2019-10-27 09:53:09 +01:00
cdc5044f07
- converted noautoload and forcesetup flags to CVARs.
2019-10-27 09:38:55 +01:00
4b5ec2aabb
- transitioned the combat macros to the new config and made them independent for all games, so that everything can use the original text. (But considering that they are a multiplayer feature I'm not sure how much that is worth.)
...
- sort the config output alphabetically.
- do not use [=] as key names for the bindings.
2019-10-27 08:14:58 +01:00
249f6e9d62
- consolidated the joystick and mouse setup code.
2019-10-26 23:45:55 +02:00
Christoph Oelckers
Rachael Alexanderson
CommonLoon102