- zrychlenie hry, bez toho aby sa menila rychlost hlavneho casovaca

- oprava chyby v ID managery
- ID manager spravuje ID-y pre vsetky objekty



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

1 files changed, 4 insertions, 2 deletions

diff --git a/src/arena.c b/src/arena.c
index 1980a95..38e5319 100644
--- a/src/arena.c
+++ b/src/arena.c
@@ -74,7 +74,7 @@ void findFreeSpace(arena_t *arena, int *x, int *y, int w, int h)
 
 	do{
 		z_x = random() % WINDOW_SIZE_X;
-		z_y = random() % (WINDOW_SIZE_Y-200);
+		z_y = random() % (WINDOW_SIZE_Y);
 	}while( isFreeSpace(arena, z_x, z_y ,w ,h) == 0 );
 
 	*x = z_x;
@@ -119,13 +119,15 @@ void eventArena(arena_t *arena)
 	//eventConflictTuxWithTeleport(arena->listTux, arena->listTeleport);
 	eventConflictTuxWithShot(arena->listTux, arena->listShot);
 
-	for( i = 0 ; i < 4 ; i++)
+	for( i = 0 ; i < 8 ; i++)
 	{
 		eventMoveListShot(arena->listShot);
 		//eventConflictShotWithWall(arena->listWall, arena->listShot);
 		//eventConflictShotWithTeleport(arena->listTeleport, arena->listShot);
 		//eventConflictShotWithPipe(arena->listPipe, arena->listShot);
 		eventConflictShotWithItem(arena->listItem, arena->listShot);
+		eventConflictTuxWithShot(arena->listTux, arena->listShot);
+		eventModule();
 	}
 
 	eventListItem(arena->listItem);