From 7055882c93022da3a6a1cf74cebf3d17c44ce6c4 Mon Sep 17 00:00:00 2001 From: oroborus Date: Mon, 12 May 2008 20:39:34 +0000 Subject: - podpora modulov - hra sa musi kompilovat s GUI ako v config.h _zakomenotvane_ #define PUBLIC_SERVER make clean make make mod su make install - hra sa musi ako server kompilovat v config.h _odkomentovane__ #define PUBLIC_SERVER make clean make make mod - pozor, urcite tam je este vela bugov //je to nedoladene zatial to ani nedavajte na server git-svn-id: http://opensvn.csie.org/tuxanci_ng@52 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- src/arena.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/arena.c') diff --git a/src/arena.c b/src/arena.c index b762937..05749d6 100644 --- a/src/arena.c +++ b/src/arena.c @@ -13,6 +13,7 @@ #include "teleport.h" #include "pipe.h" #include "myTimer.h" +#include "modules.h" #ifndef PUBLIC_SERVER #include "layer.h" @@ -62,8 +63,8 @@ int isFreeSpace(arena_t *arena, int x, int y, int w, int h) if ( isConflictWithListWall(arena->listWall, x, y, w, h) )return 0; if ( isConflictWithListShot(arena->listShot, x, y, w, h) )return 0; if ( isConflictWithListItem(arena->listItem, x, y, w, h) )return 0; - if ( isConflictWithListTeleport(arena->listTeleport, x, y, w, h) )return 0; - if ( isConflictWithListPipe(arena->listPipe, x, y, w, h) )return 0; + //if ( isConflictWithListTeleport(arena->listTeleport, x, y, w, h) )return 0; + //if ( isConflictWithListPipe(arena->listPipe, x, y, w, h) )return 0; return 1; } @@ -95,8 +96,8 @@ void drawArena(arena_t *arena) drawListTux(arena->listTux); drawListWall(arena->listWall); - drawListTeleport(arena->listTeleport); - drawListPipe(arena->listPipe); + //drawListTeleport(arena->listTeleport); + //drawListPipe(arena->listPipe); drawListShot(arena->listShot); drawListItem(arena->listItem); @@ -120,15 +121,15 @@ void eventArena(arena_t *arena) { int i; - eventConflictTuxWithTeleport(arena->listTux, arena->listTeleport); + //eventConflictTuxWithTeleport(arena->listTux, arena->listTeleport); eventConflictTuxWithShot(arena->listTux, arena->listShot); for( i = 0 ; i < 4 ; i++) { eventMoveListShot(arena->listShot); eventConflictShotWithWall(arena->listWall, arena->listShot); - eventConflictShotWithTeleport(arena->listTeleport, arena->listShot); - eventConflictShotWithPipe(arena->listPipe, arena->listShot); + //eventConflictShotWithTeleport(arena->listTeleport, arena->listShot); + //eventConflictShotWithPipe(arena->listPipe, arena->listShot); eventConflictShotWithItem(arena->listItem, arena->listShot); } @@ -142,7 +143,7 @@ void eventArena(arena_t *arena) int isConflictWithObjectInArena(arena_t *arena, int x, int y, int w, int h) { if( isConflictWithListWall(arena->listWall, x, y, w, h) || - isConflictWithListPipe(arena->listPipe, x, y, w, h) ) + isConflictModule(x, y, w, h) ) { return 1; } -- cgit v1.2.3