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/tux.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/tux.c') diff --git a/src/tux.c b/src/tux.c index f54fff2..c0b6f22 100644 --- a/src/tux.c +++ b/src/tux.c @@ -18,6 +18,7 @@ #include "net_multiplayer.h" #include "dynamicInt.h" #include "proto.h" +#include "modules.h" #ifndef PUBLIC_SERVER #include "image.h" @@ -526,6 +527,7 @@ void eventConflictTuxWithShot(list_t *listTux, list_t *listShot) } } +/* void eventConflictTuxWithTeleport(list_t *listTux, list_t *listTeleport) { teleport_t *thisTeleport; @@ -551,6 +553,7 @@ void eventConflictTuxWithTeleport(list_t *listTux, list_t *listTeleport) } } } +*/ void moveTux(tux_t *tux, int n) { @@ -623,8 +626,8 @@ void moveTux(tux_t *tux, int n) if( tux->bonus != BONUS_GHOST && ( isConflictTuxWithListTux(tux, arena->listTux) || - isConflictWithListWall(arena->listWall, x, y, w, h) || - isConflictWithListPipe(arena->listPipe, x, y, w, h) ) ) + isConflictWithListWall(arena->listWall, x, y, w, h) || + isConflictModule(x, y, w, h) ) ) { tux->x = zal_x; tux->y = zal_y; @@ -795,7 +798,7 @@ static void eventBonus(tux_t *tux) tux->bonus = BONUS_NONE; if ( isConflictWithListWall(getCurrentArena()->listWall, x, y, w, h) || - isConflictWithListPipe(getCurrentArena()->listPipe, x, y, w, h) || + isConflictModule(x, y, w, h) || isConflictTuxWithListTux(tux, getCurrentArena()->listTux) ) { tux->bonus = BONUS_GHOST; -- cgit v1.2.3