Changeset 649

Timestamp:

12/20/08 18:31:37 (4 years ago)

Author:

phyrephox

Message:

+ new game: Mastermind (see ​http://en.wikipedia.org/wiki/Mastermind_(board_game) ) by Kettmeister (german forum)
this will be the last game i will add to chdk, i promise :D
you can exclude it from compilation via buildconf.inc switch (i will disable it at default as soon as people start complaining about low memory space...)

have fun!

Location:

trunk

Files:

• CHDK/LANG/english.lng (modified) (1 diff)
• CHDK/LANG/german.lng (modified) (1 diff)
• buildconf.inc (modified) (1 diff)
• core/Makefile (modified) (1 diff)
• core/gui.c (modified) (9 diffs)
• core/gui_lang.c (modified) (1 diff)
• core/gui_lang.h (modified) (1 diff)
• core/gui_mastermind.c (added)
• core/gui_mastermind.h (added)
• include/gui.h (modified) (1 diff)

trunk/CHDK/LANG/english.lng

@@ -580 +580 @@
 439 "'DNG' file extension"
 440 "DNG visible via USB"
+441 "Mastermind"
+442 "available colors"
+443 "on the right place"
+444 "color in answer"
+445 "CORRECT :-)"
+446 "GAME OVER"
+447 "[<-][->] select column"
+448 "[UP][DOWN] select color"
+449 "[SET] next row"
+450 "NO DOUBLE COLOR"

trunk/CHDK/LANG/german.lng

@@ -618 +618 @@
 437 "Aktiviere Blitz in Video?"
 438 "   Stärke des Blitzes"
+439 "'DNG' als Dateiendung"
 
 // DNG
 439 "'DNG'-Dateiendung"
 440 "DNG sichtbar via USB"
+
+441 "Mastermind"
+442 "wählbare Farben"
+443 "richtige Stelle"
+444 "mit enthalten"
+445 "RICHTIG :-)"
+446 "GAME OVER"
+447 "[<-][->] Spalte wählen"
+448 "[UP][DOWN] Farbe wählen"
+449 "[SET] nächste Reihe"
+450 "KEINE FARBEN DOPPELT"
+
+

trunk/buildconf.inc

@@ -5 +5 @@
 OPT_GAME_SOKOBAN=1
 OPT_GAME_CONNECT4=1
+OPT_GAME_MASTERMIND=1
 OPT_BOOTLOGO=1
 OPT_CURVES=1

trunk/core/Makefile

@@ -24 +24 @@
 CFLAGS+=-DOPT_GAME_CONNECT4
 OPT_OBJS+=gui_4wins.o
+endif
+ifdef OPT_GAME_MASTERMIND
+CFLAGS+=-DOPT_GAME_MASTERMIND
+OPT_OBJS+=gui_mastermind.o
 endif
 ifdef OPT_BOOTLOGO

trunk/core/gui.c

@@ -18 +18 @@
 #include "gui_sokoban.h"
 #include "gui_4wins.h"
+#include "gui_mastermind.h"
 #ifdef OPT_DEBUGGING
 #include "gui_debug.h"
@@ -133 +134 @@
 static void gui_draw_sokoban(int arg);
 static void gui_draw_4wins(int arg);
+static void gui_draw_mastermind(int arg);
 #ifdef OPT_DEBUGGING
         static void gui_draw_debug(int arg);
@@ -331 +333 @@
     {0x38,LANG_MENU_GAMES_CONNECT4,             MENUITEM_PROC,  (int*)gui_draw_4wins },
 #endif
+#ifdef OPT_GAME_MASTERMIND
+    {0x38,LANG_MENU_GAMES_MASTERMIND,           MENUITEM_PROC,  (int*)gui_draw_mastermind },
+#endif
     {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
     {0}
@@ -395 +400 @@
     {0x37,LANG_MENU_MISC_TEXT_READER,        MENUITEM_SUBMENU, (int*)&reader_submenu },
 #endif
-#if defined (OPT_GAME_REVERSI) || (OPT_GAME_SOKOBAN || (OPT_GAME_CONNECT4))
+#if defined (OPT_GAME_REVERSI) || (OPT_GAME_SOKOBAN || (OPT_GAME_CONNECT4) || OPT_GAME_MASTERMIND)
     {0x38,LANG_MENU_MISC_GAMES,              MENUITEM_SUBMENU, (int*)&games_submenu },
 #endif
@@ -2089 +2094 @@
             break;
 #endif
+#ifdef OPT_GAME_MASTERMIND
+        case GUI_MODE_MASTERMIND:
+            gui_mastermind_draw();
+            break;
+#endif
 #ifdef OPT_DEBUGGING
         case GUI_MODE_DEBUG:
@@ -2126 +2136 @@
     if ((gui_mode_old != gui_mode && (gui_mode_old != GUI_MODE_NONE && gui_mode_old != GUI_MODE_ALT) && (gui_mode != GUI_MODE_MBOX && gui_mode != GUI_MODE_MPOPUP)) || gui_restore) {
         gui_restore = 0;
-        if (gui_mode != GUI_MODE_REVERSI && gui_mode != GUI_MODE_SOKOBAN && gui_mode != GUI_MODE_4WINS)
+        if (gui_mode != GUI_MODE_REVERSI && gui_mode != GUI_MODE_SOKOBAN && gui_mode != GUI_MODE_4WINS != GUI_MODE_MASTERMIND)
             draw_restore();
     }
@@ -2190 +2200 @@
             case GUI_MODE_SOKOBAN:
             case GUI_MODE_4WINS:
+                        case GUI_MODE_MASTERMIND:
 #ifdef OPT_DEBUGGING
             case GUI_MODE_DEBUG:
@@ -2343 +2354 @@
             break;
 #endif
+#ifdef OPT_GAME_MASTERMIND
+        case GUI_MODE_MASTERMIND:
+            gui_mastermind_kbd_process();
+            break;
+#endif
 #ifdef OPT_DEBUGGING
         case GUI_MODE_DEBUG:
@@ -2867 +2883 @@
 #endif
 //-------------------------------------------------------------------
+#ifdef OPT_GAME_MASTERMIND
+void gui_draw_mastermind(int arg) {
+    if ((mode_get()&MODE_MASK) != MODE_PLAY) {
+        gui_mbox_init(LANG_MSG_INFO_TITLE, LANG_MSG_SWITCH_TO_PLAY_MODE,
+                      MBOX_FUNC_RESTORE|MBOX_TEXT_CENTER, NULL);
+        return;
+    }
+    if ( gui_mastermind_init() )
+        gui_mode = GUI_MODE_MASTERMIND;
+}
+#endif
+//-------------------------------------------------------------------
 #ifdef OPT_DEBUGGING
 void gui_draw_debug(int arg) {

trunk/core/gui_lang.c

@@ -561 +561 @@
 "439 \"'DNG' file extension\"\n"
 "440 \"DNG visible via USB\"\n"
+
+"441 \"Mastermind\"\n"
+"442 \"available colors\"\n"
+"443 \"on the right place\"\n"
+"444 \"color in answer\"\n"
+"445 \"CORRECT :-)\"\n"
+"446 \"GAME OVER\"\n"
+"447 \"[<-][->] select column\"\n"
+"448 \"[UP][DOWN] select color\"\n"
+"449 \"[SET] next row\"\n"
+"450 \"NO DOUBLE COLOR\"\n"
+
+
+
 ;
 

trunk/core/gui_lang.h

@@ -551 +551 @@
 #define LANG_MENU_RAW_DNG_EXT              439
 #define LANG_MENU_DNG_VIA_USB              440 
+#define LANG_MENU_GAMES_MASTERMIND     441
+#define LANG_MENU_GAMES_AC_COLORS      442
+#define LANG_MENU_GAMES_RIGHT_PLACE    443
+#define LANG_MENU_GAMES_C_IN_ANSWER    444
+#define LANG_MENU_GAMES_RIGHT          445
+#define LANG_MENU_GAMES_GAME_OVER      446
+#define LANG_MENU_GAMES_CURSOR1        447
+#define LANG_MENU_GAMES_CURSOR2        448
+#define LANG_MENU_GAMES_CURSOR3        449
+#define LANG_MENU_GAMES_DCOLOR        450
 //-------------------------------------------------------------------
 
-#define GUI_LANG_ITEMS                  440
+#define GUI_LANG_ITEMS                  450
 
 //-------------------------------------------------------------------

trunk/include/gui.h

@@ -21 +21 @@
                 GUI_MODE_BENCH,
                 GUI_MODE_MPOPUP,
-                GUI_MODE_4WINS };
+                GUI_MODE_4WINS,
+                                GUI_MODE_MASTERMIND};
 
 extern void gui_redraw();