README.md

@@ -1,11 +1,10 @@
 # Marble Machinations
-A zach-like programming-adjacent puzzle game.
-Still in development, but core features are mostly stable.
 
 logic mostly like https://git.crispypin.cc/CrispyPin/marble
 
 ## todo
 ### meta
+- itch page text
 - engine tests
 - blag post about marble movement logic
 ### game
@@ -30,7 +29,7 @@ logic mostly like https://git.crispypin.cc/CrispyPin/marble
 - validate solutions in server (with limits)
 - show histograms
 - author name in solutions and blueprints
-### undecided
+#### undecided
 - footprint score (tiles that were non-empty at any point in the run)
 - option to use 8-bit marbles?
 - blueprint rotation?

src/editor.rs

@@ -620,7 +620,7 @@ impl Editor {
 		self.draw_board(d, &globals.textures);
 		self.board_overlay(d, &globals.textures);
 		self.draw_bottom_bar(d, globals);
-		self.draw_top_bar(d, globals);
+		self.draw_top_bar(d, &globals.textures);
 
 		if self.active_tool == Tool::Blueprint {
 			self.draw_blueprint_sidebar(d, &globals.textures);
@@ -786,8 +786,7 @@ impl Editor {
 		}
 	}
 
-	fn draw_top_bar(&mut self, d: &mut RaylibDrawHandle, globals: &Globals) {
+	fn draw_top_bar(&mut self, d: &mut RaylibDrawHandle, textures: &Textures) {
-		let textures = &globals.textures;
 		// background
 		d.draw_rectangle(
 			0,
@@ -823,8 +822,7 @@ impl Editor {
 			(40, 4),
 			textures.get("save"),
 			(&mut self.tooltip, "save"),
-		) || globals.is_pressed(ActionId::Save)
+		) {
-		{
 			self.exit_state = ExitState::Save;
 		}
 

src/input.rs

@@ -25,7 +25,6 @@ pub enum ActionId {
 	Paste,
 	Erase,
 	ToggleMenu,
-	Save,
 	StartSim,
 	StopSim,
 	StepSim,
@@ -66,7 +65,6 @@ impl Default for Input {
 		bind_key(ActionId::Paste, vec![LCtrl], V);
 		bind_key(ActionId::Erase, vec![], Backspace);
 		bind_key(ActionId::ToggleMenu, vec![], Escape);
-		bind_key(ActionId::Save, vec![LCtrl], S);
 		bind_key(ActionId::StartSim, vec![], Enter);
 		bind_key(ActionId::StopSim, vec![], Enter);
 		bind_key(ActionId::StepSim, vec![], Space);