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

101 commits

Author SHA1 Message Date
Kp 479884288c Always delegate to window_create for send_creation_events 2020-12-20 20:39:07 +00:00
Kp 200952c3d9 Add type-specific tag wrappers for newmenu calls 
Make the compiler check that title, subtitle, and filename are passed in
the right places.
 2020-12-19 16:13:26 +00:00
Kp ae657007fe Remove send_creation_events parameter 
It is always nullptr.
 2020-10-22 02:26:16 +00:00
Kp ffb653c0b8 Pass control_info & to various functions 
Switch from a direct global reference to passing control_info& as a
parameter.
 2020-10-12 03:28:26 +00:00
Kp ef8c0e7527 Make kmatrix window inherit from dcx::window 2020-08-28 00:18:45 +00:00
Kp 97315725fa Move get_multi_endlevel_poll2 into dsx 2020-08-28 00:18:45 +00:00
Kp 02aa5c182e Use NSDMI for kmatrix_screen::end_time initialization 2020-08-28 00:18:45 +00:00
Kp 363ecc36f1 Move kmatrix_screen into local scope 
It is only used inside one function, so there is no need to store it
into the structure.
 2020-08-28 00:18:45 +00:00
Kp 5501683dda Store kmatrix_result in kmatrix_screen 
Instead of storing a boolean that is later converted to a
kmatrix_result, store the desired result directly.
 2020-08-28 00:18:45 +00:00
Kp 53f75c3c72 Use enum class for kmatrix network flag 2020-08-28 00:18:45 +00:00
Kp 038c6aef4d Move d_level_unique_object_state to a separate header 
This is required to untangle the cross-inclusion of object.h and
morph.h.
 2020-08-10 03:45:14 +00:00
Kp 53761500f1 Qualify uses of std::array 2020-05-02 21:18:42 +00:00
Kp 707b3c5b0d Move Countdown_seconds_left to d_level_unique_control_center_state 2019-08-15 01:34:22 +00:00
Kp 597cb41717 Downgrade PCX failures from Error to CON_URGENT 
There is no need to kill the program due to a missing or malformed PCX file.
 2019-07-07 22:00:02 +00:00
Kp 1008ab397e Move Objects to d_level_unique_object_state 2019-03-03 00:31:08 +00:00
Kp d355ef4030 Pass font to various drawing functions 2018-05-19 23:21:42 +00:00
Kp fda1eb851e Pass fonts to LINE_SPACING 2018-05-19 23:21:42 +00:00
Kp 08446f0ab6 Pass font to gr_string,gr_printf 2018-05-19 23:21:42 +00:00
Kp 49c0cdae2e Simplify calls to gr_set_default_canvas 
Rather than use an inline wrapper and rely on the compiler optimizer to
redirect gr_set_current_canvas(nullptr) to gr_set_default_canvas,
rewrite all relevant calls directly in the source.

git grep -l 'gr_set_current_canvas' | xargs sed -i -e 's:gr_set_current_canvas(\s*NULL\|nullptr\s*);:gr_set_default_canvas();:'
 2017-11-05 20:49:08 +00:00
Kp e859833f62 Use valptridx for Players 
Currently, N_players is still a free variable and Players.count is
unused.  Future work will replace N_players with Players.count.
 2017-08-13 20:38:32 +00:00
Kp e8d82d7d85 Pass valptridx factories to static functions 2017-07-26 03:15:59 +00:00
Kp 869baefa07 Fold calls to kmatrix_status_msg 2017-03-11 19:56:29 +00:00
Kp 8dff2f0048 Pass canvas to kmatrix_status_msg 2017-03-11 19:56:28 +00:00
Kp 98b34b9328 Pass canvas to kmatrix_draw_coop_names 2017-03-11 19:56:28 +00:00
Kp efde3f7e33 Pass canvas to kmatrix_draw_names 2017-03-11 19:56:28 +00:00
Kp f10e418264 Pass canvas to kmatrix_draw_item 2017-03-11 19:56:28 +00:00
Kp e304f43efa Cache canvas in kmatrix_redraw_coop 2017-03-10 01:22:33 +00:00
Kp d5b7178fe5 Cache canvas in kmatrix_redraw 2017-03-10 01:22:33 +00:00
Kp 6b8f08142f Pass canvas to LINE_SPACING 
Macro LINE_SPACING previously used global grd_curcanv implicitly.
Change it to take a canvas argument.  Change all callers to pass
grd_curcanv, so that usage is explicit.
 2017-02-11 21:42:42 +00:00
Kp 6f81d13c41 Pass canvas to gr_set_curfont 2017-02-11 21:42:38 +00:00
Kp c24ea5ae1f Fold kmatrix_status_msg format string 2017-02-11 21:42:35 +00:00
Kp ae33aaafc1 Pass canvas to gr_set_fontcolor 2017-02-11 21:42:32 +00:00
Kp 0dcae721d9 Make canvas an explicit argument to gr_printf 
Previously, a macro implied *grd_curcanv as the canvas.  Pass the canvas
explicitly so that callers can choose the canvas to use.
 2017-02-11 21:42:32 +00:00
Kp 8c706a88bd Initialize grs_main_bitmap at construction 2017-01-28 18:12:20 +00:00
Kp 5da784dbed Pass canvas to gr_{,u}string 2017-01-08 22:32:00 +00:00
Kp 1b57e9a5ff Pass canvas to show_fullscr 2017-01-01 00:45:43 +00:00
Kp 1060c8fabb Move player::net_kills_total to player_info 2016-11-12 18:10:07 +00:00
Kp 411b623aa7 Move player::net_killed_total to player_info 2016-11-12 18:10:07 +00:00
Chris Taylor 143ed30fee Merging in unification/master, resolving conflict in similar/main/kmatrix.cpp 2016-11-06 14:20:18 +08:00
Kp 3081e69536 Pass grs_main_bitmap to gr_init_bitmap_alloc 2016-10-29 23:16:15 +00:00
Chris Taylor 7ac820248c Use new event_process_all() for event loops that check for window_event_result::deleted (which is most of them) 2016-10-29 20:06:01 +08:00
Chris Taylor b2513ab9a0 Check for window_event_result::deleted for kmatrix_view polling loop 
This is instead of using window_exists, which could give a false positive if a new window was allocated with the same pointer value as a deleted one.
 2016-10-28 15:27:45 +08:00
Kp 01f2932824 Pass grs_canvas &to window_create 2016-10-15 00:53:20 +00:00
Kp ecb91955ae Move player::score to player_info 2016-10-15 00:53:19 +00:00
Kp f97639204e Fold kmatrix fontcolor lookup 2016-10-15 00:53:16 +00:00
Kp 21f8aec44d Remove unnecessary gr_set_fontcolor in kmatrix_draw_coop_names 2016-10-15 00:53:15 +00:00
Kp 71b87bceee Factor out kmatrix_redraw_coop calls to gr_find_closest_color 2016-10-15 00:53:15 +00:00
Kp f84de25e6b Expand kmatrix_draw_coop_item inline 
kmatrix_draw_coop_item computes various values that are always the same
for every iteration of the calling loop.  Expand it inline in its one
caller so that the caller can cache those values.
 2016-10-15 00:53:14 +00:00
Chris Taylor 60ac1eaad3 Replace delete dcx::window kludge with a better solution 
Replace delete dcx::window kludge with a better solution: instead of requiring every handler to delete the window, add a window_event_result::deleted, which gets returned if the window was deleted by the handler, so window_close knows not to attempt to delete it again.
 2016-10-04 14:05:44 +08: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