Kp
68a31121ee
Use menu macros for sound menu
2016-01-09 16:38:10 +00:00
Kp
410b09a330
Expand macro Player_exploded
2016-01-09 16:38:10 +00:00
Kp
7c8b36ec1d
Use automatic cleanup of GL client state
2016-01-09 16:38:10 +00:00
Kp
47190be8e9
Fold Player_exploded into Player_dead_state
2016-01-09 16:38:10 +00:00
Kp
608cfdbf07
Combine Mission::enhanced with Mission::descent_version
2016-01-09 16:38:09 +00:00
Kp
0c0dff9def
Fix fvi sqrt
...
A previous optimization restructured the code in a way that lost the
>>16 normally applied to the product of two fix values.
Fixes: 707b69220d
("Skip sqrt,square in check_vector_to_sphere_1")
2016-01-03 20:21:36 +00:00
Kp
e3e77f8724
Remove sprintf from automap.cpp
2016-01-03 20:21:36 +00:00
Kp
3acfdcd00a
Remove sprintf from game.cpp
2016-01-03 20:21:36 +00:00
Kp
b2882fd48f
Remove sprintf from gamerend.cpp
2016-01-03 20:21:36 +00:00
Kp
e222a13495
Remove sprintf from gameseq.cpp
2016-01-03 20:21:36 +00:00
Kp
0d15877010
Remove sprintf from gauges.cpp
2016-01-03 20:21:36 +00:00
Kp
421fd8a11c
Remove sprintf from newmenu.cpp
2016-01-03 20:21:36 +00:00
Kp
842756630f
Remove sprintf from piggy.cpp
2016-01-03 20:21:36 +00:00
Kp
4afe97fd71
Remove sprintf from piggy_is_substitutable_bitmap
2016-01-03 20:21:36 +00:00
Kp
fd85e3cfc0
Remove sprintf from scores.cpp
2016-01-03 20:21:35 +00:00
Kp
24e902d4cf
Simplify find_connect_side
2016-01-03 20:21:35 +00:00
Kp
5ba5910e7a
Use symbolic side_none for testing find_connect_side result
2016-01-03 20:21:35 +00:00
Kp
2ef83ad002
Remove redundant segptr computation
2016-01-03 20:21:35 +00:00
Kp
34df375032
Cache remove_trigger wall_num
2016-01-03 20:21:35 +00:00
Kp
d7890e37cb
Skip copying segment normals in render_side
2016-01-03 20:21:35 +00:00
Kp
2e8900ab73
Remove unused lcnt_save,scnt_save
2016-01-03 20:21:35 +00:00
Kp
3428ea6392
Remove Show_only_curside
...
Show_only_curside was locked to 0 in EDITOR builds, but only EDITOR
builds could render the current side.
2016-01-03 20:21:35 +00:00
Kp
c57db299ba
Make first_terminal_seg local
2016-01-03 20:21:34 +00:00
Kp
823ff63126
Move MplTrackerAddr to CArg
2015-12-24 04:01:29 +00:00
Kp
0b87ff267f
Move MplTrackerPort to CArg
2015-12-24 04:01:29 +00:00
Kp
3f9f1f2b49
Move MplUdpMyPort to CArg
2015-12-24 04:01:29 +00:00
Kp
56e77d4fec
Move MplUdpHostPort to CArg
2015-12-24 04:01:28 +00:00
Kp
0fb84b883f
Move DbgAltTex to CArg
2015-12-24 04:01:28 +00:00
Kp
b0e0f48058
Move DbgTexMap to CArg
2015-12-24 04:01:28 +00:00
Kp
a91ef00a86
Move DbgNoCompressPigBitmap to CArg
2015-12-24 04:01:28 +00:00
Kp
96b9f606d7
Invert game_render_frame_mono argument
2015-12-24 04:01:28 +00:00
Kp
834258fffa
Move DbgNoDoubleBuffer to CArg
2015-12-24 04:01:28 +00:00
Kp
048615f95e
Move DbgRenderStats to CArg
2015-12-24 04:01:28 +00:00
Kp
45a287f44b
Move DbgNoRun to CArg
2015-12-24 04:01:28 +00:00
Kp
ee98ef18f3
Move DbgSdlASyncBlit to CArg
2015-12-24 04:01:28 +00:00
Kp
94616f5e1c
Move DbgSdlHWSurface to CArg
2015-12-24 04:01:27 +00:00
Kp
4f14be6056
Move MplUdpHostAddr to CArg
2015-12-24 04:01:27 +00:00
Kp
2c3f64478d
Move OglSyncWait to CArg
2015-12-24 04:01:27 +00:00
Kp
9ec7e766cf
Move OglSyncMethod to CArg
2015-12-24 04:01:27 +00:00
Kp
d7c694b126
Move OglFixedFont to CArg
2015-12-24 04:01:27 +00:00
Kp
679e0adf3d
Move SysAutoDemo to CArg
2015-12-24 04:01:27 +00:00
Kp
cbd2cd7c54
Move SysNoTitles to CArg
2015-12-24 04:01:27 +00:00
Kp
948fa32f9c
Move SysNoBorders to CArg
2015-12-24 04:01:27 +00:00
Kp
4ac7055928
Move SysWindow to CArg
2015-12-24 04:01:27 +00:00
Kp
2629b5b3d9
Move SysAutoRecordDemo to CArg
2015-12-24 04:01:27 +00:00
Kp
93f3162a41
Move SysLowMem to CArg
2015-12-24 04:01:26 +00:00
Kp
2b4447f927
Move SysUsePlayersDir to CArg
2015-12-24 04:01:26 +00:00
Kp
2cea05d0a7
Move SysRecordDemoNameTemplate to CArg
2015-12-24 04:01:26 +00:00
Kp
63cd2dbb6b
Move SysPilot to CArg
2015-12-24 04:01:26 +00:00
Kp
584e2ce408
Move SysHogDir to CArg
2015-12-24 04:01:26 +00:00
Kp
9f1abe1910
Move SndNoMusic to CArg
2015-12-24 04:01:26 +00:00
Kp
bb3a386b47
Move GfxSkipHiresFNT to CArg
2015-12-24 04:01:26 +00:00
Kp
23bb4c5826
Move SysNoNiceFPS to CArg
2015-12-24 04:01:26 +00:00
Kp
29e305c6df
Use namespace dcx for SDL save_screen_shot
2015-12-23 03:28:18 +00:00
Kp
70ffee39cd
Use namespace dcx for WORDS_BIGENDIAN/WORDS_NEED_ALIGNMENT functions
...
Reported-by: derhass <https://github.com/dxx-rebirth/dxx-rebirth/pull/171 >
Fixes: 32051298ae
("Use inline namespace dcx/dsx for more symbols")
2015-12-23 03:28:17 +00:00
Kp
e3a0ca472a
Move SDL gr_palette_load to namespace dcx
2015-12-23 03:28:17 +00:00
Kp
be04d3a4f9
Rewrite CLI
...
Remove artificial length limit on input.
Enable multi-line display of input.
2015-12-22 04:18:52 +00:00
Kp
287a74f88b
Multiplex do_laser_firing_player flags
2015-12-22 04:18:52 +00:00
Kp
f4a5040a60
Remove write-only Last_laser_fired_time
2015-12-22 04:18:52 +00:00
Kp
1975cdb912
Reorder flicker_lights tests
2015-12-22 04:18:52 +00:00
Kp
2bd538f353
Sort delta light indices
2015-12-22 04:18:52 +00:00
Kp
de88e595e9
Hoist change_light variables
2015-12-22 04:18:52 +00:00
Kp
a892c24bc2
Simplify object phys_info zero
2015-12-22 04:18:51 +00:00
Kp
a60c9683d3
Remove write-only Unused_object_slots
2015-12-22 04:18:51 +00:00
Kp
e8c34be843
Use v*ptr* factories with highest_valid
2015-12-22 04:18:51 +00:00
Kp
d479819931
Use absolute_sibling to reduce global references for ptridx
2015-12-22 04:18:51 +00:00
Kp
14dd5b91aa
Save objptridx for boss instead of recomputing it
2015-12-22 04:18:51 +00:00
Kp
8a22ca9594
Shorten multi_apply_goal_textures
2015-12-22 04:18:51 +00:00
Kp
8d7a78d448
Pass font to get_char_width
2015-12-22 04:18:50 +00:00
Kp
ab944ae8b1
Reuse measurement of TXT_GAME_OVER
2015-12-22 04:18:50 +00:00
Kp
20f432e5c6
Save & to con_buffer slot
2015-12-22 04:18:50 +00:00
Kp
18cca1d33c
Remove unnecessary gr_check_fullscreen ?:
2015-12-22 04:18:50 +00:00
Kp
db9fb0ed42
Move more symbols into namespace dcx/dsx
2015-12-22 04:18:50 +00:00
Kp
ea02aeeaab
Move kill_matrix update up
2015-12-22 04:18:49 +00:00
Kp
132367ce27
Fix SDL-only build after namespace changes
2015-12-18 04:08:24 +00:00
Kp
e59fde57e7
Enable gr_remap_color_fonts in D1
...
This looks like a useful fix that was developed after Descent 1 was
released. Backport it. This reduces differences between the engines.
2015-12-18 04:08:24 +00:00
Kp
28ee4c1804
Move DbgUseOldTextureMerge to CArg
2015-12-18 04:08:24 +00:00
Kp
900bebe799
Move DbgGlRGBA2Ok to CArg
2015-12-18 04:08:24 +00:00
Kp
fa17246b7b
Move DbgGlLuminance4Alpha4Ok to CArg
2015-12-18 04:08:24 +00:00
Kp
7022d20b1e
Move DbgGlGetTexLevelParamOk to CArg
2015-12-18 04:08:24 +00:00
Kp
4a280e4556
Move DbgGlReadPixelsOk to CArg
2015-12-18 04:08:24 +00:00
Kp
b3e6dd3eb5
Move DbgGlIntensity4Ok to CArg
2015-12-18 04:08:23 +00:00
Kp
cdae6cad4d
Move DbgBpp to CArg
2015-12-18 04:08:23 +00:00
Kp
e0a88f4b7b
Move TexFilt to CCfg
2015-12-18 04:08:23 +00:00
Kp
22901a6636
Move WindowMode to CCfg
2015-12-18 04:08:23 +00:00
Kp
0fa31dbe98
Force multi kill list sort order for (kills+deaths<=0)
2015-12-18 04:08:23 +00:00
Kp
1be2e52bf7
Force kmatrix to 0% efficiency for (kills+deaths<=0)
2015-12-18 04:08:23 +00:00
Kp
025c8dec31
Force kill gauge to 0% efficiency for (kills+deaths<=0)
2015-12-18 04:08:23 +00:00
Kp
2b51578ba6
Use enum class for Player_dead_state (formerly Player_is_dead)
2015-12-15 04:09:35 +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
zico
731fb5204e
Adjusted keyboard ramp scaling based on observation that the original game uses a keyboard ramp of 8 frames. Full sensitivity should reflect 60FPS behaviour, half sensitivity reflects 30FPS behaviour (give or take a frame). Ramping should be properly time-scaled now.
2015-12-14 15:19:59 +01:00
Kp
a1cf7b03fe
Fix lifetime kill accounting in team hoard
...
`adjust` must be set to -1 for a team kill, but this was only done as a
side effect of updating game-local kill counts. After 5f2ec67
,
game-local kill counts are not updated in team hoard, but adjust is
still used. Move the handling of adjust up to occur in all team games.
Fixes: 5f2ec6789f
("Restore !hoard guard for game-local kill accounting")
2015-12-13 18:00:49 +00:00
Kp
fd3f7f7f4d
Force lowest rank for (kills + deaths) <= 0
2015-12-13 18:00:49 +00:00
Kp
5f2ec6789f
Restore !hoard guard for game-local kill accounting
2015-12-13 18:00:49 +00:00
Kp
26e948d5f1
Uninline namespace dsx
2015-12-13 18:00:49 +00:00
Kp
dc8c0323d8
Uninline namespace dcx
2015-12-13 18:00:49 +00:00
Kp
32051298ae
Use inline namespace dcx/dsx for more symbols
2015-12-13 18:00:48 +00:00
Kp
8109379fdd
Use inline namespace dsx for similar/misc/
2015-12-13 18:00:48 +00:00
Kp
232cc324f9
Use inline namespace dsx for similar/arch/sdl/
2015-12-13 18:00:48 +00:00
Kp
09eba7f48a
Use inline namespace dsx for similar/arch/ogl/
2015-12-13 18:00:48 +00:00
Kp
d4857f4257
Use inline namespace dsx for similar/3d
2015-12-13 18:00:48 +00:00
Kp
85d7c495e8
Use inline namespace dsx for similar/2d
2015-12-13 18:00:48 +00:00
zico
6c5bfaf0d1
Make sure Vulcan ammo shows for D1X in vertical HUD modes. Enabled vulcan ammo gauge for Cockpit and Status Bar modes
2015-12-11 13:37:30 +01:00
zico
7a78568b14
Bail out of multi_reset_object_texture() if object is a ghost. Prevents unnecessary calls and resulting bug messages from check_warn_object_type()
2015-12-11 12:50:01 +01:00
Kp
3d246427e1
Poison objects on level load
...
Objects are overwritten without using obj_allocate, so the normal poison
path is not triggered. Poison objects explicitly to trap uninitialized
data from a previous level.
This also fixes an unreported issue where player shields always reset to
100 on entering a new level. The game is supposed to raise shields to
100 if the player was lower on exiting the level. However, it is not
supposed to reduce shields to 100 if the player had a higher value on
exiting the level.
This also fixes a demo consistency issue reported by zicodxx <https://github.com/dxx-rebirth/dxx-rebirth/issues/168 >.
Fixes: 2e28a491f2
("Move player shields to struct object")
2015-12-10 03:25:37 +00:00
Kp
34d89d5139
Use inline namespace dsx for segment.h
2015-12-05 22:57:25 +00:00
Kp
e549f3451e
Use inline namespace dsx for object.h
2015-12-05 22:57:25 +00:00
Kp
1e50c23a8c
Use inline namespace dsx for inferno.cpp
2015-12-05 22:57:25 +00:00
Kp
e784fd96fa
Use inline namespace dcx for common/texmap
2015-12-05 22:57:24 +00:00
Kp
43dd620557
Use inline namespace dcx for common/3d
2015-12-05 22:57:24 +00:00
Kp
69c5a79058
Use inline namespace dcx for common/2d
2015-12-05 22:57:23 +00:00
Kp
af97689d98
Fix demo id check bug
...
Test for type OBJ_FIREBALL before comparing the object ID to a fireball
ID.
2015-12-05 15:51:29 +00:00
zico
b286458119
Upon user request: reverted commits 1c8dc35
and 1431d3bc
so the game will automatically close menus and automap upon taking damage in multiplayer - restoring the original game behavior
2015-12-05 13:12:21 +01:00
zico
d493912bcc
Fixed demo playback which would not transition to Descent 2 secret levels due to interpolated playback triggering ND_STATE_PAUSED and skipping oder ND_EVENT_SECRET_THINGY
2015-12-04 21:01:37 +01:00
Kp
aaaa7e6aa4
Make font datasize const after fixup
2015-12-04 03:36:32 +00:00
Kp
8a97c173a3
Remove useless gr_remap_mono_fonts
...
gr_remap_mono_fonts searches for fonts with !(font->ft_flags & FT_COLOR)
and calls gr_remap_font on any it finds.
gr_remap_font starts with:
if (!(font->ft_flags & FT_COLOR))
return;
2015-12-04 03:36:32 +00:00
Kp
ddc3cd0201
Make Boss_teleport_interval const in D1
2015-12-04 03:36:32 +00:00
Kp
515210ea50
Make Boss_cloak_interval const in D1
2015-12-04 03:36:32 +00:00
Kp
b4cd091412
Combine D1/D2 gamedata_close
2015-12-04 03:36:32 +00:00
Kp
954d473d47
Remove unused Do_ai_flag
2015-12-04 03:36:32 +00:00
Kp
e77a6ea923
Remove write-only variable r_upixelc
2015-12-04 03:36:32 +00:00
Kp
9231cfb853
Remove write-only D1 variable Boss_been_hit
2015-12-04 03:36:32 +00:00
Kp
bc204403ba
Remove write-only variable Ai_initialized
2015-12-04 03:36:31 +00:00
Kp
9b8a956431
Make palette_save static for D2
2015-12-04 03:36:31 +00:00
Kp
a9b82e3f7f
Make vlighting static
2015-12-04 03:36:31 +00:00
Kp
ed55763603
Remove unused symbols
2015-12-04 03:36:31 +00:00
Kp
1adf34403e
Compile out unused wclip_write
...
Unused since 547193c591
("Compile out unused bm_write_all") disabled caller bm_write_all.
2015-12-04 03:36:31 +00:00
Kp
edfd337c50
Compile out unused weapon_info_write
...
Unused since 547193c591
("Compile out unused bm_write_all") disabled caller bm_write_all.
2015-12-04 03:36:31 +00:00
Kp
a49fc821a0
Restrict listbox_get_window to _WIN32
2015-12-04 03:36:31 +00:00
Kp
143612df6a
Make multi_send_message static
2015-12-04 03:36:30 +00:00
Kp
a245ff8130
Mark multi_who_is_master static
2015-12-04 03:36:30 +00:00
Kp
111ac7f7f3
Fix player/marker confusion due to sorting
...
Fixes: 1d7418497e
("Condense collision table")
2015-12-03 03:26:49 +00:00
Kp
01c0280e82
Optimize marker map drawing
2015-12-03 03:26:49 +00:00
Kp
708dc0a7e1
Use vobjptr/vcobjptr for more Objects[] access
2015-12-03 03:26:49 +00:00
Kp
b683b4cc68
Scope weapon type
2015-12-03 03:26:49 +00:00
Kp
31d538ebe2
Use helper for robot weapon type
2015-12-03 03:26:48 +00:00
Kp
c45f93b503
Short out apply_damage_to_player friendly fire check
2015-11-27 03:56:13 +00:00
Kp
0fe724b229
Adjust multiplayer kill handling
2015-11-27 03:56:13 +00:00
Kp
0c75aecc45
Check most uses of object id
2015-11-27 03:56:13 +00:00
Kp
0a3d4cd711
Defer robot parent check in object_create_explosion_sub
2015-11-27 03:56:13 +00:00
Kp
1226731ffa
Propagate OBJ_POWERUP into segment_contains_object
2015-11-27 03:56:12 +00:00
Kp
bdbc129d14
Optimize out some object type warnings
2015-11-26 02:56:56 +00:00
Kp
9f26e2211e
Warn on invalid object ID access
2015-11-26 02:56:56 +00:00
Kp
8fe9261aaf
Treat hoard non-player kills as bad kills
2015-11-26 02:56:56 +00:00
Kp
90fdcfe846
Inline parameter to digi_select_system
2015-11-26 02:56:56 +00:00
Kp
f72e739732
Defer initializing UDP bind address
2015-11-26 02:56:55 +00:00
Kp
b59f5d091e
Remove SDL stub gr_set_attributes
2015-11-26 02:56:55 +00:00
Kp
5782d3c604
Remove unused digi_debug
2015-11-26 02:56:55 +00:00
Kp
b1ec69a3a2
Move CtlNoJoystick to CArg
2015-11-26 02:56:55 +00:00
Kp
fee144261f
Add if-D2 to Dont_start_sound_objects
...
Dont_start_sound_objects is defined for D1, but never set. Restrict it
to D2 and let D1 skip the test.
2015-11-26 02:56:55 +00:00