diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/modules.h | 6 | ||||
| -rw-r--r-- | include/proto.h | 8 | ||||
| -rw-r--r-- | include/screen_setting.h | 1 | ||||
| -rw-r--r-- | include/tux.h | 2 | ||||
| -rw-r--r-- | include/widget_select.h | 26 |
5 files changed, 35 insertions, 8 deletions
diff --git a/include/modules.h b/include/modules.h index 085e476..0b31292 100644 --- a/include/modules.h +++ b/include/modules.h @@ -7,6 +7,7 @@ #include "shot.h" #include "arena.h" #include "proto.h" +#include "myTimer.h" #ifndef PUBLIC_SERVER #include "image.h" @@ -29,7 +30,8 @@ typedef struct export_fce_s void (*fce_getTuxProportion)(tux_t *tux, int *x,int *y, int *w, int *h); void (*fce_setTuxProportion)(tux_t *tux, int x, int y); tux_t* (*fce_getTuxID)(list_t *listTux, int id); - + void (*fce_actionTux)(tux_t *tux, int action); + arena_t* (*fce_getCurrentArena)(); int (*fce_conflictSpace)(int x1,int y1,int w1,int h1,int x2,int y2,int w2,int h2); int (*fce_isFreeSpace)(arena_t *arena, int x, int y, int w, int h); @@ -37,6 +39,8 @@ typedef struct export_fce_s void (*fce_proto_send_newtux_server)(int type, client_t *client, tux_t *tux); void (*fce_proto_send_shot_server)(int type, client_t *client, shot_t *p); + my_time_t (*fce_getMyTime)(); + void (*fce_destroyShot)(shot_t *p); void (*fce_boundBombBall)(shot_t *shot); void (*fce_transformOnlyLasser)(shot_t *shot); diff --git a/include/proto.h b/include/proto.h index 569339e..178b387 100644 --- a/include/proto.h +++ b/include/proto.h @@ -70,15 +70,11 @@ extern void proto_send_kill_server(int type, client_t *client, tux_t *tux); extern void proto_recv_kill_client(char *msg); extern void proto_send_score_server(int type, client_t *client, tux_t *tux); extern void proto_recv_score_client(char *msg); -extern void proto_send_deltux_server(int type, client_t *client, client_t *client2); -extern void proto_recv_deltux_client(char *msg); +extern void proto_send_del_server(int type, client_t *client, int id); +extern void proto_recv_del_client(char *msg); extern void proto_send_additem_server(int type, client_t *client, item_t *p); extern void proto_recv_additem_client(char *msg); -extern void proto_send_item_server(int type, client_t *client, tux_t *tux, item_t *item); -extern void proto_recv_item_client(char *msg); extern void proto_send_shot_server(int type, client_t *client, shot_t *p); -extern void proto_send_delshot_server(int type, client_t *client, shot_t *p); -extern void proto_recv_delshot_client(char *msg); extern void proto_recv_shot_client(char *msg); extern void proto_send_ping_client(); extern void proto_recv_ping_server(client_t *client, char *msg); diff --git a/include/screen_setting.h b/include/screen_setting.h index 88f2289..1684c0d 100644 --- a/include/screen_setting.h +++ b/include/screen_setting.h @@ -9,6 +9,7 @@ extern void eventScreenSetting(); extern void getSettingNameRight(char *s); extern void getSettingNameLeft(char *s); extern void getSettingCountRound(int *n); +extern char* getSettingAI(); extern bool_t isSettingAnyItem(); extern bool_t isSettingItem(int item); extern void quitScreenSetting(); diff --git a/include/tux.h b/include/tux.h index f247f02..25299a2 100644 --- a/include/tux.h +++ b/include/tux.h @@ -30,7 +30,7 @@ #define TUX_CONTROL_KEYBOARD_LEFT 1 #define TUX_CONTROL_KEYBOARD_RIGHT 2 #define TUX_CONTROL_NET 3 -#define TUX_CONTROL_ROBOT 4 +#define TUX_CONTROL_AI 4 #define TUX_WIDTH 30 #define TUX_HEIGHT 30 diff --git a/include/widget_select.h b/include/widget_select.h new file mode 100644 index 0000000..81255a9 --- /dev/null +++ b/include/widget_select.h @@ -0,0 +1,26 @@ + +#ifndef WIDGET_SELECT_H + +#define WIDGET_SELECT_H + +#include "main.h" +#include "list.h" + + +typedef struct widget_select +{ + int x, y; + int w, h; + list_t *list; + int select; + void (*fce_event)(void *); +} widget_select_t; + +extern widget_select_t* newWidgetSelect(int x, int y, void (*fce_event)(void *)); +extern void addToWidgetSelect(widget_select_t *p, char *s); +extern void drawWidgetSelect(widget_select_t *p); +extern void eventWidgetSelect(widget_select_t *p); +extern void destroyWidgetSelect(widget_select_t *p); + +#endif + |