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-02 14:19:13 +13:00
parent addd0acaab 95a291fd94
commit 757fe9542b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/gobble7/gobble7.c
+3 -4
View File
@@ -1,8 +1,7 @@
/** @file gobble7.c /** @file gobble7.c
@author M.P. Hayes @author M.P. Hayes
@date 1 Oct 2013 @date 1 Oct 2013
@brief A simple game where a monster has to capture `things' that run away. @brief A simple game where a monster has to capture `things' that run away.*/
*/
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -30,7 +29,7 @@ static bool game_over = 1;
static int duration = 0; static int duration = 0;
static void display (__unused__ void *data) static void display_task (__unused__ void *data)
{ {
tinygl_update (); tinygl_update ();
} }
@@ -102,7 +101,7 @@ int main (void)
{ {
task_t tasks[] = task_t tasks[] =
{ {
{.func = display, .period = TASK_RATE / DISPLAY_RATE}, {.func = display_task, .period = TASK_RATE / DISPLAY_RATE},
{.func = navswitch_task, .period = TASK_RATE / NAVSWITCH_RATE}, {.func = navswitch_task, .period = TASK_RATE / NAVSWITCH_RATE},
{.func = things_move_task, .period = TASK_RATE / THINGS_MOVE_RATE}, {.func = things_move_task, .period = TASK_RATE / THINGS_MOVE_RATE},
{.func = monster_flash_task, .period = TASK_RATE / MONSTER_FLASH_RATE}, {.func = monster_flash_task, .period = TASK_RATE / MONSTER_FLASH_RATE},