Changeset 600

Timestamp:

11/29/08 17:40:07 (4 years ago)

Author:

phyrephox

Message:

+ added a nice little game - Connect Four (see ​http://en.wikipedia.org/wiki/Connect_Four )
game was written by CHDKLover & Kettmeister in the german forum, see ​http://chdk.kernreaktor.org/mantis/view.php?id=106 for more links

note: if we hear of reports that the binary is being to big for some cameras since the introduction of Connect 4, we are likely to disable it in the buildconf.inc (so people can compile it using the chdk shell or maybe another build server)

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_4wins.c (added)
• core/gui_4wins.h (added)
• core/gui_lang.c (modified) (1 diff)
• core/gui_lang.h (modified) (1 diff)
• include/gui.h (modified) (1 diff)

trunk/CHDK/LANG/english.lng

@@ -567 +567 @@
 426 "Cannot load CHDK/badpixel.bin"
 427 "Show raw saving time"
+428 "Connect 4"
+429 "Opponent:"
+430 "Human"
+431 "Player 1 won the game"
+432 "Player 2 won the game"
+433 "I beat you"
+434 "The game ended a draw"

trunk/CHDK/LANG/german.lng

@@ -604 +604 @@
 426 "Datei badpixel.bin fehlt!"
 427 "Zeige raw speicherzeit"
+
+428 "4 Gewinnt"
+429 "Gegner:"
+430 "Mensch"
+431 "Spieler 1 hat gewonnen"
+432 "Spieler 2 hat gewonnen"
+433 "Ich habe gewonnen :-)"
+434 "Unentschieden"

trunk/buildconf.inc

@@ -4 +4 @@
 OPT_GAME_REVERSI=1
 OPT_GAME_SOKOBAN=1
+OPT_GAME_CONNECT4=1
 OPT_BOOTLOGO=1
 OPT_CURVES=1

trunk/core/Makefile

@@ -20 +20 @@
 CFLAGS+=-DOPT_GAME_SOKOBAN
 OPT_OBJS+=gui_sokoban.o
+endif
+ifdef OPT_GAME_CONNECT4
+CFLAGS+=-DOPT_GAME_CONNECT4
+OPT_OBJS+=gui_4wins.o
 endif
 ifdef OPT_BOOTLOGO

trunk/core/gui.c

@@ -17 +17 @@
 #include "gui_reversi.h"
 #include "gui_sokoban.h"
+#include "gui_4wins.h"
 #ifdef OPT_DEBUGGING
 #include "gui_debug.h"
@@ -131 +132 @@
 static void gui_draw_reversi(int arg);
 static void gui_draw_sokoban(int arg);
+static void gui_draw_4wins(int arg);
 #ifdef OPT_DEBUGGING
         static void gui_draw_debug(int arg);
@@ -319 +321 @@
     {0x38,LANG_MENU_GAMES_SOKOBAN,           MENUITEM_PROC,  (int*)gui_draw_sokoban },
 #endif
+#ifdef OPT_GAME_CONNECT4
+    {0x38,LANG_MENU_GAMES_CONNECT4,             MENUITEM_PROC,  (int*)gui_draw_4wins },
+#endif
     {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
     {0}
@@ -383 +388 @@
     {0x37,LANG_MENU_MISC_TEXT_READER,        MENUITEM_SUBMENU, (int*)&reader_submenu },
 #endif
+#if defined (OPT_GAME_REVERSI) || (OPT_GAME_SOKOBAN || (OPT_GAME_CONNECT4))
     {0x38,LANG_MENU_MISC_GAMES,              MENUITEM_SUBMENU, (int*)&games_submenu },
+#endif
 #if CAM_SWIVEL_SCREEN
     {0x28,LANG_MENU_MISC_FLASHLIGHT,         MENUITEM_BOOL,    &conf.flashlight },
@@ -2047 +2054 @@
             break;
 #endif
+#ifdef OPT_GAME_CONNECT4
+        case GUI_MODE_4WINS:
+            gui_4wins_draw();
+            break;
+#endif
 #ifdef OPT_DEBUGGING
         case GUI_MODE_DEBUG:
@@ -2084 +2096 @@
     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)
+        if (gui_mode != GUI_MODE_REVERSI && gui_mode != GUI_MODE_SOKOBAN && gui_mode != GUI_MODE_4WINS)
             draw_restore();
     }
@@ -2147 +2159 @@
             case GUI_MODE_REVERSI:
             case GUI_MODE_SOKOBAN:
+            case GUI_MODE_4WINS:
 #ifdef OPT_DEBUGGING
             case GUI_MODE_DEBUG:
@@ -2295 +2308 @@
             break;
 #endif
+#ifdef OPT_GAME_CONNECT4
+        case GUI_MODE_4WINS:
+            gui_4wins_kbd_process();
+            break;
+#endif
 #ifdef OPT_DEBUGGING
         case GUI_MODE_DEBUG:
@@ -2807 +2825 @@
 #endif
 //-------------------------------------------------------------------
+#ifdef OPT_GAME_CONNECT4
+void gui_draw_4wins(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_4wins_init() )
+        gui_mode = GUI_MODE_4WINS;
+}
+#endif
+//-------------------------------------------------------------------
 #ifdef OPT_DEBUGGING
 void gui_draw_debug(int arg) {

trunk/core/gui_lang.c

@@ -547 +547 @@
 "426 \"Cannot load CHDK/badpixel.bin\"\n"
 "427 \"Show saving time\"\n"
+
+"428 \"Connect 4\"\n"
+"429 \"Opponent:\"\n"
+"430 \"Human\"\n"
+"431 \"Player 1 won the game\"\n"
+"432 \"Player 2 won the game\"\n"
+"433 \"I beat you\"\n"
+"434 \"The game ended a draw\"\n"
 ;
 

trunk/core/gui_lang.h

@@ -536 +536 @@
 #define LANG_CANNOT_OPEN_BADPIXEL_FILE  426
 #define LANG_MENU_RAW_TIMER             427
+
+#define LANG_MENU_GAMES_CONNECT4           428
+#define LANG_CONNECT4_RIVAL                 429
+#define LANG_CONNECT4_HUMAN                430
+#define LANG_CONNECT4_P1_WIN               431
+#define LANG_CONNECT4_P2_WIN               432
+#define LANG_CONNECT4_CAM_WIN              433
+#define LANG_CONNECT4_DRAW                 434
 //-------------------------------------------------------------------
 
-#define GUI_LANG_ITEMS                  427
+#define GUI_LANG_ITEMS                  434
 
 //-------------------------------------------------------------------

trunk/include/gui.h

@@ -20 +20 @@
                 GUI_MODE_CALENDAR,
                 GUI_MODE_BENCH,
-                GUI_MODE_MPOPUP };
+                GUI_MODE_MPOPUP,
+                GUI_MODE_4WINS };
 
 extern void gui_redraw();