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
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
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
80e98ce2d3
Fix invalid access reading demos
2015-09-26 21:17:14 +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
d6059a3abf
Rework pickup of weapon powerups
2015-09-26 21:17:12 +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
John Ackerman
8128d68e3d
Change friendly fire wording
2015-09-25 16:52:41 -05:00
John Ackerman
aa9a5df0d4
Rearrange Advanced Hosting Menu
2015-09-25 15:31:42 -05:00
zico
f8f9843f35
Mouse overrun improvements: Reduced the range of Overrun (from 32 to 16) based on feedbach and restored original mouse base divisor for mouse X/Y axes (changed in 5a36ffdb17
)
2015-09-25 12:07:30 +02:00
zico
d3660207d2
Added Mouse Overrun Buffer option as proposed by kp
2015-09-24 16:31:10 +02:00
Kp
609e6ca584
Flip direction of bit scan
...
Fixes: b1c112d121
("Fix -Og -Wuninitialized warning in gr_internal_string_clipped_template")
2015-09-24 03:05:16 +00:00
Kp
3c29742698
Flip direction of bit scan
...
Fixes: fc5611dc77
("Fix -Og -Wuninitialized warning in gr_internal_string0_template")
2015-09-24 03:05:16 +00:00
Kp
da4d1e0670
Remove bool SysNoHogDir on non-unix
2015-09-22 02:28:38 +00:00
Kp
80f47ec7d9
Cache PHYSFS writedir/separator
2015-09-22 02:28:38 +00:00
Kp
f9469ffe18
Fix clang warning for powerup caps
2015-09-22 02:28:38 +00:00
Kp
c0e7f70638
Update reactor life text as slider moves
...
Reported-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/125 >
2015-09-22 02:28:38 +00:00
zico
b984243d8e
Fixed a bunch of uninitialized object variables Valgrind complained about
2015-09-20 19:24:25 +02:00
Kp
fcab519693
Remove extern for vms_vector_swap
...
It is only used in the interpreter.
2015-09-19 23:04:36 +00:00
Kp
7673bba50d
Factor out special handling of super laser
2015-09-19 23:04:36 +00:00
Kp
155cd3c928
Remove literal snprintf
2015-09-19 23:04:35 +00:00
Kp
69e3762933
Return joystick axis values by reference
2015-09-19 23:04:34 +00:00
zico
41983dc051
Reworked Advanced Netgame Menu to fit on all possible resolutions and added tracker address to seperate line as newmenu does not really like \n (yet)
2015-09-17 13:55:19 +02:00
Kp
2f927c68f9
Improve support for using exact_type with valptridx
2015-09-15 02:48:04 +00:00
Kp
1cdd4ac2ce
Pass object & to [gs]et_*_id
2015-09-15 02:48:04 +00:00
Kp
be62f446f1
Use range_for for clear_stuck_objects
2015-09-15 02:48:03 +00:00
Kp
ff8aab4694
Move guided missile logic to helper function
...
Fix original bug that tested wrong field for guided missile signature
check.
2015-09-15 02:48:03 +00:00
Kp
3823f0f414
Fix spelling errors in help text
...
keymoard -> keyboard
immedaitely -> immediately
2015-09-13 21:02:19 +00:00
Kp
cd0b3965a4
Use little endian for control center triggers
2015-09-13 21:02:19 +00:00
Kp
888cfddabd
Combine gauges left/right window boxes
2015-09-13 21:02:19 +00:00
Kp
b1c112d121
Fix -Og -Wuninitialized warning in gr_internal_string_clipped_template
2015-09-13 21:02:19 +00:00
Kp
fc5611dc77
Fix -Og -Wuninitialized warning in gr_internal_string0_template
2015-09-13 21:02:19 +00:00
Kp
83f77fbc48
Use fill_n to store runs of cockpitbuf TRANSPARENCY_COLOR
2015-09-13 21:02:19 +00:00
Kp
c4a8432081
Remove WORDS_NEED_ALIGNMENT memcpy src cast to const uint8_t*
...
The cast provokes a warning on systems that require alignment, so remove
it. memcpy takes const void* input, so the cast is unnecessary.
Reported-by: MattWatt <https://github.com/dxx-rebirth/dxx-rebirth/issues/119 >
2015-09-13 21:02:19 +00:00
Kp
204b608fa6
Normalize MACH&&APPLE vs APPLE&&MACH
2015-09-13 20:23:05 +00:00
zico
e0785251c4
Reset homing_object_dist along with d_homer_tick_step instead of every frame to make sure lock indicator is visible in frames where homers wait for a new chance to turn; Also moved call of calc_d_tick() to calc_frame_time() - shouldn't be nested in calc_d_homer_tick()
2015-09-10 14:11:30 +02:00
zico
cbaac96324
Fixed (hacked) homing missiles fired by bots that would not track players if player with lowest objnum is dead
2015-09-10 13:19:34 +02:00
zico
6ba89b5abd
If sending robot fire of a non-controlled robot, send fire packet immediately (as the comment suggests); also reformatted robot fire send/do functions to improve readability a bit
2015-09-10 13:05:10 +02:00
Kp
bdbd56c024
Use C++ <cinclude> style
2015-09-09 03:27:52 +00:00
zico
4a562bf098
Added multi_send_theif_frame() function to update thief bot more frequently (by PPS) and even if it is not controlled by a player to counter discrepancies caused by client side AI movement of the bot
2015-09-03 15:13:56 +02:00
zico
51049794ce
Break screenshot numbering on 9999 instead of 99999 due to formatting of the string (it's still enough)
2015-09-01 19:06:14 +02:00
zico
dcd91636d8
Do not duplicate objects for latecoming players as they will get dups from the host
2015-09-01 19:00:33 +02:00
zico
1aeb8505ee
Rearranged some calls of start_time() and stop_time() (+ limited usage to single functions) to make sure time_paused does not go out of balance
2015-08-30 14:04:59 +02:00
zico
818017398d
Added a little failsafe to screenshot function to make sure the game will not cause an endless loop if savenum ever rolls over
2015-08-30 12:47:47 +02:00
zico
b5ac86c4f0
Slightly modified keyboard pitch and heading sensitivity so highest setting matches the original game running at ~60 FPS
2015-08-29 15:46:03 +02:00
zico
15757d552f
Added STATE_MATCEN_VERSION for reading/writing matcen_info in savestates (equal to GAME_VERSION) instead of using STATE_VERSION
2015-08-27 18:55:14 +02:00
Kp
fd5d7b800d
Move reactor gun loop into calc_controlcen_gun_point
2015-08-26 03:15:10 +00:00
Kp
d3ca71c8d0
Inline get_num_reactor_models
2015-08-26 03:15:10 +00:00
Kp
4434559e8e
Write old matcen_info to D1 savegames
...
Fixes: 92814475a9
("Use array<> for RobotCenters")
2015-08-26 03:15:10 +00:00
Kp
9ed4754009
Remove typedef valptridx<T>::array_managed_type managed_type##_array_t
2015-08-22 20:43:04 +00:00
Kp
cc0e29d7a2
Blank out non-robot AI on save
2015-08-22 20:43:04 +00:00
Kp
2155c417cb
Move array_managed_type into valptridx<T>
2015-08-22 20:43:04 +00:00
Kp
f8008ca34f
Only define object_array_t::object_array_t if VALGRIND
2015-08-22 20:43:04 +00:00
Kp
e976a823df
Shorten paging_touch_robot_maker
2015-08-22 20:43:03 +00:00
Kp
0f4d38ea6d
Shorten paging_touch_robot
2015-08-22 20:43:03 +00:00
Kp
6a50a904a3
Shorten paging_touch_weapon
2015-08-22 20:43:03 +00:00
Kp
9bf8b8212d
Shorten paging_touch_model
2015-08-22 20:43:03 +00:00
Kp
6265431fd9
Pass & to paging_touch_vclip
2015-08-22 20:43:03 +00:00
Kp
423c1c3f10
Use range_for for fuelcen.cpp
2015-08-22 20:43:03 +00:00
Kp
64ff1cda89
Only restore non-alpha when alpha was used
2015-08-21 03:12:35 +00:00
zico
30e909226f
Fixed Primary weapon info position in HiRes cockpit mode; Removed redundant vulcan ammo display in Fullscreen Alt HUD #1
2015-08-18 19:17:24 +02:00
Kp
66da9c136e
Cache do_explosion_sequence Robot_info lookups
2015-08-17 02:44:56 +00:00
Kp
080e052d65
Reorder fvi_sub object tests
...
Change to individual continue statements to reduce number of negations.
2015-08-17 02:44:56 +00:00
Kp
2eeca09ae1
Improve create_smart_children
...
Use accurate squared distance instead of quick non-squared distance.
Simplify target choice loop.
2015-08-17 02:44:56 +00:00
Kp
947145a194
Simplify player-got-hit sound check
2015-08-17 02:44:56 +00:00
zico
fb6ea072e4
Repositioned (non Release) HUD level time output and FPS counter to fixed positions across all cockpit modes; Slight reformat for FPS counter and added FrameTime display (in ms) if -verbose is given
2015-08-16 15:37:30 +02:00
zico
57b4bd0281
Community wish: If friendly fire is disabled, also protect players from explosion damage caused by friendly players. This also protects against splash damage caused by oneself.
2015-08-16 13:25:07 +02:00
Kp
be3ab3bd81
Use range_for in PHYSFSX_checkMatchingExtension
2015-08-14 03:02:04 +00:00
Kp
655e7b6f72
Optimize clearing ConsoleObject anim_angles
2015-08-14 03:02:04 +00:00
Kp
e5683593ef
Expand ZERO_VECTOR inline
2015-08-13 03:15:53 +00:00
Kp
5922d3cf9e
Update endlevel !SHORT_SEQUENCE code
...
This rotted long ago, but the fixes are easy. Clean it up in case
someone wants to activate it.
2015-08-13 03:15:52 +00:00
Kp
c4118ee014
Improve caching when duplicating items
2015-08-13 03:15:52 +00:00
Kp
17b1943c5e
Mark various per-file structures as static
2015-08-12 03:11:46 +00:00
Kp
bc7c469ab2
Use array<> for more globals
2015-08-12 03:11:46 +00:00
Kp
fa9f2e626d
Move DbgShowMemInfo to CArg
...
Members of Arg are not visible to common code, so common/mem/mem.cpp
broke during the -Wodr cleanup.
Reported-by: zicodxx <https://github.com/dxx-rebirth/dxx-rebirth/issues/114 >
Fixes: 6bd93e466f
("Guard args.h for LTO -Wodr")
2015-08-11 03:05:55 +00:00
Kp
f15116f2cb
Simplify multiplayer sound handling
2015-08-05 02:59:02 +00:00
Kp
6870b48710
Remove unused return value of digi_link_sound_to_object*
2015-08-05 02:59:02 +00:00
Kp
9fb9aef509
Remove unused return value of digi_link_sound_to_pos
2015-08-05 02:59:02 +00:00
Kp
c80d12319a
Use unqualified begin/end
...
Most call sites use unqualified begin/end and rely on using declarations
to pick an appropriate implementation. Fix the sites that explicitly
requested std::begin/std::end.
2015-08-03 03:11:25 +00:00
Kp
49b0868230
Fix ambiguous return when constructor inheritance is missing
...
gcc-4.7 (and, if constructor inheritance is suppressed, later versions)
reject
return objnum == object_none ? vcobjptr(static_cast<objnum_t>(object_first)) : objnum;
where objnum is a cobjptridx:
similar/main/digiobj.cpp: In lambda function:
similar/main/digiobj.cpp:564:85: error: operands to ?: have different types 'valptridx<object>::vcptr' and 'valptridx<object>::cptridx'
similar/main/digiobj.cpp:564:85: error: inconsistent types '<type error>' and 'valptridx<object>::vcptr' deduced for lambda return type
Fix it by removing the ternary operator and adding an appropriate
conversion cast.
2015-08-03 03:11:25 +00:00
Kp
555ff20ae9
Move render_state.h up for gcc-4.7 static_assert
...
In gcc-4.7, <bits/hashtable.h> uses static_assert in a way that the
preprocessor considers to have 3 arguments. Move render_state.h up to
ensure that <bits/hashtable.h> is included before
"compiler-static_assert.h" converts static_assert into a 2 argument
macro.
2015-08-03 03:11:25 +00:00
Kp
2fb03da475
Inline multi_send_endlevel_start secret for D2
2015-08-03 03:11:25 +00:00
Kp
84bd64a14c
Remove default argument for basic_ptridx(magic,array)
2015-07-29 03:05:28 +00:00
Kp
4d8ae44794
Add helper macro DXX_CONSTANT_TRUE
2015-07-29 03:05:28 +00:00
Kp
a2816617fe
Pass reactor& to read_model_guns
2015-07-25 23:10:48 +00:00
Kp
c9dff229f1
Remove dead AI fire leading code
2015-07-25 23:10:47 +00:00
Kp
9a5654e002
Move similar/editor/autosave.cpp -> common/editor/autosave.cpp
2015-07-25 23:10:47 +00:00
Kp
c942d28197
Use accessor for grs_bitmap::bm_type
2015-07-25 23:10:47 +00:00
Kp
37a830f400
Switch AI key lookup
2015-07-25 23:10:46 +00:00
Kp
b8cc2f4172
Inline multi_i_am_master
2015-07-25 23:10:46 +00:00
Kp
81abf3666b
Reorder hoard kill tests
2015-07-25 23:10:46 +00:00