diff options
| -rw-r--r-- | src/base/arena.c | 4 | ||||
| -rw-r--r-- | src/base/shot.c | 3 | ||||
| -rw-r--r-- | src/base/tux.c | 8 | ||||
| -rw-r--r-- | src/base/tux.h | 12 |
4 files changed, 13 insertions, 14 deletions
diff --git a/src/base/arena.c b/src/base/arena.c index 6b7cff5..67f67e4 100644 --- a/src/base/arena.c +++ b/src/base/arena.c @@ -11,9 +11,9 @@ #include "item.h" #include "myTimer.h" #include "modules.h" -#include "hotKey.h" #ifndef PUBLIC_SERVER +#include "hotKey.h" #include "screen_world.h" #include "screen_setting.h" #include "layer.h" @@ -44,6 +44,7 @@ void hotkey_splitArena() } } +#ifndef PUBLIC_SERVER void initArena() { splitType = SCREEN_SPLIT_VERTICAL; @@ -67,6 +68,7 @@ void quitArena() { unregisterHotKey(SDLK_F3); } +#endif arena_t* newArena(int w, int h) { diff --git a/src/base/shot.c b/src/base/shot.c index 86dfec3..36f876e 100644 --- a/src/base/shot.c +++ b/src/base/shot.c @@ -313,9 +313,6 @@ static void action_check(space_t *space, shot_t *shot, client_t *client) if( isValueInList(client->listSeesShot, shot->id) == 0 ) { addList(client->listSeesShot, newInt(shot->id) ); -#ifdef DEBUG - printf("proto_send_shot_server(PROTO_SEND_ONE, client, shot);\n"); -#endif proto_send_shot_server(PROTO_SEND_ONE, client, shot); } } diff --git a/src/base/tux.c b/src/base/tux.c index 79c7104..352487d 100644 --- a/src/base/tux.c +++ b/src/base/tux.c @@ -225,7 +225,7 @@ void drawTux(tux_t *tux) (tux->frame/TUX_KEY) * TUX_IMG_WIDTH, 0, TUX_IMG_WIDTH, TUX_IMG_HEIGHT, TUX_LAYER); } - +/* void drawListTux(list_t *listTux) { tux_t *thisTux; @@ -240,7 +240,7 @@ void drawListTux(list_t *listTux) drawTux(thisTux); } } - +*/ #endif void replaceTuxID(tux_t *tux, int id) @@ -688,7 +688,7 @@ void eventTux(tux_t *tux) eventBonus(tux); eventGiveTuxListItem(tux, arena->spaceItem); } - +/* void eventListTux(list_t *listTux) { tux_t *thisTux; @@ -703,7 +703,7 @@ void eventListTux(list_t *listTux) eventTux(thisTux); } } - +*/ void getTuxProportion(tux_t *tux, int *x,int *y, int *w, int *h) { assert( tux != NULL ); diff --git a/src/base/tux.h b/src/base/tux.h index 17cc0e9..d5ec2fb 100644 --- a/src/base/tux.h +++ b/src/base/tux.h @@ -116,17 +116,17 @@ extern void tuxSetName(tux_t *tux, char *name); extern bool_t isTuxAnyGun(tux_t *tux); extern void getCourse(int n, int *x, int *y); extern void drawTux(tux_t *tux); -extern void drawListTux(list_t *listTux); +//extern void drawListTux(list_t *listTux); extern void eventTuxIsDead(tux_t *tux); -extern tux_t* isConflictWithListTux(list_t *listTux, int x, int y, int w, int h); -extern int isConflictTuxWithListTux(tux_t *tux, list_t *listTux); +//extern tux_t* isConflictWithListTux(list_t *listTux, int x, int y, int w, int h); +//extern int isConflictTuxWithListTux(tux_t *tux, list_t *listTux); extern void eventConflictTuxWithShot(arena_t *arena); -extern void eventConflictTuxWithTeleport(list_t *listTux, list_t *listTeleport); +//extern void eventConflictTuxWithTeleport(list_t *listTux, list_t *listTeleport); extern void tuxTeleport(tux_t *tux); extern void actionTux(tux_t *tux, int action); extern void eventTux(tux_t *tux); -extern void eventListTux(list_t *listTux); -extern tux_t* getTuxID(list_t *listTux, int id); +//extern void eventListTux(list_t *listTux); +//extern tux_t* getTuxID(list_t *listTux, int id); extern void getTuxProportion(tux_t *tux, int *x,int *y, int *w, int *h); extern void replaceTuxID(tux_t *tux, int id); extern void setTuxProportion(tux_t *tux, int x, int y); |