Chris Taylor
4d9eb4e743
Allow dcx::UI_DIALOG struct to be subclassed - step 1
...
Allow dcx::UI_DIALOG struct to be subclassed step 1. This step renames and reconfigures untyped_ui_dialog_create in dialog.cpp to be the main constructor. Also adds a template constructor that allows an event handler that takes a subclass of UI_DIALOG.
2016-10-04 11:29:19 +08:00
Chris Taylor
d4b85de49b
Remove redundant checks for nullptr before deleting dcx::window instances in response to feedback.
2016-10-03 11:21:11 +08:00
Chris Taylor
ca35a8091f
Declare dcx::window with class keyword to clarify its intended use.
...
Also removes the need for the private keyword in the definition.
2016-10-03 11:15:22 +08:00
Chris Taylor
708cd027f0
Use member initialisation list for dcx::window constructor in response to feedback.
2016-10-03 11:10:11 +08:00
kreatordxx
b87fcad332
Merge pull request #230 from dxx-rebirth/allow_window_subclasses_2
...
Allow window subclasses
2016-10-03 10:36:26 +08:00
Kp
f386c79389
Add preprocessor hook for selective dsx migration
2016-10-02 19:35:35 +00:00
Kp
ec19a6947f
Move more symbols to namespace dsx
2016-10-02 19:35:34 +00:00
Kp
53bec35f34
Use range_for for player_ship_read
2016-10-02 19:35:34 +00:00
Kp
261d19332b
Remove unnecessary __pack__ on D1 player_ship
...
The size is the same with and without the __pack__.
2016-10-02 19:35:34 +00:00
Kp
3024bb8bbe
Pass object_base &to create_player_appearance_effect
2016-10-02 19:35:34 +00:00
Kp
a468e2612b
Factor out gr_set_attributes SDL_GL_SetAttribute calls
2016-10-02 19:35:34 +00:00
Kp
0abb7278da
Move FPSIndicator to CCfg
2016-10-02 19:35:33 +00:00
Kp
797554f80a
Move Multisample to CCfg
2016-10-02 19:35:33 +00:00
Chris Taylor
87617e8ac9
Allow dcx::window struct to be subclassed - step 3
...
Allow dcx::window struct to be subclassed step 3. This step adds the window destructor and both requires and implements the window to be deleted by the event handler/client in all cases.
2016-10-02 17:49:19 +08:00
Chris Taylor
f117df9eee
Allow dcx::window struct to be subclassed - step 2
...
Allow dcx::window struct to be subclassed step 2. This step renames and reconfigures window_create in window.cpp to be the main constructor. Also add a template constructor that allows an event handler that takes a subclass of window.
2016-10-02 14:49:22 +08:00
Chris Taylor
15e9f4a383
Allow dcx::window struct to be subclassed - step 1
...
Allow dcx::window struct to be subclassed step 1. This step moves the definition for the window struct into window.h, keeping all member variables private and declaring the window related functions as 'friends'. This avoids changes to source files that use the window struct at this stage. Also moving some of the simpler functions in window.cpp into the struct definition to inline them. I would prefer to use class methods, so changing some of these to class methods as well.
2016-10-02 14:32:30 +08:00
Kp
da4f55f47e
Show some environment values before/after sconf runs
2016-10-02 00:34:50 +00:00
Kp
968746c0e8
Pass secondary_weapon_index_t to player_has_secondary_weapon
2016-10-02 00:34:49 +00:00
Kp
603159ec4b
Pass secondary_weapon_index_t to do_secondary_weapon_select
2016-10-02 00:34:49 +00:00
Kp
b8f58309f0
Reuse computed filename for screenshot
2016-10-02 00:34:49 +00:00
Kp
2289ed473d
Unify computing write_bmp output size requirement
2016-10-02 00:34:49 +00:00
Kp
b2f744f1f8
Remove unnecessary diminish_palette in pcx_write_bitmap
...
The variable is never read after that diminish_palette call, whether in
pcx_write_bitmap or in its sole caller.
2016-10-02 00:34:49 +00:00
Kp
e11ac102a6
Cache bitmap properties in pcx_write_bitmap
2016-10-02 00:34:49 +00:00
Kp
815a26f32d
Expand and cache various uses of get_local_plrobj()
2016-10-02 00:34:48 +00:00
Kp
6c7e64d871
Fold ai_do_actual_firing_stuff calls to ready_to_fire_weapon1
2016-10-02 00:34:48 +00:00
Kp
95988a343c
Pass player object to recompute_automap_segment_visibility
2016-10-02 00:34:48 +00:00
Kp
0d5d191671
Pass player object to DropMarker
2016-10-02 00:34:48 +00:00
Kp
67e10d532b
Pass player powerup_flags to init_ai_frame
2016-10-02 00:34:48 +00:00
Kp
13f751364d
Pass player powerup_flags to make_nearby_robot_snipe
2016-10-02 00:34:48 +00:00
Kp
dc7c718b66
Pass player powerup_flags to create_bfs_list
2016-10-02 00:34:47 +00:00
Kp
1dcacefc9c
Pass player object to check_trigger
2016-10-02 00:34:47 +00:00
Kp
171e303adb
Pass player object to check_trigger_sub
2016-10-02 00:34:47 +00:00
Kp
84e596e1b4
Pass player_info to player_has_powerup
2016-10-02 00:34:47 +00:00
Kp
69b84e418d
Pass player_info to pick_up_energy
2016-10-02 00:34:47 +00:00
Kp
0b01bad915
Pass player_info to pick_up_primary_or_energy
2016-10-02 00:34:47 +00:00
Kp
038a6e3261
Pass player powerup_flags to wall_hit_process
2016-10-02 00:34:46 +00:00
Kp
3f27b6daac
Pass player_info to CyclePrimary
2016-10-02 00:34:46 +00:00
Kp
2c37514235
Pass player_info to CycleSecondary
2016-10-02 00:34:46 +00:00
Kp
36213d9b50
Pass player_info to select_secondary_weapon
2016-10-02 00:34:46 +00:00
Kp
e3c3e39045
Pass player_info to do_primary_weapon_select
2016-10-02 00:34:46 +00:00
Kp
fe1cd6a165
Pass player_info to maybe_autoselect_primary_weapon
2016-10-02 00:34:46 +00:00
Kp
8219df8db9
Pass player_info to pick_up_secondary
2016-10-02 00:34:45 +00:00
Kp
c94cec40d0
Pass player_info to pick_up_primary
2016-10-02 00:34:45 +00:00
Kp
2bd5b80451
Pass player_info to check_to_use_primary_super_laser
2016-10-02 00:34:45 +00:00
Kp
86a4942883
Pass player_info to do_secondary_weapon_select
2016-10-02 00:34:45 +00:00
Kp
888415f086
Pass player_info to reject_unusable_secondary_weapon_select
2016-10-02 00:34:45 +00:00
Kp
dfc2584c39
Pass player_info to reject_unusable_primary_weapon_select
2016-10-02 00:34:45 +00:00
Kp
9800f856e7
Pass player_info to select_primary_weapon
2016-10-02 00:34:45 +00:00
Kp
11551abe5c
Pass player_info to non-static pick_up_vulcan_ammo
2016-10-02 00:34:44 +00:00
Kp
44579c7dc8
Pass player_info to static pick_up_vulcan_ammo
2016-10-02 00:34:44 +00:00