TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
7392 commits 2 branches 28 tags 122 MiB
Commit graph

2643 commits

Author SHA1 Message Date
Kp bbb0b225b4 Use valptr for gameseq highest_valid 2015-06-13 22:42:17 +00:00
Kp a8e1e504ef Use valptr for gameseg highest_valid 2015-06-13 22:42:17 +00:00
Kp 3c748c2418 Use valptr for gamesave highest_valid 2015-06-13 22:42:17 +00:00
Kp be34e5a959 Use valptr for gamemine highest_valid 2015-06-13 22:42:17 +00:00
Kp 1bbfe3e830 Use valptr for gamecntl highest_valid 2015-06-13 22:42:17 +00:00
Kp 8042d6c120 Use valptr for game highest_valid 2015-06-13 22:42:17 +00:00
Kp 9d5bc102ab Use valptr for fuelcen highest_valid 2015-06-13 22:42:17 +00:00
Kp 32f256311d Use valptr for eobject highest_valid 2015-06-13 22:42:16 +00:00
Kp b9d6c577be Use valptr for endlevel highest_valid 2015-06-13 22:42:16 +00:00
Kp 742971711f Use valptr for elight highest_valid 2015-06-13 22:42:16 +00:00
Kp c5bd78f4bc Use valptr for dumpmine highest_valid 2015-06-13 22:42:16 +00:00
Kp a53a348f09 Use valptr for cntrlcen highest_valid 2015-06-13 22:42:16 +00:00
Kp 4c5ce566ef Use valptr for automap highest_valid 2015-06-13 22:42:16 +00:00
Kp cda5cb160c Use valptr for aipath highest_valid 2015-06-13 22:42:16 +00:00
Kp 1f9650d402 Use valptr for ai highest_valid 2015-06-13 22:42:16 +00:00
Kp 9125ae32cd Make objnum unsigned 2015-06-13 22:42:15 +00:00
Kp 00c1429ebf Use enum for Escort_special_goal 2015-06-13 22:42:15 +00:00
Kp 148c0f44c8 Convert segnum_t to uint16_t 2015-06-13 22:42:15 +00:00
Kp 8358dfcd0b Support biased pointers to help memory debuggers 2015-06-13 22:42:15 +00:00
Kp 513e7c05e9 Remove force-free of "leaked" memory in mem_display_blocks 
mem_display_blocks runs before global destructors, so it reports as
leaked any memory which is managed by a global scope object with a
destructor.  If mem_display_blocks calls mem_free, and the destructor
later calls mem_free, a double-free results, and usually leads to a
crash.  Even if the memory were actually leaked, freeing it does not
help because the program will exit soon anyway.

Reported-by: zico <https://github.com/dxx-rebirth/dxx-rebirth/issues/85>
 2015-06-12 02:54:53 +00:00
Kp 5124c510f8 Fix serial endian_access -fno-inline build 2015-06-11 03:06:58 +00:00
Kp 75b72dc8e9 Fix hoard_resources_type -fno-inline build 
Fixes: e116e894b0 ("Fix invalid free when hoard data is missing")
 2015-06-11 03:06:58 +00:00
Kp 906f93ddf1 Fix has_weapon_result -fno-inline build 
Fixes: 9d213b5282 ("Wrap player_has_weapon return type")
 2015-06-11 03:06:58 +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 f6d6f221ad Fix array underread for D1 bosses in D2 2015-06-07 16:21:37 +00:00
Kp 7e263323bc Simplify boss invulnerability lookup 2015-06-07 16:21:37 +00:00
Kp 7c436f1fbb Merge pull #39 into unification/master 
Requested-by: btb <https://github.com/dxx-rebirth/dxx-rebirth/pull/39>
Acked-by: Matt1360 <https://github.com/dxx-rebirth/dxx-rebirth/pull/39#issuecomment-88712761>
Acked-by: zico <https://github.com/dxx-rebirth/dxx-rebirth/pull/39#issuecomment-88907523>
 2015-06-07 16:21:37 +00:00
Kp ff452dbded Move CLI code to common 
None of it depends on D1 vs D2.
 2015-06-07 16:20:46 +00:00
Kp 1115114e3d Remove unnecessary old-style const stripping cast 
This cast was necessary only because cvar_set_cvar was not properly
const.
 2015-06-07 16:20:46 +00:00
Kp 3718678576 Reduce cvar.h includes 2015-06-07 16:20:46 +00:00
Kp e40172f21a Use RAIIdmem for console memory 2015-06-07 16:20:46 +00:00
Kp 67b684f277 Fix surface in exit video 
Fixes: f3aa8e501b ("Simplify extract_vector_from_segment")
 2015-06-06 18:03:45 +00:00
Kp 0141e9ed78 Remove redundant fix_sincos calls 
The result is immediately overwritten.  Skip computing it.
 2015-06-02 03:03:32 +00:00
