Commit graph

2329 commits

Author SHA1 Message Date
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