1 files changed, 17 insertions, 11 deletions

diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index cdad581767..0985ff5710 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -22,11 +22,6 @@
 
 #include "plugin.h"
 
-/* here is a global api struct pointer. while not strictly necessary,
-   it's nice not to have to pass the api pointer in all function calls
-   in the plugin */
-
-#define STATE_FILE        PLUGIN_DIR "/sudoku.state"
 #define GAME_FILE         PLUGIN_DIR "/sudoku.ss"
 
 /* variable button definitions */
@@ -34,6 +29,8 @@
 #define SUDOKU_BUTTON_QUIT BUTTON_OFF
 #define SUDOKU_BUTTON_UP BUTTON_UP
 #define SUDOKU_BUTTON_DOWN BUTTON_DOWN
+#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
+#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
 #define SUDOKU_BUTTON_TOGGLE BUTTON_PLAY
 #define SUDOKU_BUTTON_MENU BUTTON_F1
 #define SUDOKU_BUTTON_POSSIBLE BUTTON_F2
@@ -42,6 +39,8 @@
 #define SUDOKU_BUTTON_QUIT BUTTON_OFF
 #define SUDOKU_BUTTON_UP BUTTON_UP
 #define SUDOKU_BUTTON_DOWN BUTTON_DOWN
+#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
+#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
 #define SUDOKU_BUTTON_ALTTOGGLE (BUTTON_MENU | BUTTON_DOWN)
 #define SUDOKU_BUTTON_TOGGLE_PRE BUTTON_MENU
 #define SUDOKU_BUTTON_TOGGLE (BUTTON_MENU | BUTTON_REL)
@@ -54,6 +53,8 @@
 #define SUDOKU_BUTTON_QUIT BUTTON_OFF
 #define SUDOKU_BUTTON_UP BUTTON_UP
 #define SUDOKU_BUTTON_DOWN BUTTON_DOWN
+#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
+#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
 #define SUDOKU_BUTTON_ALTTOGGLE BUTTON_ON
 #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT
 #define SUDOKU_BUTTON_MENU BUTTON_MODE
@@ -61,17 +62,20 @@
 
 #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
       (CONFIG_KEYPAD == IPOD_3G_PAD)
-#define SUDOKU_BUTTON_QUIT (BUTTON_SELECT | BUTTON_MENU)
-#define SUDOKU_BUTTON_UP BUTTON_SCROLL_BACK
-#define SUDOKU_BUTTON_DOWN BUTTON_SCROLL_FWD
-#define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT
-#define SUDOKU_BUTTON_MENU BUTTON_MENU
-#define SUDOKU_BUTTON_POSSIBLE (BUTTON_SELECT | BUTTON_LEFT)
+#define SUDOKU_BUTTON_MENU       BUTTON_MENU
+#define SUDOKU_BUTTON_LEFT       BUTTON_SCROLL_BACK
+#define SUDOKU_BUTTON_RIGHT      BUTTON_SCROLL_FWD
+#define SUDOKU_BUTTON_ALTTOGGLE  BUTTON_SELECT
+#define SUDOKU_BUTTON_TOGGLE     BUTTON_RIGHT
+#define SUDOKU_BUTTON_TOGGLEBACK BUTTON_LEFT
+#define SUDOKU_BUTTON_POSSIBLE   BUTTON_PLAY
 
 #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD)
 #define SUDOKU_BUTTON_QUIT BUTTON_POWER
 #define SUDOKU_BUTTON_UP BUTTON_UP
 #define SUDOKU_BUTTON_DOWN BUTTON_DOWN
+#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
+#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
 #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT
 #define SUDOKU_BUTTON_MENU BUTTON_PLAY
 #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC
@@ -80,6 +84,8 @@
 #define SUDOKU_BUTTON_QUIT BUTTON_A
 #define SUDOKU_BUTTON_UP BUTTON_UP
 #define SUDOKU_BUTTON_DOWN BUTTON_DOWN
+#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
+#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
 #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT
 #define SUDOKU_BUTTON_MENU BUTTON_MENU
 #define SUDOKU_BUTTON_POSSIBLE BUTTON_POWER