Kp 53a7798d80 Simplify fix_sincos calls 2015-06-02 03:03:31 +00:00
Kp 33204bac5c Make Break_on_object static 2015-06-02 03:03:31 +00:00
Kp bb5fd12ffe Pass vcobjptr to object_intersects_wall 2015-06-02 03:03:31 +00:00
Kp 87eda88319 Skip copying vertex for boss fit check 2015-06-02 03:03:31 +00:00
Kp ed46a05296 Update control_type when ghosting reactor 2015-05-30 21:29:57 +00:00
Kp a523171748 Shorten calc_d_homer_tick 
Combine redundant write to d_homer_tick_step
Combine redundant write to static timer
Only test for exceeding 3*cap if timer >= 1*cap
 2015-05-30 16:53:49 +00:00
zico b09703cd3f Merge branch 'unification/master' of github.com:dxx-rebirth/dxx-rebirth into unification/master 2015-05-30 18:29:59 +02:00
zico b04282e791 Using one global yet independent timeer for homing missiles similar to d_tick instead of having one in each missile object. Also decreased HOMING_TURNING_TIME to 25 FPS base 2015-05-30 18:29:41 +02:00
Kp 27b6012e20 Fix hang in statusbar mode when energy>100 
Reported-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/78>
 2015-05-30 16:06:05 +00:00
Kp 3f9d110502 Reverse score order 
Reported-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/74>
 2015-05-29 03:15:48 +00:00
Kp 3239693c26 Fix primary/secondary select mismatch 
Fixes: d161b17191 ("Factor out shareware/unusable weapon handling")
Reported-by: Mako88 <https://github.com/dxx-rebirth/dxx-rebirth/issues/72>
 2015-05-29 03:15:48 +00:00
zico 7414b8165d Fixed little regression from previous commit: Do not increade homing tick every frame but according to turn time - duh 2015-05-28 16:07:24 +02:00
zico 7ba3d1317b Isolated all of the homing code into time-depending condition determined by track_turn_time and added track_turn_tick to make target re-discovery dependent on the individual missile tracking instead of global d_tick_count 2015-05-28 15:22:40 +02:00
Kp 6eb724d872 Reorder flag drop 
Suppress message if drop fails
 2015-05-28 03:08:40 +00:00
Kp 1216c26704 Make exit nextcenter const 2015-05-28 03:08:40 +00:00
Kp 58c8b17619 Use helper for reading 16-bit segments 2015-05-28 03:08:40 +00:00
Kp bb79e50656 Fix definition of newdemo_record_effect_blowup 
Fixes: 9a32e151ff ("Pass check_effect_blowup vms_vector arg by &")
 2015-05-28 03:08:40 +00:00
