cleanup

src/blueprint.rs

@@ -22,7 +22,7 @@ impl Blueprint {
 		Self {
 			id,
 			name: format!("Blueprint {id}"),
-			board: content.to_string(),
+			board: content.serialize(),
 			tile_board: Some(content.clone()),
 		}
 	}

src/editor.rs

@@ -688,12 +688,8 @@ impl Editor {
 			}
 			self.tooltip.add(42 + 205, y, 32, 32, "Select");
 			simple_option_button(
-				d,
+				(d, &self.mouse),
-				&self.mouse,
+				rect(42 + 205, y, 32, 32),
-				42 + 205,
-				y,
-				32,
-				32,
 				i,
 				&mut self.selected_blueprint,
 			);

src/main.rs

@@ -92,7 +92,7 @@ impl Game {
 					ExitState::ExitAndSave => {
 						let solution = &mut self.solutions.get_mut(editor.level_id()).unwrap()
 							[self.selected_solution];
-						solution.board = editor.source_board().to_string();
+						solution.board = editor.source_board().serialize();
 						solution.score = editor.score();
 						solution.save();
 						self.open_editor = None;
@@ -100,7 +100,7 @@ impl Game {
 					ExitState::Save => {
 						let solution = &mut self.solutions.get_mut(editor.level_id()).unwrap()
 							[self.selected_solution];
-						solution.board = editor.source_board().to_string();
+						solution.board = editor.source_board().serialize();
 						solution.score = editor.score();
 						solution.save();
 					}
@@ -212,12 +212,13 @@ impl Game {
 				let mut solution_y = y;
 				for (solution_index, solution) in solutions.iter().enumerate() {
 					if simple_option_button(
-						d,
+						(d, &mouse),
-						&mouse,
+						rect(
-						level_list_width + 10,
+							level_list_width + 10,
-						solution_y,
+							solution_y,
-						entry_width,
+							entry_width,
-						solution_entry_height,
+							solution_entry_height,
+						),
 						solution_index,
 						&mut self.selected_solution,
 					) {

src/marble_engine/board.rs

@@ -48,7 +48,7 @@ impl Board {
 		}
 	}
 
-	pub fn to_string(&self) -> String {
+	pub fn serialize(&self) -> String {
 		let mut out = String::new();
 		for y in 0..self.height {
 			for x in 0..self.width {

src/ui.rs

@@ -208,19 +208,14 @@ pub fn tex32_button(
 }
 
 pub fn simple_option_button<T>(
-	d: &mut RaylibDrawHandle,
+	(d, mouse): (&mut RaylibDrawHandle, &MouseInput),
-	mouse: &MouseInput,
+	bounds: Rectangle,
-	x: i32,
-	y: i32,
-	width: i32,
-	height: i32,
 	option: T,
 	current: &mut T,
 ) -> bool
 where
 	T: PartialEq,
 {
-	let bounds = Rectangle::new(x as f32, y as f32, width as f32, height as f32);
 	d.draw_rectangle_rec(bounds, widget_bg(&option == current));
 	let mut changed = false;
 	if mouse.left_click() && mouse.is_over(bounds) && current != &option {

src/util.rs

@@ -145,3 +145,7 @@ pub fn get_scroll(rl: &RaylibHandle) -> Option<Scroll> {
 		None
 	}
 }
+
+pub fn rect(x: i32, y: i32, width: i32, height: i32) -> Rectangle{
+	Rectangle::new(x as f32, y as f32, width as f32, height as f32)
+}