Kp
4b4077bab9
Fix template/helper confusion
...
Sync non-template types to make helper a better match. Rename helper to
clarify code flow for readers.
Reported-by: kreatordxx <https://github.com/dxx-rebirth/dxx-rebirth/issues/183 >
Fixes: ff67afd440
("Propagate partial_range up into PHYSFSX_findFiles family")
2016-03-06 18:11:20 +00:00
Kp
cc18ad2b68
Fix some -Wshadow warnings
2016-02-12 04:02:28 +00:00
Kp
1c04cb70d9
Change ogl_ubitmapm_cs constant -1 to const white
2016-02-12 04:02:28 +00:00
Kp
b57f08c798
Use partial_const_range
2016-02-12 04:02:28 +00:00
Kp
d8292300ab
Switch select_file_subfunction_t to anonymous template typedef
2016-01-29 04:05:47 +00:00
Kp
ff67afd440
Propagate partial_range up into PHYSFSX_findFiles family
2016-01-29 04:05:47 +00:00
Kp
7386094bc3
Rename menu macros to reduce token pasting
2016-01-09 16:38:17 +00:00
Kp
68a31121ee
Use menu macros for sound menu
2016-01-09 16:38:10 +00:00
Kp
679e0adf3d
Move SysAutoDemo to CArg
2015-12-24 04:01:27 +00:00
Kp
e0a88f4b7b
Move TexFilt to CCfg
2015-12-18 04:08:23 +00:00
zico
2e6dae1d8b
Abbreviated some text strings to make menus fit better into a 4x3 game window.
2015-12-14 15:32:42 +01:00
Kp
63ca0eb87b
Make respawn-on-fire configurable
...
Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/162 >
2015-11-21 18:12:13 +00:00
Kp
6111e5adbf
Allow configuring max joysticks at build time
2015-11-01 21:15:40 +00:00
Kp
545b71c1cc
Use enum class for kconfig subtype
2015-11-01 21:15:38 +00:00
Kp
7da64d3782
Add new autoselect-while-firing mode: "when firing stops"
...
Mako88 reports that some users want not to autoselect while firing, but
do not notice when a new weapon is added to the HUD, and end up never
activating a preferred weapon. Add a new autoselect mode that remembers
what would be selected and switches to it once the player ceases firing.
Changes since Mako88's proposed version:
- Use `enum class` for autoselection mode and a radio button to
represent the decision of Immediate/Never/Delayed.
- Handle delayed autoselect for vulcan ammo.
- Set Delayed_primary == Primary_weapon to indicate no change is needed,
rather than Delayed_primary==-1. This lets some paths use
Delayed_primary without checking for a magic value.
- Likewise Delayed_secondary / Secondary_weapon.
- Update Delayed_primary/Delayed_secondary when changing active
primary/secondary weapon, so that a player who changes weapons while
firing will automatically clear any deferred change.
Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/97 >
Based-on-patch-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/pull/147 >
2015-10-18 18:11:57 +00:00
Kp
a37bae4b4f
Track output size for PHYSFSX_getRealPath
2015-10-11 22:21:00 +00:00
Kp
85d9f1f3b0
Fix various issues from splitting sensitivity
...
Remove redundant undefine/redefine of helper macros.
Clean up loop conditional.
2015-10-03 17:17:49 +00:00
Christian
b09cb8f738
Merge pull request #145 from Mako88/calibration-menu
...
Split Sensitivity into Separate Menus (by Mako88/A Future Pilot)
2015-09-29 13:36:58 +02:00
zico
9292431396
Merge branch 'unification/master' of github.com:dxx-rebirth/dxx-rebirth into unification/master
2015-09-27 10:52:04 +02:00
zico
cbe0b4ec69
Added Cloak and Invulnerability Timers to Cockpit and Statusbar and made this feature optional (defaults to off)
2015-09-27 10:51:37 +02:00
Kp
230bc630ed
Store FriendMissileView inside MissileViewEnabled
...
This allows it to persist silently when configuration files are read and
rewritten by versions of Rebirth which do not understand
FriendMissileView.
2015-09-26 21:17:14 +00:00
zico
a175812000
Reworded text for Descent 1 bomb counter
2015-09-26 20:45:59 +02:00
zico
69353631f0
Made missile views from friendly players optional (off by default)
2015-09-26 20:28:49 +02:00
zico
db2ed6d766
Cleaned up options menu with clearer structure, added hud options under graphics menu and sorted existing items
2015-09-26 19:48:57 +02:00
John Ackerman
d5c580845e
Split Sensitivity into separate menus
2015-09-25 16:59:20 -05:00
zico
d3660207d2
Added Mouse Overrun Buffer option as proposed by kp
2015-09-24 16:31:10 +02:00
Kp
204b608fa6
Normalize MACH&&APPLE vs APPLE&&MACH
2015-09-13 20:23:05 +00:00
Kp
bda7fef3a0
Use get_local_player to compute reference to local player
2015-07-25 23:10:46 +00:00
Kp
f00725f740
Use forward-declaration header for player.h
2015-07-25 23:10:45 +00:00
Kp
d8f28a8767
Move Cfg::Grabinput to CCfg to improve code sharing
2015-07-18 21:01:56 +00:00
Kp
921276232f
Use range_for for player menu list
2015-07-18 21:01:55 +00:00
Kp
bbcdf9f7d2
Fix LTO -Wodr for GameCfg
2015-07-18 03:49:47 +00:00
Kp
e3308be8b9
Cache font LINE_SPACING
2015-06-13 22:42:22 +00:00
Kp
3905f1a668
Enable -Wcast-qual
2015-06-13 22:42:21 +00:00
John Ackerman
fe71a94d53
Implement Nonlinear Joystick Settings
...
[Kp: fix whitespace; squash fixes into main]
Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/pull/84 >
2015-06-11 01:41:26 +00:00
Kp
0ece005dfa
Use screen_mode for screen resolution
2015-05-14 02:23:13 +00:00
Kp
739879d701
Move input config menu to macro
2015-05-14 02:23:13 +00:00
Kp
cb873563c8
Move reticle menu to macro
2015-05-14 02:23:13 +00:00
Kp
e64e54f521
Move input sensitivity menu to macro
2015-05-14 02:23:13 +00:00
Kp
4ca7924907
Pass graphics_config_menuset items by userdata
2015-05-09 17:39:02 +00:00
Kp
a4ba74f94a
Expand void ternary operator into if/else
2015-05-09 17:39:02 +00:00
Kp
6792c1bc4b
Enable -Wunused-parameter
2015-04-26 20:15:56 +00:00
Kp
08ee591e21
Fix ODR collision between ui/file browser and main/menu browser
2015-04-22 02:44:30 +00:00
Kp
84c638ed64
Move PHYSFS_list_t to separate header
2015-04-19 04:18:49 +00:00
Kp
32b4b8f0bb
Use enum class for level save/load
2015-04-19 04:18:49 +00:00
Kp
55fada5c14
Fix texture filtering menu
...
Reported-by: derhass <https://github.com/dxx-rebirth/dxx-rebirth/issues/59 >
Fixes: a84a05c701
("Move graphics menu to macro")
2015-04-07 01:55:57 +00:00
Kp
66806e1f34
Enable -Wmissing-braces
...
clang includes it in -Wall, so add it for gcc
2015-04-02 02:36:52 +00:00
Kp
677e48bc7e
Warn when aspect ratio is ignored
2015-03-22 18:49:21 +00:00
Kp
627547371f
Improve change_res error checking
2015-03-22 18:49:21 +00:00
Kp
7bf49fe551
Fix clang -Wmissing-braces warnings
2015-03-22 18:49:21 +00:00
Kp
ac39b6cb40
Fix -Wunused-variable warning in sound_menuset for !USE_SDLMIXER
...
Only cache citem if USE_SDLMIXER. It is unused if !USE_SDLMIXER.
Fixes: cc508be34c
("Pass selection for EVENT_NEWMENU_SELECTED")
2015-03-15 18:45:53 +00:00
Kp
b69a9438a7
Fix SDL graphics menu build failure
...
Fixes: a84a05c701
("Move graphics menu to macro")
2015-03-11 02:19:15 +00:00
Kp
a84a05c701
Move graphics menu to macro
2015-03-07 17:20:41 +00:00
Kp
d39d765208
Move sandbox menu to macro
2015-03-07 17:20:41 +00:00
Kp
1762470b3a
Move options menu to macro
2015-03-07 17:20:40 +00:00
Kp
81eae187e5
Pass selection for EVENT_NEWMENU_CHANGED
2015-02-28 22:34:07 +00:00
Kp
cc508be34c
Pass selection for EVENT_NEWMENU_SELECTED
2015-02-28 22:34:07 +00:00
Kp
03576a28c2
Pass PHYSFSX_* file extensions as counted array
2015-02-14 22:48:28 +00:00
Kp
dc8b88eed4
Convert various loops to range_for
2015-02-14 22:48:27 +00:00
Kp
18a64e4281
Use RAII for PHYSFS_enumerateFiles result
2015-01-23 03:55:05 +00:00
Kp
3817394b79
Simplify demo_menu_handler
2015-01-23 03:55:05 +00:00
Kp
c6664a45a6
Add newmenu_do helper for array<newmenu_item, N>
2015-01-18 01:58:32 +00:00
Kp
6e0464a58c
Pass nm_set_item_slider arg by &
2015-01-18 01:58:32 +00:00
Kp
426fb16654
Pass nm_set_item_radio arg by &
2015-01-18 01:58:31 +00:00
Kp
fa10e51999
Add helper nm_item_text
2015-01-18 01:58:31 +00:00
Kp
4705c3f2d8
Pass nm_set_item_checkbox arg by &
2015-01-18 01:58:31 +00:00
Kp
f8163957ef
Add helper nm_item_input
2015-01-18 01:58:31 +00:00
Kp
67e503b9b7
Add helper nm_item_menu
2015-01-18 01:58:31 +00:00
Kp
b3050a8aa1
Fix adding string to empty string_array_t
2015-01-17 18:31:42 +00:00
Kp
28a31a223f
Centralize window_close calls
2015-01-17 18:31:41 +00:00
Kp
4984f46ef4
Pass window_set_visible arg by &
2015-01-17 18:31:41 +00:00
Kp
0dd3f1bdfc
Fix !SDLMIXER build
2015-01-03 23:44:32 +00:00
Kp
030a811661
Pass nullptr for Descent 1 state_save_all filename_override
2014-12-30 02:09:23 +00:00
Kp
628156dbf7
Use array<ntstring> for CMMiscMusic
2014-12-22 04:35:48 +00:00
Kp
c7ae54c62a
Use ntstring for CMLevelMusicPath
2014-12-22 04:35:47 +00:00
Kp
1344fb2779
Fix crash choosing jukebox directory
...
newmenu_listbox1 returns immediately
2014-12-22 04:35:47 +00:00
Kp
2b2da39d84
Fix unique invocation in string_array_t tidy
2014-12-20 04:36:11 +00:00
Kp
5aed22bfce
Centralize Windows drive change text
2014-12-20 04:36:11 +00:00
Kp
664e8abaac
Fix !SDLMIXER build
...
Fixes: bd1c6d8c5d
2014-12-11 02:35:03 +00:00
Kp
1b924c5dd3
Truncate pilot name at null
2014-12-06 23:13:38 +00:00
Kp
355df375a0
Pass gr_bitmap arg as &
2014-12-02 03:35:01 +00:00
Kp
166f15617d
Pass ogl_ubitmapm_cs arg by &
2014-11-30 22:09:18 +00:00
Kp
6c79770b1c
Remove useless build-breaking assignment on Win32
2014-10-19 17:19:55 +00:00
Kp
6d292d3b47
Remove cast of list_dir_el
2014-10-17 01:59:12 +00:00
Kp
e7e23eb92e
Make unused_window_userdata_t const
2014-10-16 02:30:29 +00:00
Kp
7c76c68255
Make unused_newmenu_userdata_t const
2014-10-16 02:13:09 +00:00
Kp
a8f853aa7a
Pass d_event arg by const&
2014-10-04 22:36:13 +00:00
Kp
2ad59572e0
Use vector to manage string array memory
2014-09-29 00:02:43 +00:00
Kp
703f60ac3f
Fix -Wtype-limits warnings
2014-09-21 21:41:55 +00:00
Kp
d41883c771
Remove unused variables to calm clang
2014-09-02 22:11:22 +00:00
Kp
7f6299aaa7
Use built-in __linux__ instead of custom __LINUX__
2014-09-02 22:10:34 +00:00
Kp
8d835f8e34
Reduce inclusion of compiler-begin.h
2014-08-24 03:36:35 +00:00
Kp
4acbb40ad7
Use enum for window event result
2014-08-07 02:47:48 +00:00
Kp
13b233b7d7
Fix Windows build
2014-07-26 22:53:41 +00:00
Kp
d3d457cf19
Pass array<> to gr_list_modes to preserve size information
2014-07-17 03:29:57 +00:00
Kp
44d1924e96
Use special type for player callsign
2014-07-05 19:20:56 +00:00
Kp
11cbbf66fc
Fix Win32 newmenu_do build failure
2014-06-28 03:54:36 +00:00
zico
ad7cb106bc
Changed custom D1X license to GPLv3
2014-06-01 19:55:23 +02:00
vobject
1b54c54c58
Fix uninitialized valiable when compiling DEMO_ONLY
2014-01-07 21:58:47 +01:00
Kp
073f00974a
Eliminate uses of the typedef struct X { ... } X; pattern
...
C++ does not require this pattern.
import re, fileinput
to = re.compile(r'^typedef struct ([a-z_A-Z]+)\s*{')
tc = re.compile(r'^}(.*?)\s*([a-z_A-Z]+);$')
osn = None
for line in fileinput.input(inplace=True):
m = to.match(line)
if m:
osn = m.group(1)
print 'struct %s\n{' % osn
continue
if osn:
m = tc.match(line)
if m:
csn = m.group(2)
if osn == csn:
print '}%s;' % m.group(1)
osn = None
continue
else:
osn = None
print line,
2013-12-28 22:48:07 +00:00
Kp
2bad2375bb
Add type checking for select_file_recursive
2013-12-17 04:01:21 +00:00
Kp
38a5c03d5d
Add type checking for newmenu_listbox
2013-12-17 03:58:17 +00:00
Kp
92e8cb7a31
Add type checking to newmenu subfunction userdata
2013-12-15 21:54:38 +00:00
Kp
cea46651fc
Check type of window handler function
2013-12-15 18:51:26 +00:00
Kp
cb4fd7c1b4
Compact known file extension storage
2013-12-13 03:58:01 +00:00
Kp
4dfceab50b
Factor out file extension filtering
2013-12-13 03:51:14 +00:00
zico
e195290fe4
Added quick load ability for savestates
2013-12-10 18:13:32 +01:00
Kp
af5ff85286
Move drive letter newmenu_item onto select_file_handler stack
2013-12-08 18:26:19 +00:00
Kp
fddcfc8e99
Fix technical buffer overrun in drive letter selection
...
Padding makes this safe, but moving onto the stack is cleaner.
2013-12-08 18:26:19 +00:00
Kp
1d3395cad1
Improve strlen usage
2013-12-06 00:24:07 +00:00
Kp
4469ff36c0
Manage movie subtitles automatically
2013-11-09 17:45:21 +00:00
Kp
2714679284
Mark private functions static
2013-11-02 04:23:55 +00:00
Kp
e663767201
Move similar/main/menu.c -> similar/main/menu.cpp
2013-10-20 22:49:12 +00:00