diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2008-12-11 19:38:00 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2008-12-11 19:38:00 +0100 |
| commit | 3ba6105170ecac2fb124d9eb7e81ba72dd4700b8 (patch) | |
| tree | ec30e2b1dda198c9646ea3447308368bbe334500 /src/base/shot.c | |
| parent | b2d2cf4f53748051ace835d27564cb2922c13db9 (diff) | |
First pass for renaming screen/widget.
Diffstat (limited to 'src/base/shot.c')
| -rw-r--r-- | src/base/shot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/base/shot.c b/src/base/shot.c index 977ccb4..759f00c 100644 --- a/src/base/shot.c +++ b/src/base/shot.c @@ -14,7 +14,7 @@ #ifndef PUBLIC_SERVER # include "image.h" # include "layer.h" -# include "screen_world.h" +# include "world.h" #endif #ifdef PUBLIC_SERVER @@ -303,7 +303,7 @@ static void action_check(space_t * space, shot_t * shot, client_t * client) void checkShotIsInTuxScreen(arena_t * arena) { - int screen_x, screen_y; + int x, y; tux_t *thisTux; client_t *thisClient; list_t *listClient; @@ -324,11 +324,11 @@ void checkShotIsInTuxScreen(arena_t * arena) continue; } - getCenterScreen(&screen_x, &screen_y, thisTux->x, thisTux->y, + getCenterScreen(&x, &y, thisTux->x, thisTux->y, WINDOW_SIZE_X, WINDOW_SIZE_Y); actionSpaceFromLocation(arena->spaceShot, action_check, - thisClient, screen_x, screen_y, + thisClient, x, y, WINDOW_SIZE_X, WINDOW_SIZE_Y); while (thisClient->listSeesShot->count > 100) { |