fixed some lacking joystick support. Input should be moved to unified…

… keyboard/joy interface instead

highscore_entry.lua

@@ -138,7 +138,7 @@ function highscore_entry.keypressed(k, uni)
 	end
 end
 
-function highscore_entry.joystickpressed()
+function highscore_entry.joystickpressed(joy, k)
 	if k == 3 then
 		if highscore_entry.selection <= 28 then
 			if highscore_entry.position <= 5 then
@@ -149,6 +149,8 @@ function highscore_entry.joystickpressed()
 		else
 			highscore_entry.confirm()
 		end
+	elseif k == 4 then
+		highscore_entry.delete()
 	end
 end
 

ingame_menu.lua

@@ -52,7 +52,19 @@ function ingame_menu.keypressed(k, uni)
 end
 
 function ingame_menu.joystickpressed(joy, k)
-
+	if k == 3 then
+		if ingame_menu.selection == 1 then
+			state = STATE_INGAME
+			playSound("confirm")
+		elseif ingame_menu.selection == 2 then
+			mainmenu.enter()
+			playSound("confirm")
+			playMusic("opening")
+		end
+	elseif k == 4 then
+		state = STATE_INGAME
+		playSound("blip")
+	end
 end
 
 function ingame_menu.action(k)

mainmenu.lua

@@ -73,11 +73,11 @@ function mainmenu.joystickpressed(joy, k)
 	end
 end
 
-function mainmenu.action(a)
-	if a == "down" then
+function mainmenu.action(k)
+	if k == "down" then
 		selection = wrap(selection + 1, 1,6)
 		playSound("blip")
-	elseif a == "up" then
+	elseif k == "up" then
 		selection = wrap(selection - 1, 1,6)
 		playSound("blip")
 	end

options.lua

@@ -109,6 +109,10 @@ function options.joystickpressed(joy, k)
 			mainmenu.enter()
 			saveConfig()
 		end
+	elseif k == 4 then
+		playSound("confirm")
+		mainmenu.enter()
+		saveConfig()
 	end
 end