- podpora bigAren :-)

- radar



git-svn-id: http://opensvn.csie.org/tuxanci_ng@90 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

1 files changed, 3 insertions, 9 deletions

diff --git a/src/base/arena.c b/src/base/arena.c
index bd471a2..9de1dce 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -90,8 +90,8 @@ void findFreeSpace(arena_t *arena, int *x, int *y, int w, int h)
 	assert( y != NULL );
 
 	do{
-		z_x = random() % WINDOW_SIZE_X;//arena->w;
-		z_y = random() % WINDOW_SIZE_Y;//arena->h;
+		z_x = random() % (arena->w-w);
+		z_y = random() % (arena->h-h);
 	}while( isFreeSpace(arena, z_x, z_y ,w ,h) == 0 );
 
 	*x = z_x;
@@ -201,16 +201,10 @@ void eventArena(arena_t *arena)
 {
 	int i;
 
-	//eventConflictTuxWithTeleport(arena->listTux, arena->listTeleport);
-	//eventConflictTuxWithShot(arena);
-
 	for( i = 0 ; i < 8 ; i++)
 	{
-		eventMoveListShot(arena);
 		checkShotIsInTuxScreen(arena);
-		//eventConflictShotWithWall(arena->listWall, arena->listShot);
-		//eventConflictShotWithTeleport(arena->listTeleport, arena->listShot);
-		//eventConflictShotWithPipe(arena->listPipe, arena->listShot);
+		eventMoveListShot(arena);
 		eventConflictShotWithItem(arena);
 		eventConflictTuxWithShot(arena);
 		eventModule();