TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Store kmatrix_result in kmatrix_screen

Browse source 
Instead of storing a boolean that is later converted to a
kmatrix_result, store the desired result directly.
This commit is contained in:
Kp 2020-08-28 00:18:45 +00:00
parent 53f75c3c72
commit 5501683dda
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
similar/main/kmatrix.cpp
View file

@ -176,8 +176,8 @@ struct kmatrix_screen : ignore_window_pointer_t
grs_main_bitmap background; grs_main_bitmap background;
fix64 end_time; fix64 end_time;
int playing; int playing;
int aborted;
kmatrix_network network; kmatrix_network network;
kmatrix_result result;
}; };
} }
@ -306,7 +306,7 @@ static window_event_result kmatrix_handler(window *, const d_event &event, kmatr
multi_send_endlevel_packet(); multi_send_endlevel_packet();
multi_leave_game(); multi_leave_game();
km->aborted = 1; km->result = kmatrix_result::abort;
return window_event_result::close; return window_event_result::close;
} }
@ -361,7 +361,7 @@ static window_event_result kmatrix_handler(window *, const d_event &event, kmatr
multi_send_endlevel_packet(); multi_send_endlevel_packet();
multi_leave_game(); multi_leave_game();
km->aborted = 1; km->result = kmatrix_result::abort;
} }
} }
#endif #endif
@ -395,11 +395,11 @@ kmatrix_result kmatrix_view(const kmatrix_network network)
return kmatrix_result::abort; return kmatrix_result::abort;
} }
gr_palette_load(gr_palette); gr_palette_load(gr_palette);
km.network = network; km.network = network;
km.end_time = -1; km.end_time = -1;
km.playing = 0; km.playing = 0;
km.aborted = 0; km.result = kmatrix_result::proceed;
set_screen_mode( SCREEN_MENU ); set_screen_mode( SCREEN_MENU );
game_flush_inputs(); game_flush_inputs();
@ -415,6 +415,5 @@ kmatrix_result kmatrix_view(const kmatrix_network network)
} }
event_process_all(); event_process_all();
return km.result;
return (km.aborted ? kmatrix_result::abort : kmatrix_result::proceed);
} }