Commit graph

2274 commits

Author SHA1 Message Date
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 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 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 28ee4c1804 Move DbgUseOldTextureMerge to CArg 2015-12-18 04:08:24 +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
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 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 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 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 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