=================================================================== RCS file: /cvs/ace/ace/tests/test1.c,v retrieving revision 1.3 retrieving revision 1.4 diff -p -u -r1.3 -r1.4 --- ace/tests/test1.c 2001/05/06 04:27:09 1.3 +++ /cvs/ace/ace/tests/test1.c 2001/09/21 18:38:58 1.4 @@ -17,23 +17,15 @@ #include "cards.h" -Picture *cards[4][13]; -char *suits = "hdcs"; -char *values = "a234567890jqk"; +static Picture *cards[4][13]; +static char *suits = "hdcs"; +static char *values = "a234567890jqk"; #define W CARD_WIDTH #define H CARD_HEIGHT #define M CARD_MARGIN -int -main(int argc, char **argv) -{ - init_ace(argc, argv); - init_table(300+4*(W+M), 4*H+5*M); - table_loop(); -} - -void +static void init() { int s, v; @@ -46,7 +38,7 @@ init() } } -void +static void redraw() { int s, v; @@ -62,3 +54,17 @@ redraw() for (s=0; s<4; s++) put_picture(cards[s][0], 300+s*(W+M), M+3*(M+H), 0, 0, W, H); } + +static FunctionMapping fmap[] = { + { "init", (void *)init }, + { "redraw", (void *)redraw }, + { 0, 0 } +}; + +int +main(int argc, char **argv) +{ + init_ace(argc, argv, fmap); + init_table(300+4*(W+M), 4*H+5*M); + table_loop(); +}