fanwuyang/ence260-othello
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of eng-git.canterbury.ac.nz:mph/ucfk4

Browse Source
This commit is contained in:
Michael Hayes
2013-10-03 16:40:17 +13:00
parent 757fe9542b 3a1ce1fe20
commit c651d9bcff
1 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/gobble7/gobble7.c
+37 -22
View File
@@ -15,17 +15,24 @@
#include "things.h" #include "things.h"
#define DISPLAY_RATE 200 #define DISPLAY_TASK_RATE 200
#define NAVSWITCH_RATE 50 #define NAVSWITCH_TASK_RATE 50
#define THINGS_MOVE_RATE 10 #define THINGS_MOVE_TASK_RATE 10
#define MONSTER_FLASH_RATE 5 #define MONSTER_FLASH_TASK_RATE 5
static bool running = 0; typedef enum game_state
static bool game_over = 1; {
GAME_WAIT, /* Waiting to start. */
GAME_RUNNING, /* Things running around. */
GAME_PAUSED /* Things paused. */
} game_state_t;
static game_state_t game_state = GAME_WAIT;
static int duration = 0; static int duration = 0;
@@ -38,7 +45,7 @@ static void display_task (__unused__ void *data)
static void monster_flash_task (__unused__ void *data) static void monster_flash_task (__unused__ void *data)
{ {
/* Flash the monster. */ /* Flash the monster. */
if (running) if (game_state == GAME_RUNNING)
things_monster_toggle (); things_monster_toggle ();
} }
@@ -46,7 +53,7 @@ static void monster_flash_task (__unused__ void *data)
static void things_move_task (__unused__ void *data) static void things_move_task (__unused__ void *data)
{ {
/* Move the things. */ /* Move the things. */
if (running) if (game_state == GAME_RUNNING)
{ {
duration++; duration++;
things_move (); things_move ();
@@ -70,26 +77,34 @@ static void navswitch_task (__unused__ void *data)
/* Pause/resume things running around. */ /* Pause/resume things running around. */
if (navswitch_push_event_p (NAVSWITCH_PUSH)) if (navswitch_push_event_p (NAVSWITCH_PUSH))
{ {
if (! running && game_over) switch (game_state)
{ {
case GAME_WAIT:
game_state = GAME_RUNNING;
srand (timer_get ()); srand (timer_get ());
tinygl_clear (); tinygl_clear ();
things_create (); things_create ();
duration = 0; duration = 0;
game_over = 0; led_set (LED1, 1);
break;
case GAME_RUNNING:
game_state = GAME_PAUSED;
led_set (LED1, 0);
break;
case GAME_PAUSED:
game_state = GAME_RUNNING;
led_set (LED1, 1);
break;
} }
running = !running;
led_set (LED1, running);
} }
if (running && things_killed_p ()) if (game_state == GAME_RUNNING && things_killed_p ())
{ {
char buffer[6]; char buffer[6];
running = 0; game_state = GAME_WAIT;
game_over = 1;
led_set (LED1, 0); led_set (LED1, 0);
sprintf (buffer, "%d", duration); sprintf (buffer, "%d", duration);
tinygl_text (buffer); tinygl_text (buffer);
@@ -101,10 +116,10 @@ int main (void)
{ {
task_t tasks[] = task_t tasks[] =
{ {
{.func = display_task, .period = TASK_RATE / DISPLAY_RATE}, {.func = display_task, .period = TASK_RATE / DISPLAY_TASK_RATE},
{.func = navswitch_task, .period = TASK_RATE / NAVSWITCH_RATE}, {.func = navswitch_task, .period = TASK_RATE / NAVSWITCH_TASK_RATE},
{.func = things_move_task, .period = TASK_RATE / THINGS_MOVE_RATE}, {.func = things_move_task, .period = TASK_RATE / THINGS_MOVE_TASK_RATE},
{.func = monster_flash_task, .period = TASK_RATE / MONSTER_FLASH_RATE}, {.func = monster_flash_task, .period = TASK_RATE / MONSTER_FLASH_TASK_RATE},
}; };
@@ -113,7 +128,7 @@ int main (void)
led_init (); led_init ();
led_set (LED1, 0); led_set (LED1, 0);
tinygl_init (DISPLAY_RATE); tinygl_init (DISPLAY_TASK_RATE);
tinygl_font_set (&font3x5_1); tinygl_font_set (&font3x5_1);
tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL); tinygl_text_mode_set (TINYGL_TEXT_MODE_SCROLL);
tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE); tinygl_text_dir_set (TINYGL_TEXT_DIR_ROTATE);