Christoph Oelckers
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
Christoph Oelckers
aed05840ae
- removed the mouseInactiveConditional interface function.
...
This was only a crutch to let the input interface work with the original menus.
Now that the one in Blood is gone, all the conditions are no longer relevant. (Shadow Warrior never got far enough to implement this)
2019-12-01 10:31:44 +01:00
Christoph Oelckers
5d0d37df25
- disconnected Blood's menu.
...
This is due for replacement next.
2019-12-01 10:18:38 +01:00
Christoph Oelckers
55ba1116ec
- fixing the last commit.
2019-12-01 09:03:51 +01:00
Christoph Oelckers
8a98f9b3ca
- removed quitevent.
...
This was some meticulously preserved relic of bad old DOS times used to block OS facilities to close an app.
Since this has been worked around at a lower level already the variable was essentially without function but some quite bad code depended on it.
2019-12-01 09:02:17 +01:00
Christoph Oelckers
d8c74a8b00
- don't show the map name when the menu is active
...
Since it uses the same font this causes ugly visual clashes.
2019-12-01 08:25:24 +01:00
Christoph Oelckers
c36402eb5c
- fixed savegame validation and recursive ticker calls.
2019-11-30 23:33:04 +01:00
Christoph Oelckers
41b116e2f2
- save menu in Duke Nukem is working.
2019-11-30 22:46:00 +01:00
Christoph Oelckers
2a9e4fca46
WIP safety commit
2019-11-30 19:23:54 +01:00
Christoph Oelckers
d5c3991c2e
- fixed compile errors in menu code.
2019-11-30 10:03:20 +01:00
Christoph Oelckers
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
Christoph Oelckers
79ce4563eb
- fixed game resuming when closing the load and save menus.
2019-11-30 01:03:14 +01:00
Christoph Oelckers
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
Christoph Oelckers
0cedad6390
- started work on load/save menus.
2019-11-29 00:37:19 +01:00
Christoph Oelckers
1f1b927b6b
- fixed a few issues.
2019-11-28 20:11:27 +01:00
Christoph Oelckers
59ebb10512
- fixed compilation and unhooked the Redneck Rampage menu so that it can be replaced.
2019-11-28 19:35:35 +01:00
Christoph Oelckers
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
Christoph Oelckers
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
Christoph Oelckers
d569cd76c1
- cleanup of sound code - removal of the cache lock
...
This has been inoperable for a long time and by now the cache is entirely gone.
2019-11-28 02:36:34 +01:00
Christoph Oelckers
f62611e90d
- cleaned out a large chunk of menus.cpp
...
… leaving only the parts still needed for reference.
2019-11-28 01:49:50 +01:00
Christoph Oelckers
b12377962a
- moved the game interface function to d_menu
2019-11-28 01:30:24 +01:00
Christoph Oelckers
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
Christoph Oelckers
ef3ad690da
- initial work on credits screens.
2019-11-28 00:02:36 +01:00
Christoph Oelckers
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
Christoph Oelckers
8492e3c67a
- migrated SW's savegame code to the same containers as the other front ends.
...
Fortunately everything here was wrapped in macros so that it was relatively simple to change.
2019-11-27 19:31:58 +01:00
Christoph Oelckers
3bb46a4d8d
Merge branch 'master' into menu_for_real
2019-11-27 18:04:44 +01:00
hendricks266
7698f73b55
Fix tautological comparison in savegame.cpp
...
git-svn-id: https://svn.eduke32.com/eduke32@8314 1a8010ca-5511-0410-912e-c29ae57300e0
2019-11-27 18:01:57 +01:00
Christoph Oelckers
a4a4b230fd
- deleted a large batch of code from the menu that is no longer needed.
2019-11-27 17:58:14 +01:00
Christoph Oelckers
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
Christoph Oelckers
3b7aa74c27
- connecting the dots in the menu. Duke Nukem can now start a level.
2019-11-26 23:20:54 +01:00
Christoph Oelckers
0f4d80b5d3
Merge branch 'master' into menu_for_real
2019-11-26 19:19:21 +01:00
hendricks266
348ccdfd5b
Templatize the branchless negation method used for GV_FLAG_NEGATIVE
...
git-svn-id: https://svn.eduke32.com/eduke32@8312 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/build/include/compat.h
2019-11-26 18:09:00 +01:00
hendricks266
a51e91d4e9
SW: Fix keyboard input
...
git-svn-id: https://svn.eduke32.com/eduke32@8303 1a8010ca-5511-0410-912e-c29ae57300e0
# Conflicts:
# source/duke3d/src/config.cpp
# source/duke3d/src/menus.cpp
# source/mact/include/control.h
# source/mact/src/control.cpp
# source/sw/src/config.cpp
# source/sw/src/menus.cpp
2019-11-26 18:03:13 +01:00
Christoph Oelckers
6782d817b7
- reformatting and deletion of unused code.
2019-11-26 17:43:31 +01:00
Christoph Oelckers
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
Christoph Oelckers
a74a670c99
-- more work on the menu - episode and skill menus are working in DN3D.
2019-11-25 23:21:51 +01:00
Christoph Oelckers
d73f915c66
- episode menu setup.
2019-11-25 18:41:39 +01:00
Christoph Oelckers
556c61b60b
- fixed compile errors.
...
(Include dependencies suck, it's time for modules to become an option.)
2019-11-25 17:19:48 +01:00
Christoph Oelckers
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
Christoph Oelckers
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
Christoph Oelckers
28a05422fc
Merge branch 'master' into menu_for_real
2019-11-24 22:31:53 +01:00
Christoph Oelckers
42b3d12630
- Ion Fury's main menu now looks correct.
2019-11-24 22:31:27 +01:00
Christoph Oelckers
a4fcf9ee2b
- fixed savegame writing for Ion Fury.
...
The composite's writers may not be deleted, they are needed for creating the final savegame file.
2019-11-24 21:21:15 +01:00
Christoph Oelckers
57b542671c
- Ion Fury main menu fixes.
2019-11-24 20:40:53 +01:00
Christoph Oelckers
a96f1b25f7
- fixed recursion issue with menu and CON scripting.
...
Curse all those busy loops in the engine.
2019-11-24 17:52:54 +01:00
Christoph Oelckers
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
Christoph Oelckers
326d0f5f76
- the new menu displays something.
2019-11-23 17:50:36 +01:00
Christoph Oelckers
9529adb3e1
- font tables moved.
2019-11-23 12:41:13 +01:00
Christoph Oelckers
f2fc3fc2cb
- WIP commit.
2019-11-23 12:38:38 +01:00
Christoph Oelckers
ceb07280cf
- more work on the menu.
...
Duke Nukem's menu title is getting rendered.
2019-11-22 22:52:11 +01:00