Kp
9d4a55ae47
Move fvi globals into anonymous namespace
2015-10-03 17:17:49 +00:00
Kp
e2c6e8449f
Factor out cloak/invul timer display
2015-10-03 17:17:49 +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
Kp
aa1a1c5a6a
Fix regressions from changes to advanced host menu
...
Non-static globals were initialized at wrong scope, leading to netgame
duplicate options being forgotten across program restart.
Netgame.DuplicatePowerups is not initialized until well after global
initialization runs.
Literal strings were copied into a local buffer. Replace with a pointer
to the appropriate literal string.
Fixes: aa9a5df0d4
("Rearrange Advanced Hosting Menu")
2015-10-03 17:17:49 +00:00
Kp
271c465a7c
Use <algorithm> for adjust_segment_limit
2015-10-03 17:17:49 +00:00
Kp
d4df692d30
Use range_for in draw_all_edges
2015-10-03 17:17:49 +00:00
Kp
a6d6eceea3
Reduce indirection in automap drawingListBright
2015-10-03 17:17:48 +00:00
Kp
bf52ebf4cd
Skip do_weapon_n_item_stuff if Player_is_dead
...
Fixes: 29aa820dc0
("Only respawn when the player presses fire")
2015-09-30 02:41:55 +00:00
derhass
85691b3784
Restore inclusion of byteutil.h in similiar/3d/interp.cpp
...
4a84320817b9e02f86f3ec2dd2678e3367cddcc removed lots of inclusions of
byteutil.h in various source files. However, when building with
WORDS_NEED_ALIGNMENT, interp.cpp makes use of the INTEL_SHORT and
GET_INTEL_SHORT macros defined there.
Fixes: c4a8432081
("Remove WORDS_NEED_ALIGNMENT memcpy src cast to const uint8_t*")
2015-09-29 18:36:01 +00:00
Christian
ab85c6f0e9
Merge pull request #144 from Mako88/new-menu
...
Rearrange Advanced Hosting Menu (by Mako88/A Future Pilot)
2015-09-29 13:41:12 +02: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
708372a148
Included compiler-range_for.h into joy.cpp to fix compiler error of undefined range_for
2015-09-29 12:02:49 +02:00
zico
a96ceb2a46
Enabled multi_do_ranking() for D1X
2015-09-29 11:58:42 +02:00
Kp
9642a4c31d
Close SDL joystick handles at shutdown
2015-09-29 02:41:22 +00:00
Kp
e5dff6d63f
Use array<> for d_physical_joystick hat_map, button_map
2015-09-29 02:41:22 +00:00
Kp
46bbdd43af
Move Joystick.n_axes, Joystick.n_buttons into local scope
2015-09-29 02:41:22 +00:00
Kp
edccaa91f6
Check return of pick_connected_segment before use
2015-09-29 02:41:22 +00:00
Kp
6224b53581
Use operator?: for flash_cursor gr_set_fontcolor
2015-09-29 02:41:22 +00:00
Kp
43d634a4aa
Use operator?: for newmenu_draw gr_string strings
2015-09-29 02:41:22 +00:00
Kp
50f672ba34
Reuse computed string length
2015-09-29 02:41:22 +00:00
Kp
0c0c93ca34
Refactor gr_string clipping checks
2015-09-29 02:41:22 +00:00
Kp
3d37b01177
Refactor draw_numerical_display
2015-09-29 02:41:22 +00:00
Kp
af949820b6
Use ?: for show_bomb_count gr_set_fontcolor
2015-09-29 02:41:22 +00:00
Kp
574555029f
Simplify sb_show_score sprintf
2015-09-29 02:41:22 +00:00
Kp
78926b0aa8
Simplify con_draw while loop condition
2015-09-29 02:41:22 +00:00
Kp
d9cef82f81
Allow nullptr for gr_get_string_size
2015-09-29 02:41:22 +00:00
Kp
71ffbdf719
Replace fill(0) with ={}
2015-09-29 02:41:22 +00:00
Kp
c45a8a8427
Override PRIi64 on Win32 also
...
Some outdated mingw32 headers also set the POSIX value when used on
Windows. Expand the override to force the non-standard Microsoft format
for all Windows platforms.
2015-09-29 02:41:22 +00:00
Kp
f37e55737c
Shorten secondary calls to Git.pcall
2015-09-29 02:41:22 +00:00
Kp
433b80c0b3
Reduce copying of pkg-config result
2015-09-29 02:41:22 +00:00
John Ackerman
0e73b2a209
Revert "Change friendly fire wording"
...
This reverts commit 8128d68e3d
.
2015-09-27 12:40:14 -05: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
1a8fad28cb
Add basic instructions on building Rebirth
2015-09-26 21:17:14 +00:00
Kp
35cd1261df
Respect autoselect order for granted items
...
Additionally, improve handling of Primary_last_was_super. Previously,
it was cleared to 0, which made sense if the ship starts with only
lasers. Now that the ship can start with other weapons, clearing
Primary_last_was_super to 0 may override a player's choice. Preserve
player's last-was-super choice when the grant gives both the base and
super forms of a weapon.
Requested-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/140 > [for the Primary_weapon part]
2015-09-26 21:17:14 +00: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
Kp
e2d16844a8
Fix handling of pch_cpp_assume_unchanged
2015-09-26 21:17:14 +00:00
Kp
80e98ce2d3
Fix invalid access reading demos
2015-09-26 21:17:14 +00:00
Kp
f3470cef5f
Show tool versions in sconf output
2015-09-26 21:17:13 +00:00
Kp
51a86c62ef
Hide undocumented options
...
If no help text is defined, hide the associated option from --help.
2015-09-26 21:17:13 +00:00
Kp
0b242833f5
Always set StaticSubprocess.stdout to PIPE
2015-09-26 21:17:13 +00:00
Kp
ad14362db0
Simplify do_invulnerable_stuff
2015-09-26 21:17:13 +00:00
Kp
de3575a647
Shorten fuelcen_check_for_goal
2015-09-26 21:17:13 +00:00
Kp
39bf7c2206
Simplify apply_damage_to_controlcen time calculation
2015-09-26 21:17:13 +00:00
Kp
467c82ec31
Cache get_local_player in ai.cpp
2015-09-26 21:17:13 +00:00
Kp
bec81b2e62
Cache get_local_player in do_escort_frame
2015-09-26 21:17:13 +00:00
Kp
5d902ad361
Shorten drop_stolen_items
2015-09-26 21:17:13 +00:00
Kp
b87db8d9e8
Factor out thief message call
2015-09-26 21:17:13 +00:00
Kp
d6059a3abf
Rework pickup of weapon powerups
2015-09-26 21:17:12 +00:00
Kp
d971cf7702
Wrap game-specific types in game-specific preprocessor guards
...
These types are not used in common code, and in some cases would provoke
a -Wodr warning if they were used.
2015-09-26 21:17:12 +00:00