Changeset 5569:ce502c95f097 in roaraudio

Timestamp:

07/17/12 00:34:59 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Improved tic-tac-toe plugin.

Files:

• ChangeLog (modified) (1 diff)
• plugins/universal/tic-tac-toe.c (modified) (5 diffs)

ChangeLog

@@ -3 +3 @@
         * Renamed protocol plugins for roard to protocol-* (Closes: #258)
         * roard now tries to auto load missing protocols as plugins (Closes: #275)
+        * Improved tic-tac-toe plugin.
 
 v. 1.0beta3 - Sun Jul 15 2012 26:08 CEST

plugins/universal/tic-tac-toe.c

@@ -50 +50 @@
 #define _DISPLAY_BUFFER_LEN 1024
 
-#define MSG__YOUR_TURN       "It's your turn. -- press any ID or q to quit --"
+#define _HELP \
+"\e[2J\e[H" \
+" Tic Tac Toe\r\n" \
+" (running: roard " ROAR_VERSION_STRING ")\r\n" \
+"\r\n" \
+"IDs:            Alternative IDs:\r\n" \
+" 7 | 8 | 9       a | s | d\r\n"   \
+"---+---+---     ---+---+---\r\n"  \
+" 4 | 5 | 6       f |SPC| h\r\n"   \
+"---+---+---     ---+---+---\r\n"  \
+" 1 | 2 | 3       j | k | l\r\n"   \
+"\r\n" \
+"Other keys:\r\n" \
+" q g , .  - Quit\r\n" \
+" n +      - New game\r\n" \
+" H 0      - Help\r\n" \
+" e        - Exit help / Redraw game\r\n" \
+"\r\n" \
+"%s\r\n"
+
+#define MSG__YOUR_TURN       "It's your turn. -- press any ID or H for help, q to quit --"
 #define MSG__CANNOT_PUT_HERE "You can not put your mark here. -- try again another position --"
-#define MSG__WON_PLAYER      "You won. -- press any key to continue or q to quit --"
-#define MSG__WON_COMPUTER    "I won. -- press any key to continue or q to quit --"
-#define MSG__WON_NOBODY      "Nobody won. -- press any key to continue or q to quit --"
+#define MSG__WON_PLAYER      "You won. -- press any key to continue or H for help, q to quit --"
+#define MSG__WON_COMPUTER    "I won. -- press any key to continue or H for help, q to quit --"
+#define MSG__WON_NOBODY      "Nobody won. -- press any key to continue or H for help, q to quit --"
+#define MSG__HELP            "-- press e to continue or q to quit --"
 
 typedef char game_state[9];
@@ -190 +211 @@
 }
 
+static void draw_help(int client) {
+ struct roar_buffer * buf;
+ ssize_t len = 0;
+ void * data;
+
+ if ( roar_buffer_new_data(&buf, _DISPLAY_BUFFER_LEN, &data) == -1 )
+  return;
+
+ snprintf(data, _DISPLAY_BUFFER_LEN, _HELP, MSG__HELP);
+
+ len = roar_mm_strlen(data);
+
+ if ( roar_buffer_set_len(buf, len) == -1 ) {
+  roar_buffer_free(buf);
+  clients_delete(client);
+ }
+
+ clients_add_output(client, &buf);
+}
+
 static void draw_game(int client, game_state * state, const char * info) {
  struct roar_buffer * buf;
@@ -235 +276 @@
 }
 
-static char input2id(char c) {
+static char map_input(char c) {
+ switch (c) {
+  case ',':
+  case '.':
+  case 'g':
+    return 'q';
+   break;
+  case 'a': return '0'; break;
+  case 's': return '1'; break;
+  case 'd': return '2'; break;
+  case 'f': return '3'; break;
+  case ' ': return '4'; break;
+  case 'h': return '5'; break;
+  case 'j': return '6'; break;
+  case 'k': return '7'; break;
+  case 'l': return '8'; break;
+  case '+': return 'n'; break;
+  case '0': return 'H'; break;
+ }
+
  if ( c > '9' )
   return c;
@@ -271 +331 @@
  if ( check_won(cs->protoinst) ) {
   for (i = 0; i < len; i++) {
-   if ( buf[i] == 'q' ) {
+   if ( map_input(buf[i]) == 'q' ) {
     clients_delete(client);
     return -1;
@@ -283 +343 @@
 
  for (i = 0; i < len; i++) {
-  c = input2id(buf[i]);
+  c = map_input(buf[i]);
   switch (c) {
    case 'q':
      clients_delete(client);
      return -1;
+    break;
+   case 'n':
+     new_game(cs->protoinst);
+     draw_game(client, cs->protoinst, MSG__YOUR_TURN);
+     return 0;
+    break;
+   case 'H':
+     draw_help(client);
+     return 0;
+    break;
+   case 'e':
+     draw_game(client, cs->protoinst, MSG__YOUR_TURN);
+     return 0;
     break;
    case '0': case '1': case '2': case '3': case '4':