From 864a9ca3d517a826a6c1fec67712a05c36f0334c Mon Sep 17 00:00:00 2001
From: Alexander Bass <alexander@alexanderbass.com>
Date: Wed, 7 Jun 2023 16:07:03 -0400
Subject: [PATCH] general cleanup

---
 assets/faces.png                 | Bin 1757 -> 1719 bytes
 minesweeper.html                 |   2 +-
 src/gui.rs                       |   4 +-
 src/gui/highlighter.rs           |  30 +++++------
 src/gui/settings_menu.rs         |  65 ++++++++++------------
 src/gui/seven_segment.rs         |  31 +++++++++++
 src/gui/texture_store.rs         |   8 +--
 src/gui/tile_render.rs           |  89 +++++++++++++++----------------
 src/gui/top_menu/flag_counter.rs |  31 +++++------
 src/gui/top_menu/timer.rs        |  31 +++++------
 src/logic/game_board.rs          |  38 ++++++-------
 src/sprite_loader.rs             |   6 +--
 src/util.rs                      |  15 +++++-
 13 files changed, 184 insertions(+), 166 deletions(-)
 create mode 100644 src/gui/seven_segment.rs

diff --git a/assets/faces.png b/assets/faces.png
index 968fdbd40376c40bbfe9ce65bfabf8662a52bd1c..c2bb0dd838c93e7212d3dc28ff0f62d6bb8f25b3 100644
GIT binary patch
delta 1695
zcmV;Q24MN!4Yv)DEPoRKooSs(uK)l532;bRa{vGf6951U69E94oEQKA23JW$K~#8N
z?OY2|<v0vnw&q@NGp@!v+3sd2?HFNMEy;E)o~WYc6I*JvTc3pRUjF&->#u}gkH_OT
z>W`0)gy{c3et&;YiJ$m?eSIzbH!wi_|9yk+a#;)%1Cto|HGj#@HZxM^eS3S`hT)kV
zasIP);Gc%SI`A`RW5u4Hfo~m{D%7cwWxwauc+Jj#;nz+$cAe|LI&h57+FcCX%0MOX
zt@M}kVj#xAvWHl`he|(v{EZ#O+}+vvFZ`GurX?`)6qv86gvJgDS(Tmt!jGKt_ch@J
zmWc1Y9`f??6@LKjtwi=6-nA<`|AjyHGE(Rsn3I1cEq(VSDP2dZuV3Qvofkg-9k&{{
zke&a+|EYn9{#_loN4!;z)S;;>pVW;JLhrmC$j*P^|7>*ES5*Jz4&0JI>b7V?a~nwV
zpth~+sLS$w?c^ZEEbX;o(AH<?zwm!O;i&#i3CzjY#D8YF-rh6ck;ECsx$OKGemNt&
z`ge`ctA2m!vdbTIS&D#XZN_mfJO72huT+oz;SNkfUqwEJMD}-d;Y{P4#Q#<ByhX3K
zcNPEH^>ZqID1k@GL?W<?2-&wXi8GCJ5)UosmPF=jrL&vGKdPTr6PCYAlh<neoHsNF
z(0vGgD1U)@ccg!#KsdqLzSUj6#k0!S3cH9+O+?!DiyOp`=XRyFYbiLIFK%lGe&UJv
zy#7S}wxe=yA8O~qpe8U<1vG*q*H`#IbsXyPgmm8szfv)#|Bv$D+m93xN)XFWI(l|j
z;O7m%lDus*MD}U;)dZHh?+nq5Y*?z01q(XPS$}NqxE(<G(AH_!SDiO?9ZE6{2fvQ4
zr?b%3Th4bhl~59*MX4>AqlZ=~emH@90b5Cy#DRjfl5Qyw+E_2y()O*2ZMNOn_C~i&
z<ZG7Co;_<qd9>Ab&`~n>xM(p)u!a)YGv>5OY#EO{1oJ)GI5NY>$i{5{oIf-n+I2h6
zpnvD9hgpgPS-U$PK29SV@;1Jn?O_7%x>uBfra)H+A0c|y8Z@z_f}`#Ch!)us<sW_0
zPgqb)?Rrf+*LAOcGUz|tfoF;QZadzp=-qdBygU7C1!xtPyZo+-r)SsoCe}`XJAHW%
z+`DgQY~|}`GVnAVIKw#fGbL70tz@7&@PA5nZ?xTeviWS2LgeZ0jYns4J?y~rNf{Cm
zGv1~d*&x5q`iUJH|Gkse__T;R%D)G{Nxk4=uYT^vkMKXG10!#gNMZxepq4opXgjVY
zaUHJQThJFfM*2BzvKVna8*AtuI3kcX$k{=;)s%eWh||bf?V!b4V65wR#h~GuF@LqT
zvA_u|0pr531|TJ`X2*IU+Bh_WSZ#d0Fnh;23m=vjAtW9x{*bfCt{;sL?K<a3Td!Rw
zdujqBg5!cAA@}}l13@}3;vW$Zx&|fAdLXEOzHWE?v;8CZPu35DpKFG{m?FJ+f@n?i
zuO@JNpxSJYB;;jJd*cQP%$pF>zJJJwx$AZS<waT--5=#VyMB83`PpkZz_qX0)HsI{
zSgQiOtByuEEx^{6#jh49Qix8y9YA>)6(LWNLH%mnTkMRAyH@yTPY+}d!EezuHL)4I
zK?&U6yP;LQH%4fHuj^zVAq}x-EeNNMbJ{(8kBjye2IXoM|5p5`=|{qEEq^Lnv$OIK
zCos~%P?1RM(BcsF(-w-JEz6;3YgfeN9YycJDixL)XUJ`=;QDm@rUY)g;%u^7dn>xH
zWgMclr;T$K{;eHs2mcoQ)&zf6{H6qMM``L}(L|;(&y!%*L*_nE?ABx;Kh|*wiH9cv
z8pCMn*&+Vk`SP<z;_r3cXMe`;dJ~I8M86<F1X^z7x$stY-H|XZ92VTD$fAig@{^ta
z!vFoFfW7)Rci_=OA?=}wblnRcO{U(u?Bg7thT4fpDjp~CU-<v1GNON12ks>?|I`Dd
z14V#GlD8e_B2$F+5M@Vvyqody9qHsVxb)g6{9fih_k|N!x_9k;jDN`vL0jp_KF($5
zzwlcX`*r=a1m-YKOjfNMwM9pJ@j;p}PKo;z9A0@AevG+g35>ZvYgP7f?kqM7%?<|s
zPvFPn@!Mba$~S{F&cTk`f$aPj{u#=%+o%o<a8^YPAgPwz!oaWWmGc(XCOXZ|f8n1f
p28XH8&w(BOYD+Ot3>Zvg;9oJyI130TSAzfm002ovPDHLkV1jY@VwnH{

delta 1733
zcmV;$20Hn-4c!fpEPnt10Qp0^e*gdg32;bRa{vGf6951U69E94oEQKA27O6HK~#8N
z?OX{`95D<GDgFgN<7@28k_?oB(Ark(7>~`0Dk>o(OYPR_S%;@T|Gs{0_;tJ8K2X2E
zzi){C3-a6B+m`r=|Cg7S!hZn+#Q*OLY?sMmpcqJE;5kXpG=DX{&infMIt{}k8<PC*
z)`5Q-{_4PwoQ<{j?HRc1z*M1D-P!JEUX9n?`7ivMhhxuW{8tB#@mZ^jflC>v1iqC1
zGF}YC7&z@ER_mqGPal6{uE<@zJO70ri-)uXM&1HTnM!EPNr=?${1<-2%l9(j1RfF3
zuZTQ7-5aO1m4C=S=N+qd=fCjBE+d7`z>@qUVfi-?%h5BW`uamWzVg5)zvEit8g}Qu
z@PEcYB>r6;xJA4*9H~1~XI`lrBZOXg9N3-z!vERmj<0C^n>#QkpSr3wd0U;C{tZc<
zh`rHT>as1F-ekdX&%nMr|Aqg1bjcjD#*it2CHa|&#DCAr)=gyK*kPR8o&Un$k5q5`
zyGH1<{{PaUxAn3sBSCvQb{yw+=fCi`qtO%pa0jM9KZ|_Y66v4Og?Ad~di);+&s+3b
zYtQ0;_xM>AKa{|uWTGIj1`)FE%p~4voa^zxIkzOTl<oO0i+?nJcuZLSj!swJNe<zk
zzmU@GNPoT~{6h&WyCeOK0+Aci)}7tu<x4b;aL@BI_JHWr3aR$|*ehZu%88}mXtt!T
z8Tg4O;`8_uwaZ84);d(rfk92+tSYQI;p{5P^{+Y(wKzblzn9-$G3IaABf4Aoks?9~
zV)>+FbXmx|2QB_787)c2lV4k>*;f;|*L}T&pnvPMjiGv^96HWf^v^gBpnPa@+Vivg
zO@U5Hrs0s!QF-!(CU5cYXeyx&iWVhaFh?(~Q2cNLw>E4gxfdKLSS#rxd1+G{>wCJi
zb!Y7@TW_{L$rtB|Y-QPO>9Z!3C${+bJ4(hD7aVg0Ybb#|V-8PZ%Xs7=*wTG7^lLh_
zaeqi#FP}^P(1hS}Gkwsq)xzA{2O>LrKinrC{zu&%iHBhVX9pYts3nt)10~vvx0Prf
zUFg0&L2Frq;usao5$A*j!Gy|kdl~pW{>xf3!Vh)e*#UpnIm|LrqkHxqBP`BEu~>8>
zvRQVs^dOi$9Z}P}GJe-hEN#QPKKDAxyMJz1o(lIm3_u-t9k_lZ-Z9E=vAuE?9NGIS
zeb+DmC2-^|S!7#h*uAP-M(lccXx(J8`od$kWg|;Z;lF2Kn84a^%E-7)gXqw3SRK2I
zyl3AdJ`t{4+<0&tdc5nh{o}>qT{jbd${E;ljf`*Zs>+;A@T&TF*I$)u^kT=TvwugX
zn=^bj;yN2EG(z__83~Zq2m5D`DRo{I$TRGYIF0yfMZe78)4FeD!a-y#cHso>5hepe
zBUWypSCKS5mQ5n#Tn4d-4)0iI;lpwfqQ|4f9^#AL<45B|dv0wcs6I7;k${r{(|Uo@
z3T|YaK<py{gvy}ASsjAfmvXcBpMPy1!M}3+Aoyj>$jc`DXX_DCv#%yFY7n_aL%K9s
zZxVTv<X9IOF=rhIP+od+(e)92kG0y_5Gm;7tC1|aPwReKdZq8RJ;>PCbZQu(1lFnm
zH!@02EpfA}zjZuZ^*Dg?KPp0=B7@r1g3O|4#rQ$+Yl$m4LgW#<Py+KaB!61nT4RLf
zXkMie@Q6MxgXmm!oFnWg|HLJ7E^kd)2v-*Vt@u}qpB{c|Q_`9p`4{CMPGEGDwm5ax
zIkJUm=W))9T?;l#aahsMkBHxtz`QDClg0I+)yES=7Tv3ja~A%s9c%{w7W`J<J}Q1w
z0`pOtk7!o1WjCKeeruFQi+_+c8OWA(971@MNr3KQ^gduF|Aqg%C*%>w(qIlvuA5k7
zgf8Y&03Zi*8Qk=<6*v;?h|GcAf*aAv&+@3eMQ(Tg3;+Ead2jriJMieG5LJ`bi<8ka
zFL+DPOWEDWIXMmSiD(D@3;$O{M&jSqfm=!J`R#)d;F09zT|Y8KNPi4+oSm^h+0Eqf
zWW>`9e43vMzsAt`c{qW4BXBFBR|uG1CypfY6^T2VD2`{l@V|TfT#Y|1fwh2&)tU2G
zAH{_Sy-Z5<rq(J&Y84z_&lP@*xziFDGryM9?&I8AY!;ds4E#^v+wJyYZ}-ZVL7L=X
z#yGk=|Ajvz^6WaQ13m+sRZ#;-Dv?VVc;3BoUcy?U(cSqk{E5NfP!;+d*kP}h6a&RT
bA_IQ`r8q_tWDa_^00000NkvXXu0mjfT0d;E

diff --git a/minesweeper.html b/minesweeper.html
index 7c72608..1de8186 100644
--- a/minesweeper.html
+++ b/minesweeper.html
@@ -32,7 +32,7 @@
         <script src="https://not-fl3.github.io/miniquad-samples/mq_js_bundle.js"></script>
         <script>
             load("./minesweeper.wasm");
-        </script> <!-- Your compiled wasm file -->
+        </script>
         <script>
             document.addEventListener("contextmenu", (e) => {
                 e.preventDefault();
diff --git a/src/gui.rs b/src/gui.rs
index a33fd9c..e2e418e 100644
--- a/src/gui.rs
+++ b/src/gui.rs
@@ -1,6 +1,7 @@
 mod board_render;
 mod highlighter;
 pub mod settings_menu;
+mod seven_segment;
 pub mod texture_store;
 mod tile_render;
 pub mod top_menu;
@@ -86,9 +87,6 @@ impl UIState {
 			self.letterbox.1 = 0f32;
 		}
 	}
-}
-
-impl UIState {
 	pub fn pixel_screen_offset(&self, x: usize, y: usize) -> (f32, f32) {
 		let (x, y) = self.pixel_screen_scale(x, y);
 		let x = x + self.letterbox.0;
diff --git a/src/gui/highlighter.rs b/src/gui/highlighter.rs
index 6c00e2a..77d7c28 100644
--- a/src/gui/highlighter.rs
+++ b/src/gui/highlighter.rs
@@ -26,30 +26,30 @@ pub enum Highlight {
 	Wide,
 }
 
+// The highlighter is responsible for the selection when a tile is clicked and held either with left or middle click
 impl Highlighter {
 	pub fn events(&mut self, ui_state: &UIState, event_handler: &mut Events<GUIEvent>, game_board: &mut GameBoard) {
-		if !ui_state.frozen && ui_state.mouse_in_minefield {
-			if is_mouse_button_pressed(MouseButton::Left) {
-				self.highlight = Highlight::Normal;
+		if !ui_state.frozen {
+			if ui_state.mouse_in_minefield {
+				if is_mouse_button_pressed(MouseButton::Left) {
+					self.highlight = Highlight::Normal;
+				}
+				if is_mouse_button_pressed(MouseButton::Middle) {
+					self.highlight = Highlight::Wide;
+					self.check_reveal(event_handler, ui_state, game_board)
+				}
 			}
-			if is_mouse_button_pressed(MouseButton::Middle) {
-				self.highlight = Highlight::Wide;
-				self.check_reveal(event_handler, ui_state, game_board)
-			}
-		}
-		if is_mouse_button_released(MouseButton::Left) {
-			self.reset_highlight(ui_state, event_handler);
-			if !ui_state.frozen {
+			if is_mouse_button_released(MouseButton::Left) {
+				self.reset_highlight(ui_state, event_handler);
 				event_handler.add(GUIEvent::SetSmileyState(SmileyState::Chillin));
 			}
-		}
-		if is_mouse_button_released(MouseButton::Middle) {
-			self.reset_highlight(ui_state, event_handler);
-			if !ui_state.frozen {
+			if is_mouse_button_released(MouseButton::Middle) {
+				self.reset_highlight(ui_state, event_handler);
 				event_handler.add(GUIEvent::SetSmileyState(SmileyState::Chillin));
 			}
 		}
 	}
+
 	fn check_reveal(&self, event_handler: &mut Events<GUIEvent>, interface: &UIState, game_board: &mut GameBoard) {
 		let (x, y) = interface.cursor;
 		if let Some(tile) = game_board.get_tile_mut(x, y) {
diff --git a/src/gui/settings_menu.rs b/src/gui/settings_menu.rs
index 51a2203..97afb60 100644
--- a/src/gui/settings_menu.rs
+++ b/src/gui/settings_menu.rs
@@ -1,12 +1,24 @@
 use crate::{logic::game_board::ModifyMode, util::Events};
 
-use super::{texture_store::TextureStore, GUIEvent, Language, UIState};
+use super::{seven_segment::draw_seven_segment_unscaled, texture_store::TextureStore, GUIEvent, Language, UIState};
 use macroquad::{
 	hash,
 	prelude::*,
 	ui::{root_ui, widgets, Skin, Ui},
 };
 
+const NEW_GAME_HEIGHT: f32 = 40f32;
+const NEW_GAME_WIDTH: f32 = 250f32;
+const BUTTON_MENU_WIDTH: f32 = 250f32;
+const BUTTON_SIZE: f32 = 100f32;
+const BUTTON_MENU_Y: f32 = 400f32;
+const BUTTON_MENU_LABEL_HEIGHT: f32 = 20f32;
+
+const MIN_MINEFIELD_WIDTH: usize = 5;
+const MAX_MINEFIELD_WIDTH: usize = 100;
+const MIN_MINEFIELD_HEIGHT: usize = 5;
+const MAX_MINEFIELD_HEIGHT: usize = 100;
+
 pub struct SettingsMenu {
 	mines: usize,
 	width: usize,
@@ -46,16 +58,13 @@ impl SettingsMenu {
 			ui.pop_skin();
 			ui.push_skin(&skin);
 			let half_screen_width = screen_width * 0.5;
-			const MIN_MINEFIELD_WIDTH: usize = 5;
-			const MAX_MINEFIELD_WIDTH: usize = 100;
-			const MIN_MINEFIELD_HEIGHT: usize = 5;
-			// const MAX_MINEFIELD_HEIGHT: usize = 100;
+
 			render_counter(
 				&mut self.width,
 				ui,
 				&textures,
 				vec2(half_screen_width, 100f32),
-				String::from("Minefield Width"),
+				"Minefield Width",
 				MIN_MINEFIELD_WIDTH,
 				MAX_MINEFIELD_WIDTH,
 			);
@@ -64,21 +73,19 @@ impl SettingsMenu {
 				ui,
 				&textures,
 				vec2(half_screen_width, 200f32),
-				String::from("Minefield Height"),
-				MIN_MINEFIELD_WIDTH,
+				"Minefield Height",
 				MIN_MINEFIELD_HEIGHT,
+				MAX_MINEFIELD_HEIGHT,
 			);
 			render_counter(
 				&mut self.mines,
 				ui,
 				&textures,
 				vec2(half_screen_width, 300f32),
-				String::from("Mines"),
+				"Mines",
 				1,
 				self.width * self.height - 10,
 			);
-			const NEW_GAME_HEIGHT: f32 = 40f32;
-			const NEW_GAME_WIDTH: f32 = 250f32;
 			if widgets::Button::new("New Game")
 				.size(vec2(NEW_GAME_WIDTH, NEW_GAME_HEIGHT))
 				.position(vec2((screen_width - NEW_GAME_WIDTH) * 0.5, 0.0))
@@ -87,12 +94,9 @@ impl SettingsMenu {
 				event_handler.add(GUIEvent::CreateNewGame(self.width, self.height, self.mines));
 				event_handler.add(GUIEvent::CloseSettings);
 			}
-			const BUTTON_MENU_WIDTH: f32 = 250f32;
 			let language_button_x = (screen_width - BUTTON_MENU_WIDTH) * 0.5;
-			const BUTTON_SIZE: f32 = 100f32;
-			const BUTTON_MENU_Y: f32 = 400f32;
 			let question_button_x = (screen_width - BUTTON_MENU_WIDTH) * 0.5 + (BUTTON_MENU_WIDTH - BUTTON_SIZE);
-			const BUTTON_MENU_LABEL_HEIGHT: f32 = 20f32;
+
 			widgets::Label::new("Language")
 				.position(vec2(language_button_x, BUTTON_MENU_Y - BUTTON_MENU_LABEL_HEIGHT))
 				.size(vec2(BUTTON_SIZE, BUTTON_MENU_LABEL_HEIGHT))
@@ -141,36 +145,23 @@ impl SettingsMenu {
 	}
 }
 
-fn render_counter(
-	count: &mut usize,
-	ui: &mut Ui,
-	textures: &TextureStore,
-	position: Vec2,
-	title: String,
-	min: usize,
-	max: usize,
-) {
+const COUNTER_DIGIT_WIDTH: f32 = 13f32 * 2.0;
+const COUNTER_DIGIT_HEIGHT: f32 = 23f32 * 2.0;
+const COUNTER_BUTTON_HEIGHT: f32 = 30f32;
+const COUNTER_BUTTON_MARGIN: f32 = 10f32;
+const BUTTON_OFFSET_HEIGHT: f32 = (COUNTER_DIGIT_HEIGHT - COUNTER_BUTTON_HEIGHT) * 0.5;
+
+fn render_counter(count: &mut usize, ui: &mut Ui, textures: &TextureStore, position: Vec2, title: &str, min: usize, max: usize) {
 	let digits: Vec<usize> = {
 		let digits = count.to_string();
 		let digits = format!("{:0>3}", digits);
 		digits.chars().map(|i| (i.to_digit(10u32).unwrap_or(0)) as usize).collect()
 	};
 
-	const COUNTER_DIGIT_WIDTH: f32 = 13f32 * 2.0;
-	const COUNTER_DIGIT_HEIGHT: f32 = 23f32 * 2.0;
-	const COUNTER_BUTTON_HEIGHT: f32 = 30f32;
-	const COUNTER_BUTTON_MARGIN: f32 = 10f32;
-	const BUTTON_OFFSET_HEIGHT: f32 = (COUNTER_DIGIT_HEIGHT - COUNTER_BUTTON_HEIGHT) * 0.5;
-
 	let counter_width = digits.len() as f32 * COUNTER_DIGIT_WIDTH;
 	let position = position - vec2(counter_width * 0.5, 0.0);
-	for (x, digit) in digits.iter().enumerate() {
-		let position = vec2(COUNTER_DIGIT_WIDTH * x as f32, 0f32) + position;
-		widgets::Texture::new(textures.numbers[*digit])
-			.size(COUNTER_DIGIT_WIDTH, COUNTER_DIGIT_HEIGHT)
-			.position(position)
-			.ui(ui);
-	}
+
+	draw_seven_segment_unscaled(ui, textures, &digits, position.x as usize, position.y as usize);
 	if widgets::Button::new("+")
 		.size(vec2(COUNTER_BUTTON_HEIGHT, COUNTER_BUTTON_HEIGHT))
 		.position(position + vec2(counter_width + COUNTER_BUTTON_MARGIN, BUTTON_OFFSET_HEIGHT))
diff --git a/src/gui/seven_segment.rs b/src/gui/seven_segment.rs
new file mode 100644
index 0000000..2f34a09
--- /dev/null
+++ b/src/gui/seven_segment.rs
@@ -0,0 +1,31 @@
+use macroquad::{
+	prelude::vec2,
+	ui::{widgets, Ui},
+};
+pub const WIDTH: usize = 13 * 2;
+pub const HEIGHT: usize = 23 * 2;
+
+use super::{texture_store::TextureStore, UIState};
+
+pub fn draw_seven_segment(ui_state: &UIState, ui: &mut Ui, textures: &TextureStore, val: &Vec<usize>, x: usize, y: usize) {
+	for (n, digit) in val.iter().enumerate() {
+		let (scaled_width, scaled_height) = ui_state.pixel_screen_scale(WIDTH as usize, HEIGHT);
+		let (pos_x, pos_y) = ui_state.pixel_screen_offset(n * WIDTH + x, y);
+
+		widgets::Texture::new(textures.numbers[*digit])
+			.size(scaled_width, scaled_height)
+			.position(vec2(pos_x, pos_y))
+			.ui(ui);
+	}
+}
+
+pub fn draw_seven_segment_unscaled(ui: &mut Ui, textures: &TextureStore, val: &Vec<usize>, x: usize, y: usize) {
+	for (n, digit) in val.iter().enumerate() {
+		let (pos_x, pos_y) = ((n * WIDTH + x) as f32, y as f32);
+
+		widgets::Texture::new(textures.numbers[*digit])
+			.size(WIDTH as f32, HEIGHT as f32)
+			.position(vec2(pos_x, pos_y))
+			.ui(ui);
+	}
+}
diff --git a/src/gui/texture_store.rs b/src/gui/texture_store.rs
index b005274..02effe7 100644
--- a/src/gui/texture_store.rs
+++ b/src/gui/texture_store.rs
@@ -22,12 +22,12 @@ impl Default for TextureStore {
 impl TextureStore {
 	pub fn new() -> Self {
 		Self {
-			numbers: load_sprites(include_bytes!("../../assets/numbers.png"), [26, 46], 1, 10).expect("Could not load sprites"),
-			english_tiles: load_sprites(include_bytes!("../../assets/english_32x.png"), [32, 32], 2, 8)
+			numbers: load_sprites(include_bytes!("../../assets/numbers.png"), (26, 46), 1, 10).expect("Could not load sprites"),
+			english_tiles: load_sprites(include_bytes!("../../assets/english_32x.png"), (32, 32), 2, 8)
 				.expect("Could not load Tile Sprites"),
-			japanese_tiles: load_sprites(include_bytes!("../../assets/japanese_32x.png"), [32, 32], 2, 8)
+			japanese_tiles: load_sprites(include_bytes!("../../assets/japanese_32x.png"), (32, 32), 2, 8)
 				.expect("Could not load Tile Sprites"),
-			smilies: load_sprites(include_bytes!("../../assets/faces.png"), [48, 48], 1, 5).expect("Could not load face sprites"),
+			smilies: load_sprites(include_bytes!("../../assets/faces.png"), (48, 48), 1, 5).expect("Could not load face sprites"),
 			cog: Texture2D::from_file_with_format(include_bytes!("../../assets/cog.png"), Some(ImageFormat::Png)),
 			lang: Language::English,
 		}
diff --git a/src/gui/tile_render.rs b/src/gui/tile_render.rs
index b7a20e1..c5304ce 100644
--- a/src/gui/tile_render.rs
+++ b/src/gui/tile_render.rs
@@ -1,7 +1,8 @@
 use crate::logic::tile::{Tile, TileModifier, TileState};
 
+#[repr(usize)]
 pub enum TileIndex {
-	Hidden,
+	Unknown,
 	Revealed,
 	Flag,
 	Question,
@@ -20,52 +21,46 @@ pub enum TileIndex {
 }
 
 impl Tile {
-	pub fn render(self, show_all: bool) -> TileIndex {
-		if self.swept && self.state == TileState::Mine {
-			return TileIndex::Explosion;
-		}
-		if show_all {
-			if let Some(modifier) = self.modifier {
-				if modifier == TileModifier::Flagged {
-					if self.state == TileState::Mine {
-						return TileIndex::Flag;
-					} else {
-						return TileIndex::FalseFlagMine;
-					}
-				}
-			}
-			if self.state == TileState::Mine {
-				return TileIndex::RevealedMine;
-			}
-		}
-		if self.swept {
-			if self.state == TileState::Mine {
-				TileIndex::Explosion
-			} else {
-				match self.adjacent {
-					0 => TileIndex::Revealed,
-					1 => TileIndex::One,
-					2 => TileIndex::Two,
-					3 => TileIndex::Three,
-					4 => TileIndex::Four,
-					5 => TileIndex::Five,
-					6 => TileIndex::Six,
-					7 => TileIndex::Seven,
-					8 => TileIndex::Eight,
-					_ => TileIndex::RevealedQuestion,
-				}
-			}
-		} else {
-			if let Some(modif) = self.modifier {
-				match modif {
-					TileModifier::Flagged => TileIndex::Flag,
-					TileModifier::Unsure => TileIndex::Question,
-				}
-			} else if self.highlighted {
-				TileIndex::Revealed
-			} else {
-				TileIndex::Hidden
-			}
+	pub fn render(self, game_over: bool) -> TileIndex {
+		// Behold: the match statement from hell!
+		match (
+			self.state,
+			self.modifier,
+			self.adjacent,
+			game_over,
+			self.swept,
+			self.highlighted,
+		) {
+			// Has mine, clicked mine: BOOM!
+			(TileState::Mine, _, _, _, true, _) => TileIndex::Explosion,
+			// Has mine, has flag, and game is over: True Flag
+			(TileState::Mine, Some(TileModifier::Flagged), _, true, _, _) => TileIndex::Flag,
+			// Has flag, is not Mine, and game is over: False flag
+			(TileState::Empty, Some(TileModifier::Flagged), _, true, _, _) => TileIndex::FalseFlagMine,
+			// Revealed mine after game is over
+			(TileState::Mine, _, _, true, _, _) => TileIndex::RevealedMine,
+			// Revealed tiles with adjacent tile count
+			(TileState::Empty, _, 0, _, true, _) => TileIndex::Revealed,
+			(TileState::Empty, _, 1, _, true, _) => TileIndex::One,
+			(TileState::Empty, _, 2, _, true, _) => TileIndex::Two,
+			(TileState::Empty, _, 3, _, true, _) => TileIndex::Three,
+			(TileState::Empty, _, 4, _, true, _) => TileIndex::Four,
+			(TileState::Empty, _, 5, _, true, _) => TileIndex::Five,
+			(TileState::Empty, _, 6, _, true, _) => TileIndex::Six,
+			(TileState::Empty, _, 7, _, true, _) => TileIndex::Seven,
+			(TileState::Empty, _, 8, _, true, _) => TileIndex::Eight,
+			// Flag modifier
+			(_, Some(TileModifier::Flagged), _, _, _, _) => TileIndex::Flag,
+			// Question mark modifier
+			(_, Some(TileModifier::Unsure), _, _, _, _) => TileIndex::Question,
+			// No modifier, not swept, but highlighted
+			(_, None, _, _, false, true) => TileIndex::Revealed,
+			// No modifier, Not swept, and not highlighted: Unknown tile
+			(_, None, _, _, false, false) => TileIndex::Unknown,
+			// unsigned 8 bit integer has too much range for the adjacent tiles count, creating an invalid state
+			// from 9 onward. This last clause is to catch if somehow this invalid state occurs, and display
+			// the invalid tile in that case.
+			(TileState::Empty, _, 9..=u8::MAX, _, true, _) => TileIndex::RevealedQuestion,
 		}
 	}
 }
diff --git a/src/gui/top_menu/flag_counter.rs b/src/gui/top_menu/flag_counter.rs
index 8d22719..26cdfbd 100644
--- a/src/gui/top_menu/flag_counter.rs
+++ b/src/gui/top_menu/flag_counter.rs
@@ -1,9 +1,9 @@
-use macroquad::{
-	prelude::*,
-	ui::{widgets, Ui},
-};
+use macroquad::ui::Ui;
 
-use crate::gui::texture_store::TextureStore;
+use crate::gui::{
+	seven_segment::{self, draw_seven_segment},
+	texture_store::TextureStore,
+};
 
 use super::UIState;
 
@@ -33,18 +33,13 @@ impl GUIFlagCounter {
 			self.old_count = remaining;
 		}
 
-		let top = ui_state.top_offset;
-		const WIDTH: usize = 13 * 2;
-		const HEIGHT: usize = 23 * 2;
-		let (scaled_width, scaled_height) = ui_state.pixel_screen_scale(WIDTH, HEIGHT);
-
-		// let length = self.digits.len() as f32;
-		for (x, digit) in self.digits.iter().enumerate() {
-			let (pos_x, pos_y) = ui_state.pixel_screen_offset((x + 2) * WIDTH, (top - HEIGHT) / 2);
-			widgets::Texture::new(textures.numbers[*digit])
-				.size(scaled_width, scaled_height)
-				.position(vec2(pos_x, pos_y))
-				.ui(ui);
-		}
+		draw_seven_segment(
+			ui_state,
+			ui,
+			textures,
+			&self.digits,
+			seven_segment::WIDTH * 2,
+			(ui_state.top_offset - seven_segment::HEIGHT) / 2,
+		);
 	}
 }
diff --git a/src/gui/top_menu/timer.rs b/src/gui/top_menu/timer.rs
index 312a397..72aba10 100644
--- a/src/gui/top_menu/timer.rs
+++ b/src/gui/top_menu/timer.rs
@@ -1,9 +1,9 @@
-use macroquad::{
-	prelude::*,
-	ui::{widgets, Ui},
-};
+use macroquad::{prelude::*, ui::Ui};
 
-use crate::gui::texture_store::TextureStore;
+use crate::gui::{
+	seven_segment::{self, draw_seven_segment},
+	texture_store::TextureStore,
+};
 
 use super::UIState;
 
@@ -31,18 +31,15 @@ impl GUITimer {
 			let digits: Vec<usize> = time_1.chars().map(|i| (i.to_digit(10u32).unwrap_or(0)) as usize).collect();
 			self.digits = digits;
 		}
-		let top = ui_state.top_offset;
-		const WIDTH: usize = 13 * 2;
-		const HEIGHT: usize = 23 * 2;
-		let (scaled_width, scaled_height) = ui_state.pixel_screen_scale(WIDTH as usize, HEIGHT);
 		let board_width = ui_state.width * ui_state.tile_size;
-		let length = self.digits.len();
-		for (x, digit) in self.digits.iter().enumerate() {
-			let (pos_x, pos_y) = ui_state.pixel_screen_offset(WIDTH * x + board_width - WIDTH * (length + 2), (top - HEIGHT) / 2);
-			widgets::Texture::new(textures.numbers[*digit])
-				.size(scaled_width, scaled_height)
-				.position(vec2(pos_x, pos_y))
-				.ui(ui);
-		}
+
+		draw_seven_segment(
+			ui_state,
+			ui,
+			textures,
+			&self.digits,
+			board_width - seven_segment::WIDTH * (self.digits.len() + 2),
+			(ui_state.top_offset - seven_segment::HEIGHT) / 2,
+		);
 	}
 }
diff --git a/src/logic/game_board.rs b/src/logic/game_board.rs
index 33cd861..df069df 100644
--- a/src/logic/game_board.rs
+++ b/src/logic/game_board.rs
@@ -159,26 +159,28 @@ impl GameBoard {
 		let mut revealed: usize = 0;
 		while scan_list.len() > 0 {
 			for &scan_location in ADJACENT_WITHOUT_CENTER.iter() {
-				if let Some(old_tile) = self.get_tile(scan_list[0].0, scan_list[0].1) {
-					if old_tile.adjacent > 0 {
-						continue;
-					}
-					let x = scan_list[0].0 as isize + scan_location.0;
-					let y = scan_list[0].1 as isize + scan_location.1;
-
-					if x < 0 || y < 0 {
-						continue;
-					}
-					let y = y as usize;
-					let x = x as usize;
-					if let Some(tile) = self.get_tile_mut(x, y) {
-						if tile.swept {
+				if let Some((x, y)) = scan_list.front() {
+					if let Some(old_tile) = self.get_tile(*x, *y) {
+						if old_tile.adjacent > 0 {
 							continue;
 						}
-						scan_list.push_back((x, y));
-						tile.swept = true;
-						revealed += 1;
-						event_handler.add(GameEvent::RevealTile(x, y, tile.clone()));
+						let x = *x as isize + scan_location.0;
+						let y = *y as isize + scan_location.1;
+
+						if x < 0 || y < 0 {
+							continue;
+						}
+						let y = y as usize;
+						let x = x as usize;
+						if let Some(tile) = self.get_tile_mut(x, y) {
+							if tile.swept {
+								continue;
+							}
+							scan_list.push_back((x, y));
+							tile.swept = true;
+							revealed += 1;
+							event_handler.add(GameEvent::RevealTile(x, y, tile.clone()));
+						}
 					}
 				}
 			}
diff --git a/src/sprite_loader.rs b/src/sprite_loader.rs
index 3ab86f2..45cc74a 100644
--- a/src/sprite_loader.rs
+++ b/src/sprite_loader.rs
@@ -2,13 +2,11 @@ use std::error::Error;
 
 use image::{load_from_memory, EncodableLayout};
 use macroquad::texture::{FilterMode, Texture2D};
-pub fn load_sprites(bytes: &[u8], tile_size: [usize; 2], rows: usize, columns: usize) -> Result<Vec<Texture2D>, Box<dyn Error>> {
+pub fn load_sprites(bytes: &[u8], tile_size: (u32, u32), rows: usize, columns: usize) -> Result<Vec<Texture2D>, Box<dyn Error>> {
 	let sprite_sheet = load_from_memory(bytes)?.to_rgba8();
 
 	let mut sprite_list: Vec<Texture2D> = vec![];
-	let [tile_width, tile_height] = tile_size;
-	let tile_width = tile_width as u32;
-	let tile_height = tile_height as u32;
+	let (tile_width, tile_height) = tile_size;
 
 	for i in 0..(rows * columns) {
 		let x = (i % columns) as u32;
diff --git a/src/util.rs b/src/util.rs
index 83523f5..52cb782 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -1,7 +1,18 @@
+#[rustfmt::skip]
 pub const ADJACENT_WITH_CENTER: [(isize, isize); 9] =
-	[(-1, -1), (0, -1), (1, -1), (-1, 0), (0, 0), (1, 0), (-1, 1), (0, 1), (1, 1)];
+	[
+		(-1, -1), (0, -1), (1, -1),
+		(-1,  0), (0,  0), (1,  0),
+		(-1,  1), (0,  1), (1,  1)
+	];
 
-pub const ADJACENT_WITHOUT_CENTER: [(isize, isize); 8] = [(-1, -1), (0, -1), (1, -1), (-1, 0), (1, 0), (-1, 1), (0, 1), (1, 1)];
+#[rustfmt::skip]
+pub const ADJACENT_WITHOUT_CENTER: [(isize, isize); 8] =
+	[
+		(-1, -1), (0, -1), (1, -1),
+		(-1,  0),          (1,  0),
+		(-1,  1), (0,  1), (1,  1)
+	];
 
 // Event Queue
 pub struct Events<E> {