From a83321436c8d40210bbbd0a44fe1290ed71638af Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Thu, 11 Dec 2008 19:39:49 +0100 Subject: Revert "First pass for renaming screen/widget." This reverts commit 3ba6105170ecac2fb124d9eb7e81ba72dd4700b8. --- src/base/shot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/base/shot.c') diff --git a/src/base/shot.c b/src/base/shot.c index 759f00c..977ccb4 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 "world.h" +# include "screen_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 x, y; + int screen_x, screen_y; tux_t *thisTux; client_t *thisClient; list_t *listClient; @@ -324,11 +324,11 @@ void checkShotIsInTuxScreen(arena_t * arena) continue; } - getCenterScreen(&x, &y, thisTux->x, thisTux->y, + getCenterScreen(&screen_x, &screen_y, thisTux->x, thisTux->y, WINDOW_SIZE_X, WINDOW_SIZE_Y); actionSpaceFromLocation(arena->spaceShot, action_check, - thisClient, x, y, + thisClient, screen_x, screen_y, WINDOW_SIZE_X, WINDOW_SIZE_Y); while (thisClient->listSeesShot->count > 100) { -- cgit v1.2.3