diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/gun.h | 3 | ||||
| -rwxr-xr-x | include/interface.h | 1 | ||||
| -rw-r--r-- | include/proto.h | 2 | ||||
| -rw-r--r-- | include/shot.h | 2 | ||||
| -rw-r--r-- | include/widget_textfield.h | 4 |
5 files changed, 10 insertions, 2 deletions
diff --git a/include/gun.h b/include/gun.h index 5f443e6..7389757 100644 --- a/include/gun.h +++ b/include/gun.h @@ -11,6 +11,9 @@ #define GUN_LASSER_HORIZONTAL 20 #define GUN_SHOT_VERTICAL 5 +#define GUN_BOMBBALL_WIDTH 20 +#define GUN_BOMBBALL_HEIGHT 20 + #include "tux.h" extern void shotInGun(tux_t *p); diff --git a/include/interface.h b/include/interface.h index e0a7893..c0311ee 100755 --- a/include/interface.h +++ b/include/interface.h @@ -31,6 +31,7 @@ extern int initSDL(); extern SDL_Surface* getSDL_Screen(); extern void getMousePosition(int *x, int *y); extern int isMouseClicked(); +extern int isPessAnyKey(); extern void interfaceRefresh(); extern void eventSDL(); extern void quitSDL(); diff --git a/include/proto.h b/include/proto.h index bd5b2c0..8838a60 100644 --- a/include/proto.h +++ b/include/proto.h @@ -72,6 +72,8 @@ 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/shot.h b/include/shot.h index d3e9bcc..27f05a5 100644 --- a/include/shot.h +++ b/include/shot.h @@ -37,6 +37,7 @@ typedef struct shot_struct extern bool_t isShotInicialized(); extern void initShot(); extern shot_t* newShot(int x,int y, int px, int py, int gun, tux_t *author); +extern shot_t* getShotID(list_t *listShot, int id); #ifndef PUBLIC_SERVER extern void drawShot(shot_t *p); extern void drawListShot(list_t *listShot); @@ -45,6 +46,7 @@ extern int isConflictWithListShot(list_t *listShot, int x, int y, int w, int h); extern void eventMoveListShot(list_t *listShot); extern void transformOnlyLasser(shot_t *shot); +extern void boundBombBall(shot_t *shot); extern void moveShot(shot_t *shot, int position, int src_x, int src_y, int dist_x, int dist_y, int dist_w, int dist_h); diff --git a/include/widget_textfield.h b/include/widget_textfield.h index 860eae4..af59ae8 100644 --- a/include/widget_textfield.h +++ b/include/widget_textfield.h @@ -5,7 +5,7 @@ #include "main.h" -#define WIDGET_TEXTFIELD_WIDTH 125 +#define WIDGET_TEXTFIELD_WIDTH 188 #define WIDGET_TEXTFIELD_HEIGHT 36 #define WIDGET_TEXTFIELD_TEXT_OFFSET_X 10 @@ -17,7 +17,7 @@ typedef struct widget_textfield { int x, y; int w, h; - int time; + int canWrite; int timeBlick; char text[STR_SIZE]; bool_t active; |