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

1830 commits

Author SHA1 Message Date
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 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 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 0ece005dfa Use screen_mode for screen resolution 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 fd51d9dcd5 Shorten kc_change_mouseaxis 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 a4ba74f94a Expand void ternary operator into if/else 2015-05-09 17:39:02 +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 cf87ebe54d Remove write-only grs_bitmap::bm_handle 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 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 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 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