Kp b6a9b2a853 Pass vsegptridx to wall_toggle 2015-05-28 03:08:40 +00:00
Kp c0eb67a9f1 Use vsegptr in network messages 2015-05-28 03:08:39 +00:00
Kp 850853326c Pass vsegptridx to gate_in_robot 2015-05-28 03:08:39 +00:00
Kp 1b0e3f4aa5 Pass vsegptr to multibot compute_segment_center 2015-05-28 03:08:39 +00:00
Kp ea2c2df250 Update open-coded tests for segment_none 2015-05-28 03:08:39 +00:00
Kp 4007b297ec Pass vcsegptr to aipath compute_segment_center 2015-05-28 03:08:39 +00:00
Kp 5cc38ea06c Pass vcsegptridx to digi_link_sound_to_pos 2015-05-28 03:08:39 +00:00
Kp 136e6acda9 Pass vcobjptr to object_types 2015-05-28 03:08:39 +00:00
Kp d586385bd1 Pass vcobjptr to object_ids 2015-05-28 03:08:39 +00:00
Kp babfa9d8e7 Construct d_event_mousebutton 2015-05-28 03:08:39 +00:00
Kp 692038f284 Cache modifier keys 2015-05-28 03:08:38 +00:00
Kp e98c679f06 Simplify key_flush 2015-05-28 03:08:38 +00:00
Kp a991ff0d82 Remove write-only key_data 2015-05-28 03:08:38 +00:00
Kp 34fb7bde90 Test for !=SDL_RELEASED, not ==SDL_PRESSED 2015-05-28 03:08:38 +00:00
Kp 25186ca984 Remove write-only keyd_last_released 2015-05-28 03:08:38 +00:00
Kp badad2ef33 Remove write-only keyd_last_pressed 2015-05-28 03:08:38 +00:00
Kp a66da49cb6 Factor out mouse z button 2015-05-28 03:08:38 +00:00
Kp 821fefe145 Cache locals in mouse_button_handler 2015-05-28 03:08:38 +00:00
Kp abfd8e4d83 Split mouse_toggle_cursor 2015-05-28 03:08:38 +00:00
Kp 83326e89e2 Factor out sending mouse clicks 2015-05-28 03:08:38 +00:00
zico 74b66a7f5a Fixed regression (with kp's help) in multi_do_player_deres which made conditional check for map_objnum_local_to_remote fail for the wrong reasons 2015-05-25 11:48:05 +02:00
Kp d29d52be7f Restore temporary rear view 2015-05-24 17:16:38 +00:00
Kp ec453dcb28 Merge "Clang fixes" from btb 
clang whines about some innocuous constructs.  Preprocess them out to
silence it.

Requested-by: btb <https://github.com/dxx-rebirth/dxx-rebirth/pull/63>
 2015-05-24 17:13:13 +00:00
Kp 7e3bec43a0 Allow object_none as killer in multi_compute_kill 2015-05-23 22:38:15 +00:00
Kp d2724ea90f Remove bogus backspace Int3 
There is no reason to trap to debugger when backspace is pressed on a
window that ignores it.  Remove the bogus trap.

Reported-by: A Future Pilot <http://www.dxx-rebirth.com/frm/index.php/topic,2024.msg21713/topicseen.html#msg21713>
 2015-05-23 17:25:56 +00:00
zico 1f6ae58f52 Added HANDS_OFF_PERIOD define for multibot to make sure code will not break if MAX_ROBOTS_CONTROLLED changes 2015-05-23 18:18:20 +02:00
Kp d5cf0fcd6f Store hoard goal_eclip locally 2015-05-23 04:13:29 +00:00
Kp e116e894b0 Fix invalid free when hoard data is missing 
If hoard data is not initialized, hoard_resources_type::reset frees
GameBitmaps[0].data, which is bogus_data instead of nullptr or a valid
pointer.

Fixes: d422e8656a ("Simplify HoardEquipped")
 2015-05-23 04:13:29 +00:00
Kp 02c6f2a9f3 Fix gcc-4.6 render range error 
gcc-4.6 fails to synthesize a move constructor to initialize
reversed_render_range; later gcc accept this.

Switch to capturing the value by const auto &&, which works in both old
and new gcc.
 2015-05-22 03:33:21 +00:00
Kp 6615aff8a4 Fix gcc-4.6 piggy build 
gcc-4.6 warns about the transition to new for scope rules; later gcc
does not warn.

Replace the loops with range-based for.
 2015-05-22 03:33:20 +00:00
Kp 3298802b3d Fix gcc-4.6 object build 
gcc-4.6 chokes on implicitly converting vobjptridx_t to int/uint16_t;
later gcc accepts this.  Cast the vobjptridx_t directly to short to
force gcc-4.6 to find the correct conversion operator.
 2015-05-22 03:33:20 +00:00
Kp 665a0de228 Fix gcc-4.6 multi build 
gcc-4.6 chokes on implicitly converting objptridx_t to short; later gcc
accepts this.  Cast the objptridx_t directly to short to force gcc-4.6
to find the correct conversion operator.
 2015-05-22 03:33:20 +00:00
Kp 76540314c1 Fix gcc-4.6 gamerend build 
gcc-4.6 chokes on casting vobjptridx_t to long; later gcc accepts this.
Change the format string to short, then switch the conversion to
objnum_t, which has an exact match for the converting operator.
 2015-05-22 03:33:20 +00:00
Kp 4cd329d2b4 Fix gcc-4.6 gamecntl build 
gcc-4.6 chokes on constexpr operator int(); later gcc accepts this.
menu_fix_wrapper is never converted in constexpr context, so remove the
constexpr specifier.

Fixes: 12ad357b8d ("Move Wimp Menu to macro")
 2015-05-22 03:33:20 +00:00
Kp ae604225c8 Fix gcc-4.6 interpreter build 
gcc-4.6 chokes on `static constexpr type value{};`, but accepts
`static constexpr auto value = type{};`

Fixes: 77ec36b9c3 ("Convert g3_draw_morphing_model to class")
 2015-05-22 03:33:19 +00:00
Kp d422e8656a Simplify HoardEquipped 2015-05-22 03:33:19 +00:00
Kp dc4a344ec8 Use destructor for hoard resources 2015-05-22 03:33:19 +00:00
Kp cc2a5e9790 Use gr_free_bitmap_data for Orb_icons 2015-05-22 03:33:19 +00:00
Kp bc886e5ade Skip sliding invisible textures 2015-05-17 20:37:59 +00:00
Kp c53b734abb Compute slide segments early 
Store slide flag in segment to save one byte per segment.
 2015-05-17 20:37:59 +00:00
Kp a7f9b34aff Refactor slide_textures 2015-05-17 20:37:59 +00:00
Kp 8e49c191ce Remove unused copy_side_except_vertex_ids 2015-05-17 20:37:59 +00:00
Kp 44625e2617 Remove unnecessary Mouse::button_state 2015-05-14 02:23:13 +00:00
Kp 265ad59e9c Remove set_default_handler 
standard_handler is the only handler.  Use it directly.
 2015-05-14 02:23:13 +00:00
Kp 7f403bc1af Optimize clearing player animation angles 2015-05-14 02:23:13 +00:00
Kp 577321d74b Remove obsolete con_close 2015-05-14 02:23:13 +00:00
Kp 5ffbb6dd05 Enable tail call in con_add_buffer_line 2015-05-14 02:23:13 +00:00
Kp e4d7d20bd2 Factor out console color lookup 2015-05-14 02:23:13 +00:00
Kp 8ddcf7b323 Simplify console open check 2015-05-14 02:23:13 +00:00
Kp fa591d585a Shorten event_toggle_focus 2015-05-14 02:23:13 +00:00
Kp 68d35d8e05 Move negation of mouse_toggle_cursor argument into callee 2015-05-14 02:23:13 +00:00
Kp e50b0d479e Inline event_mouse_get_delta 2015-05-14 02:23:13 +00:00
Kp 2a8b79f868 Inline event_mouse_get_button 2015-05-14 02:23:13 +00:00
Kp 0ece005dfa Use screen_mode for screen resolution 2015-05-14 02:23:13 +00:00
Kp e592f3a0bb Inline call to gr_set_mode(0) 2015-05-14 02:23:13 +00:00
Kp 2d9af1e348 Propagate gr_init argument 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 ac3b1d6aa3 Switch do_cockpit_window_view to vobjptr_t 
Only the wake_up_rendered_objects hack needed a vobjptridx_t.  Switch to
vobjptr_t.
 2015-05-13 03:20:28 +00:00
Kp 5810faf33d Make Ai_last_missile_camera object* 2015-05-13 03:20:28 +00:00
Bradley Bell a0fda81452 Merge branch 'unification/master' into clang-fixes 2015-05-09 15:34:30 -07:00
Kp bfeddc3501 Test for exploding wall damaging control center 
apply_damage_to_controlcen requires a valid `who`, but exploding walls
have none.

Fixes: 3eb8f4813e ("Pass vcobjptr_t to apply_damage_to_controlcen")
 2015-05-09 19:55:58 +00:00
Kp 38e8967fba Split event_toggle_focus 2015-05-09 17:39:03 +00:00
Kp 67240cea48 Shorten mouse_get_delta 2015-05-09 17:39:03 +00:00
Kp 9151b7f300 Remove write-only old_delta_x, old_delta_y 2015-05-09 17:39:03 +00:00
Kp fd51d9dcd5 Shorten kc_change_mouseaxis 2015-05-09 17:39:03 +00:00
Kp 7f00061f6f Shorten mouse_flush 2015-05-09 17:39:03 +00:00
Kp e111d6ec22 Shorten mouse_cursor_autohide 2015-05-09 17:39:03 +00:00
Kp f248006df5 Remove unused mouse_get_btns 2015-05-09 17:39:03 +00:00
Kp 53036c593e Use unsigned comparison in mouse_in_window 2015-05-09 17:39:03 +00:00
Kp 4ca7924907 Pass graphics_config_menuset items by userdata 2015-05-09 17:39:02 +00:00
Kp 29f239d6b1 Raise PHYSFSX_exists bool check to caller 
All callers use a constant value, so raise the check into the caller to
let the optimizer delete the unnecessary branch.
 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 e57afde68b Hoist store in gr_internal_string0_template 2015-05-09 17:39:02 +00:00
Kp 8ac92b098f Cache variables in gr_internal_string0_template 2015-05-09 17:39:02 +00:00
Kp bd5573356d Reduce gr_internal_string0_template variable scope 2015-05-09 17:39:02 +00:00
Kp 4228ed2324 Switch gr_internal_string0_template to count down loop 2015-05-09 17:39:02 +00:00
Kp 6d9de0d177 Use partial_range for font width 2015-05-09 17:39:02 +00:00
Kp d2cded3ad4 Combine gr_internal_string0{,m} 2015-05-09 17:39:01 +00:00
Kp b1ed5b86e2 Return get_char_width results by value 2015-05-09 17:39:01 +00:00
Kp 2e2c17669c Shorten timer_delay 2015-05-09 17:39:01 +00:00
Kp b1992b5e59 Shorten timer_delay2 2015-05-09 17:39:01 +00:00
Kp 9312b0b00f Remove write-only variable multi_do_guided::fun 2015-05-09 17:39:01 +00:00
Kp ed86b53395 Make Muzzle_queue_index static 2015-05-09 17:39:01 +00:00
Kp 1cdc43d71a Split object_create_egg 2015-05-09 17:39:01 +00:00
Kp f5b02ce6a0 Remove write-only ai_static D1 follow_path_start_seg 2015-05-09 17:39:01 +00:00
Kp 7dae02fbb4 Remove write-only ai_static D1 follow_path_end_seg 2015-05-09 17:39:00 +00:00
Kp 3b59a71e11 Remove unused D1 last_see_time 2015-05-09 17:39:00 +00:00
Kp 83baf4dfe8 Remove unused D1 last_attack_time 2015-05-09 17:39:00 +00:00
Kp d9c3005134 Factor out egg skip logic 2015-05-09 17:39:00 +00:00
Kp 9a4f7a32bf Pass vcsegptr to fuelcen_give_fuel 2015-05-09 17:39:00 +00:00
Kp 7eea02e4f8 Fix paging in wrong texture for homing missiles 2015-05-09 17:39:00 +00:00
Kp 21aed0488f Hoist gr_setcolor in gr_internal_string_clipped_template 2015-05-09 17:39:00 +00:00
Kp 2fc4ca8d5a Cache variables in gr_internal_string_clipped_template 2015-05-09 17:39:00 +00:00
Kp cf87ebe54d Remove write-only grs_bitmap::bm_handle 2015-05-09 17:38:59 +00:00
Kp bbadf1fe3e Reduce gr_internal_string_clipped_template variable scope 2015-05-09 17:38:59 +00:00
Kp 9d238af808 Switch gr_internal_string_clipped_template to count down loops 2015-05-09 17:38:59 +00:00
Kp 2d423ca383 Combine gr_internal_string_clipped{_m} 2015-05-09 17:38:59 +00:00
Kp aea5df067d Cache locals in get_char_width 2015-05-09 17:38:59 +00:00
Kp 4b0f257698 Pass find_kern_entry grs_font by & 2015-05-09 17:38:59 +00:00
Kp 1017802e48 Combine get_char_width and get_char_width_f as template 2015-05-09 17:38:59 +00:00
Kp c9ef463a16 Mark gr_message_color_level const 2015-05-09 17:38:59 +00:00
Kp f3aa8e501b Simplify extract_vector_from_segment 2015-05-09 17:38:59 +00:00
Kp a51a7110e8 Pass vobjptridx_t to multi_send_position 2015-05-09 17:38:59 +00:00
Kp 9386ac4a24 Pass vobjptridx_t to multi_compute_kill 
The code previously trapped if killed<0 || killer<0, so use vobjptridx_t
instead of objptridx_t.
 2015-05-09 17:38:58 +00:00
Kp b5eae4c809 Split create_smart_children 2015-05-09 17:38:58 +00:00
Kp 08a42a68ff Pass vcobjptridx to laser_are_related 2015-05-09 17:38:58 +00:00
Kp 7e65d73e72 Factor out laser_are_related special cases 2015-05-09 17:38:58 +00:00
Kp 36ce989db6 Refactor get_next_segment 2015-05-09 17:38:58 +00:00
Kp bac03fdfd9 Split draw_weapon_info 2015-05-09 17:38:58 +00:00
Kp 8cb0572199 Split hud_show_weapons_mode 2015-05-09 17:38:57 +00:00
Kp 14ffc1690d Fix SDL gauges build 2015-05-09 17:38:57 +00:00
Kp fc4b686d9d Store PHYSFS_list element count in list when needed 2015-05-09 17:38:57 +00:00
Bradley Bell a02d0cffb5 NDEBUG constant used only in EDITOR. 
Fixes: similar/main/render.cpp:128:36: error: unused variable 'Show_only_curside'
 2015-05-05 21:11:52 -07:00
Bradley Bell e8cd69f0f4 Not needed in NDEBUG. 
Fixes: similar/main/ai.cpp:4311:20: error: unused function 'dump_ai_objects_all'
 2015-05-05 21:11:51 -07:00
Kp 168533bca0 Fix super weapon selection message 2015-05-06 02:11:03 +00:00
Kp e590cc59ee Hack around bogus none in guidebot path 2015-05-05 03:20:43 +00:00
Kp c408194a53 Cast away determine_used_textures_level shareware_flag 2015-05-05 03:20:42 +00:00
Kp 68834fb929 Expand render_mine window_rendered_data helper inline 2015-05-05 03:20:42 +00:00
Kp 9ff846d27c Use array<> for vertex lighting 2015-05-05 03:20:42 +00:00
Bradley Bell 630206275d Include <functional> for std::plus and std::minus. 
Fixes: similar/main/kconfig.cpp:81:12: error: no member named 'plus' in namespace 'std'
Fixes: similar/main/kconfig.cpp:82:12: error: no member named 'minus' in namespace 'std'

[Kp: fixed commit formatting.  Git style says line 2 is always blank.]
 2015-05-01 02:29:11 +00:00
Kp f7eaf36ad3 Fix rotate_uv_point with -Wmissing-field-initializers 
gcc-5 -Wmissing-field-initializers allows initialization by empty
braces, causing SConf not to pass -Wno-missing-field-initializers.
Change rotate_uv_point to return an explicitly 0 light to fix the
resulting warning.
 2015-04-30 03:32:27 +00:00
Kp 23af709aa0 Remove unused Outline_mode 
clang whines for unused `static const` variables.  Remove unused
Outline_mode to eliminate the warning.

Reported-by: btb <21f6d0d52b>
 2015-04-30 03:32:27 +00:00
Kp 0d564814f5 Convert Primary_weapon to primary_weapon_index_t 2015-04-26 20:15:57 +00:00
Kp f668705f20 Use array<> for Computed_colors 2015-04-26 20:15:57 +00:00
Kp 67e5e8c6c1 Remove unused gr_make_blend_table 2015-04-26 20:15:57 +00:00
Kp ace2235ad8 Remove unused gr_make_cthru_table 2015-04-26 20:15:57 +00:00
Kp 9274e56a41 Simplify gr_find_closest_color exit 2015-04-26 20:15:56 +00:00
Kp 8d849b2b39 Wrap laser level in class 
Move enum laser_level_t to weapon.h for the new class.
 2015-04-26 20:15:56 +00:00
Kp 6792c1bc4b Enable -Wunused-parameter 2015-04-26 20:15:56 +00:00
Kp 2772cf619f Pass local_multires_gauge_graphic to PAGE_IN_GAUGE 2015-04-26 20:15:56 +00:00
Kp 5a6cca499f Pass hud_bitblt grs_bitmap by & 2015-04-26 20:15:56 +00:00
Kp 78e415a502 Unify draw_weapon_info_sub picture selection 2015-04-26 20:15:56 +00:00
Kp 1412e41de2 Pass local_multires_gauge_graphic to sb_draw_keys 2015-04-26 20:15:56 +00:00
Kp 1111548f7f Pass local_multires_gauge_graphic to sb_draw_one_key 2015-04-26 20:15:55 +00:00
Kp 5f9bfe8a72 Pass local_multires_gauge_graphic to sb_draw_shield_bar 2015-04-26 20:15:55 +00:00
Kp 4b4fd713f1 Pass local_multires_gauge_graphic to sb_draw_shield_num 2015-04-26 20:15:55 +00:00
Kp 6d92f79a40 Pass local_multires_gauge_graphic to sb_draw_afterburner 2015-04-26 20:15:55 +00:00
Kp 23759f1700 Pass local_multires_gauge_graphic to sb_draw_energy_bar 2015-04-26 20:15:55 +00:00
Kp 4ecbe230cf Pass local_multires_gauge_graphic to draw_static 2015-04-26 20:15:55 +00:00
Kp 49bd4f3805 Pass local_multires_gauge_graphic to draw_secondary_ammo_info 2015-04-26 20:15:55 +00:00
Kp 8836e1750a Pass local_multires_gauge_graphic to draw_weapon_info 2015-04-26 20:15:55 +00:00
Kp 11b144ff43 Pass local_multires_gauge_graphic to draw_weapon_info_sub 2015-04-26 20:15:55 +00:00
Kp d3b20d60b6 Pass local_multires_gauge_graphic to draw_keys 2015-04-26 20:15:55 +00:00
Kp d12c0162cb Pass local_multires_gauge_graphic to draw_one_key 2015-04-26 20:15:54 +00:00
Kp 1e9b0c5e39 Pass local_multires_gauge_graphic to draw_player_ship 2015-04-26 20:15:54 +00:00
Kp 4b056a8a99 Pass local_multires_gauge_graphic to draw_shield_bar 2015-04-26 20:15:54 +00:00
Kp 2185552f53 Pass local_multires_gauge_graphic to draw_invulnerable_ship 2015-04-26 20:15:54 +00:00
Kp 2b3250ee3f Pass local_multires_gauge_graphic to draw_afterburner_bar 2015-04-26 20:15:54 +00:00
Kp a7f74bd383 Pass local_multires_gauge_graphic to draw_energy_bar 2015-04-26 20:15:54 +00:00
Kp f7abe3b2e1 Pass local_multires_gauge_graphic to draw_wbu_overlay 2015-04-26 20:15:54 +00:00
Kp d5a446381b Pass local_multires_gauge_graphic to cockpit_decode_alpha 2015-04-26 20:15:54 +00:00
Kp f7f4ec8ee8 Pass local_multires_gauge_graphic to sb_show_lives 2015-04-26 20:15:54 +00:00
Kp 0493737c79 Pass local_multires_gauge_graphic to hud_show_lives 2015-04-26 20:15:54 +00:00
Kp 1c11d731ec Pass local_multires_gauge_graphic to draw_primary_ammo_info 2015-04-26 20:15:53 +00:00
Kp 980d161119 Split draw_weapon_boxes 2015-04-26 20:15:53 +00:00
Kp c2f39d9b0f Pass local_multires_gauge_graphic to hud_show_flag 2015-04-26 20:15:53 +00:00
Kp 59c9b54814 Pass local_multires_gauge_graphic to hud_show_orbs 2015-04-26 20:15:53 +00:00
Kp f9fc9660a5 Pass local_multires_gauge_graphic to hud_show_keys 2015-04-26 20:15:53 +00:00
Kp ff8d7d754a Pass local_multires_gauge_graphic to show_homing_warning 2015-04-26 20:15:53 +00:00
Kp 1aa91b95af Pass local_multires_gauge_graphic to sb_show_score 2015-04-26 20:15:53 +00:00
Kp 4ff86bc63a Pass local_multires_gauge_graphic to hud_gauge_bitblt 2015-04-26 20:15:53 +00:00
Kp 1845769717 Pass local_multires_gauge_graphic to hud_bitblt 2015-04-26 20:15:53 +00:00
Kp ff0ed0288f Cache hiresmode at function scope 2015-04-26 20:15:53 +00:00
Kp b5b6a10688 Move gauges HIRESMODE lookup into method 2015-04-26 20:15:53 +00:00
Kp c599cde8a4 Factor out statusbar key drawing 2015-04-26 20:15:52 +00:00
Kp 69073bd6b0 Reduce writes to draw_invulnerable_ship::time 2015-04-26 20:15:52 +00:00
Kp fa401cd1d8 Convert PAGE_IN_GAUGE to ternary operator 2015-04-26 20:15:52 +00:00
Kp 4156fabddb Only page in needed key gauges 2015-04-26 20:15:52 +00:00
Kp 275cb40595 Factor out paging in gauges 2015-04-26 20:15:52 +00:00
Kp b94e5bd2e7 Factor out key drawing 2015-04-26 20:15:52 +00:00
Kp cca163fc30 Split select_weapon 2015-04-26 20:15:52 +00:00
Kp f789e29b41 Simplify check_to_use_primary 2015-04-26 20:15:52 +00:00
Kp 610f603ebf Pass weapon_name to select_weapon 2015-04-26 20:15:52 +00:00
Kp d161b17191 Factor out shareware/unusable weapon handling 2015-04-26 20:15:51 +00:00
Kp 10b9206a9b Split do_weapon_select 2015-04-26 20:15:51 +00:00
Kp 4d046c5336 Split auto_select_weapon 2015-04-26 20:15:51 +00:00
Kp 8e5a63700b Use enum class for ai_mode 2015-04-26 20:15:51 +00:00
Kp f15ec9c86a Use enum for AIM constants 2015-04-26 20:15:51 +00:00
Kp e883d7c872 Use enum class for AIB constants 2015-04-26 20:15:51 +00:00
Kp c3925353fd Use null_sentinel_iterator for PHYSFS_list_t 2015-04-26 20:15:51 +00:00
Kp 143c536c77 Use PHYSFS_list_t for more functions 2015-04-26 20:15:50 +00:00
Kp fd6ac87c25 Fix trigger_none checks 2015-04-26 20:15:50 +00:00
Bradley Bell b69dee5c07 remove trailing newlines. 2015-04-25 13:48:11 -07:00
Bradley Bell eaf40c24ce use Int3 instead of assert. 2015-04-25 13:45:37 -07:00
Bradley Bell 70cf799a6a use con_puts instead of con_printf. 2015-04-25 13:45:26 -07:00
Bradley Bell 3a550e124d mark functions as static. 2015-04-25 13:45:26 -07:00
Bradley Bell 844aad2639 Merge branch 'unification/master' into command-line 2015-04-24 20:54:35 -07:00
Kp 65a0d35678 Remove bogus Int3 in object_to_object_visibility 
A Future Pilot reports that find_vector_intersection can return an
unhandled fate.  When Int3 is enabled, this crashes the game.  Replace
the Int3 with a debug print.

Reported-by: A Future Pilot <http://www.dxx-rebirth.com/frm/index.php/topic,2024.msg21633.html#msg21633>
 2015-04-24 01:39:35 +00:00
Kp 6e9638531a Mark get_previous_segment static 2015-04-22 02:44:31 +00:00
Kp 9cfdc1d376 Fix game_leave_menus infinite loop if menu rejects close 2015-04-22 02:44:30 +00:00
Kp 08ee591e21 Fix ODR collision between ui/file browser and main/menu browser 2015-04-22 02:44:30 +00:00
Kp 834ae3b885 Fix find_escort build with gcc-5 2015-04-22 02:44:30 +00:00
Kp d4080c2505 Pass vcobjptr_t to draw_player 2015-04-22 02:44:30 +00:00
Kp 4d6d7fbbc7 Simplify automap door coloring 2015-04-22 02:44:30 +00:00
Kp 3eb8f4813e Pass vcobjptr_t to apply_damage_to_controlcen 2015-04-22 02:44:30 +00:00
Kp 863b429eb9 Only visit valid robots 2015-04-22 02:44:30 +00:00
Kp 3c64abb90b Use vsegptridx for load_mine_data segment loop 2015-04-22 02:44:30 +00:00
Kp 4572099403 Make endlevel globals static 2015-04-22 02:44:29 +00:00
Kp eedfaab822 Remove OGL Max_linear_depth 2015-04-22 02:44:29 +00:00
Kp ba4fdd8a0e Prevent debugger trap for hands-off multi_robot_request_change 2015-04-19 19:12:33 +00:00
Kp 9ec82b6856 Fix array overread 2015-04-19 19:12:33 +00:00
Kp bb9930bf5b multi_robot_request_change: check robot_controlled[slot] for object_none 2015-04-19 04:18:54 +00:00
Kp b46ecbb3e9 Add netgame parameter to duplicate powerups 2015-04-19 04:18:53 +00:00
Kp 4381b81497 Pack spawn granted items in D1 2015-04-19 04:18:53 +00:00
Kp b32298df5a Rewrite powerup cap code to centralize logic 2015-04-19 04:18:53 +00:00
Kp 96d92f6eaf Use partial_range for player trigger check 2015-04-19 04:18:53 +00:00
Kp b88c232f9f Use powerup_type_t for *_weapon_to_powerup 2015-04-19 04:18:53 +00:00
Kp 62d04866c4 Propagate hud_show_weapons_mode for variable i 2015-04-19 04:18:53 +00:00
Kp d7066c3eb9 Remove constant arguments to pick_up_ammo 2015-04-19 04:18:53 +00:00
Kp 28b4a65547 Centralize ammo rack bonus 2015-04-19 04:18:52 +00:00
Kp adbefd39c4 Minimize unnecessary fields passed to check_effect_blowup 2015-04-19 04:18:52 +00:00
Kp bee882dc99 Refactor gauges weapon coloring 
Move logic into smaller functions to give the compiler more choices
about inlining.
 2015-04-19 04:18:52 +00:00
Kp 98dc7cb90c Optimize D1 super weapon handling 
D1 has no super weapons.  Remove the check for them.
 2015-04-19 04:18:52 +00:00
Kp cd6be09547 Reduce kconfig.h includes 2015-04-19 04:18:51 +00:00
Kp c338862ad6 Reduce gauges.h includes 2015-04-19 04:18:51 +00:00
Kp 516b8b2397 Reduce collide.h includes 2015-04-19 04:18:51 +00:00
Kp 8582907b91 Reduce ai.h includes 2015-04-19 04:18:51 +00:00
Kp aa4c5efbb9 Replace HAS_PRIMARY_FLAG(x) with HAS_x_FLAG 2015-04-19 04:18:50 +00:00
Kp 12673084a0 Remove obsolete player_has_primary_weapon D1 special case 2015-04-19 04:18:50 +00:00
Kp 9d213b5282 Wrap player_has_weapon return type 2015-04-19 04:18:50 +00:00
Kp f74f879145 Simplify do_weapon_select call 2015-04-19 04:18:50 +00:00
Kp 0a1d643442 Remove obsolete weapon_num check 2015-04-19 04:18:50 +00:00
Kp 84c638ed64 Move PHYSFS_list_t to separate header 2015-04-19 04:18:49 +00:00
Kp 29a57b0dc0 Remove unused net_udp parameters 2015-04-19 04:18:49 +00:00
Kp 150e2d2686 Convert local arrays to array<> 2015-04-19 04:18:49 +00:00
Kp 7fd4ccb004 Simplify info_display_object_placement cache override 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
zico 17f5f67948 Fixed regression from 2645d41b5f - must use UDP_MDATA_STOR_QUEUE_SIZE for UDP_mdata_trace as it it a looping list 2015-04-18 22:15:52 +02:00
zico 03f9f11b6d Reworked net_udp_noloss_validate_mdata() to properly REsend MDATA ACK for packets that have been received before 2015-04-18 15:00:24 +02:00
Kp 8c106ea2e9 Avoid potential underflow when n_phys_segs==0 2015-04-11 04:01:29 +00:00
Kp e99a9236cf Avoid redundant vsegptridx calculation in object_move_one 2015-04-11 04:01:29 +00:00
zico 1fd7cb8929 Fusion cannon in Descent 1 was nerfed for Multiplayer after it was made stronger in 1.1 patch. This is fine but players expressed it being not desirable for Coop - which makes sense to me. This fix only applies the nerf to non-Coop games. 2015-04-08 15:05:03 +02:00
zico c60eb9c412 since the game keeps running during kmatrix, bail out of start_player_death_sequence if connect state != CONNECT_PLAYING to prevent incorrect suicide scoring 2015-04-08 14:37:33 +02:00
zico b512127328 fixed player ships not disappearing upon kill which was caused by removal of PKilledFlags and the improper undoing of hack to keep player exploding and respawning events in order 2015-04-08 14:23:55 +02: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
derhass 1c01698e88 GLES: fix use of uninitialized variables in ogl_texture_stats() 
Querying GL_INDEX_BITS and GL_DOUBLEBUFFER is not allowed in GLES, so
just use a reasonable default values for both. This is only used to
estimate memory consumption by the framebuffer (which is a questionable
approach in itself, since all those are implementation details not exposed
by the GL, and the actual memory used is likely to be higher anyway).
 2015-04-04 23:04:24 +02:00
derhass 49e7cfe37e GLES: never declare the unused variable gl_draw_buffer 
Move the declarition directly to the code part where it is used
(always in a #ifndef OGLES block).
 2015-04-04 22:58:02 +02:00
Kp df9ce26dfb Fix WORDS_NEED_ALIGNMENT build 
Integer promotion changed short+short into an int, but INTEL_SHORT only
takes short or unsigned short.  Add a cast to force the result back to
short.

Reported-by: derhass <https://github.com/dxx-rebirth/dxx-rebirth/issues/56>
 2015-04-04 17:23:47 +00:00
Kp a9c81c5614 Move Weapon_is_energy to collide.cpp 2015-04-02 02:36:57 +00:00
Kp 1c7bae4fc4 Use local array<> for object_buffer 2015-04-02 02:36:57 +00:00
Kp 5ae5033fed Use enum for AIB constants 2015-04-02 02:36:57 +00:00
Kp 6b6eaef226 Include polyobj.h from robot.h 
Swap the inclusion order since all robots are polyobjects, but not all
polyobjects are robots.
 2015-04-02 02:36:57 +00:00
Kp 2f86499144 Remove do_cockpit_window_view unused parameters 2015-04-02 02:36:57 +00:00
Kp b0ec49f8e5 Remove unused file+line from get_seg_masks 2015-04-02 02:36:56 +00:00
Kp 16a1fcbb37 Cache g3_draw_bitmap constants 2015-04-02 02:36:56 +00:00
Kp 68241ffbad Convert g3_draw_bitmap floats to structures 2015-04-02 02:36:56 +00:00
Kp 4e6d9b9901 Make xlate_previous const 2015-04-02 02:36:56 +00:00
Kp 1469e2e34c Simplify print_clock 2015-04-02 02:36:56 +00:00