From 5501683ddaa5476bb7fee0ddb7cbcd319afa3ed5 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Fri, 28 Aug 2020 00:18:45 +0000
Subject: [PATCH] Store kmatrix_result in kmatrix_screen

Instead of storing a boolean that is later converted to a
kmatrix_result, store the desired result directly.
---
 similar/main/kmatrix.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/similar/main/kmatrix.cpp b/similar/main/kmatrix.cpp
index ae74e2c95..71ba484ee 100644
--- a/similar/main/kmatrix.cpp
+++ b/similar/main/kmatrix.cpp
@@ -176,8 +176,8 @@ struct kmatrix_screen : ignore_window_pointer_t
 	grs_main_bitmap background;
 	fix64 end_time;
 	int playing;
-        int aborted;
 	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_leave_game();
-                                                km->aborted = 1;
+						km->result = kmatrix_result::abort;
 
 						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_leave_game();
-                                                km->aborted = 1;
+						km->result = kmatrix_result::abort;
 					}
 				}
 #endif
@@ -395,11 +395,11 @@ kmatrix_result kmatrix_view(const kmatrix_network network)
 		return kmatrix_result::abort;
 	}
 	gr_palette_load(gr_palette);
-	
+
 	km.network = network;
 	km.end_time = -1;
 	km.playing = 0;
-        km.aborted = 0;
+	km.result = kmatrix_result::proceed;
 	
 	set_screen_mode( SCREEN_MENU );
 	game_flush_inputs();
@@ -415,6 +415,5 @@ kmatrix_result kmatrix_view(const kmatrix_network network)
 	}
 	
 	event_process_all();
-
-	return (km.aborted ? kmatrix_result::abort : kmatrix_result::proceed);
+	return km.result;
 }