start menu fixed

breakout.js

@@ -24,7 +24,7 @@ f.draw = function() {
   Debug.line(f.edge2d.points, Color.green, 0, f.edge2d.thickness*2);
 };
 
-register_draw(f.draw,f);
+Register.draw.register(f.draw,f);
 
 var fitbricks = Math.floor(lvlwidth/bwidth);
 
@@ -33,7 +33,7 @@ var wingame = function() {
   Log.warn("WINNER");
   Player.players[0].uncontrol(paddle);
 
-  register_gui(function() {
+  Register.gui.register(function() {
     GUI.text("WINNER", Window.dimensions.scale(0.5));
   });
 }
@@ -277,7 +277,7 @@ var pause = {
   },
 
   unpause() {
-    unregister_gui(pause.gui);
+    Register.gui.unregister(pause.gui);
     sim_start();
   },
 
@@ -291,7 +291,7 @@ var pause = {
 var gamepawn = 
 {
   pause() {
-    register_gui(pause.gui);
+    Register.gui.register(pause.gui);
     sim_pause();
   },
   
@@ -332,7 +332,7 @@ function gamegui() {
   }).draw(Window.dimensions.scale([0.8,0.8]));
 }
 
-register_gui(gamegui);
+Register.gui.register(gamegui);
 
 Player.players[0].control(gamepawn);
 
@@ -340,6 +340,6 @@ let backtomain = function()
 {
   World.clear();  
   run("startmenu.js");
-  unregister_gui(gamegui);
+  Register.gui.unregister(gamegui);
   Player.players[0].uncontrol(gamepawn);
 }

game.js

@@ -1 +1,2 @@
+Window.icon("powerup.png");
 load("startmenu.js");

startmenu.js

@@ -2,12 +2,12 @@ var startgame = function()
 {
   run("breakout.js");
   Player.players[0].uncontrol(startcontroller);
-  unregister_gui(startmenu);
+  Register.gui.unregister(startmenu);
 };
 
 var exitgame = function()
 {
-  quit();
+  Game.quit();
 };
 
 var colorshifter = {
@@ -25,7 +25,6 @@ var options = GUI.column({
     GUI.text_fn("START", {action: startgame}),
     GUI.text_fn("EXIT", {action: exitgame}),
   ],
-  hovered: {},
 });
 
 Tween.embed(options, 'hovered', [colorshifter, colorshiftend], {time: 0.35, loop: "yoyo", whole: false, ease: Ease.sine.out});
@@ -68,37 +67,29 @@ function startmenu() {
   
   options.draw(Window.dimensions.scale([0.5,0.5]));
 
-//  GUI.image_fn({path:"arrow.png", anchor: [1,0.5]}).draw([item.bb.l, (item.bb.b + item.bb.t)/2].add([-3,1]));
+  GUI.image_fn({path:"coin.png", anchor: [1,0.5]}).draw([item.bb.l, (item.bb.b + item.bb.t)/2].add([-3,1]));
 }
 
-register_gui(startmenu);
+Register.gui.register(startmenu);
 
-var startcontroller = {
-  input_s_pressed() {
+var startcontroller = {};
+startcontroller.inputs = {};
+startcontroller.inputs.s = function() {
     item.selected = false;
     idx = Math.clamp(idx+1, 0, options.items.length-1);
     item = options.items[idx];
     item.selected = true;
-  },
-
-  input_w_pressed() {
-    item.selected = false;
-    idx = Math.clamp(idx-1, 0, options.items.length-1);
-    item = options.items[idx];
-    item.selected = true;
-  },
-  
-  input_enter_pressed() {
-    item.action();
-  },
-
-  input_escape_pressed() {
-    quit();
-  },
 };
 
-Player.players[0].control(startcontroller);
+startcontroller.inputs.w = function() {
+  item.selected = false;
+  idx = Math.clamp(idx-1, 0, options.items.length-1);
+  item = options.items[idx];
+  item.selected = true;
+};
+
+startcontroller.inputs.enter = function() { Log.warn("TEST"); item.action(); };
+
+Player.players[0].control(startcontroller);
+Game.play();
 
-run("file1.js");
-run("file2.js");
-Log.warn(x);