From 652ce49bba44c885da4891bcae5fb650ef132a73 Mon Sep 17 00:00:00 2001
From: oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>
Date: Thu, 12 Jun 2008 19:27:11 +0000
Subject: - moduly pouzivaju space_t - drobne upravy

git-svn-id: http://opensvn.csie.org/tuxanci_ng@64 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
---
 src/tux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/tux.c')

diff --git a/src/tux.c b/src/tux.c
index a4153c6..8dad6c4 100644
--- a/src/tux.c
+++ b/src/tux.c
@@ -644,7 +644,7 @@ void moveTux(tux_t *tux, int n)
 	int px, py;
 	int zal_x, zal_y;
 	int new_x, new_y;
-	int x, y, w, h;
+	int w, h;
 	arena_t *arena;
 
 /*
@@ -724,7 +724,7 @@ void moveTux(tux_t *tux, int n)
 */
 
 	if( tux->bonus != BONUS_GHOST && (
-	    /*isConflictWithObjectFromSpace(arena->spaceTux, x, y, w, h) ||*/
+	    isConflictWithObjectFromSpaceBut(arena->spaceTux, new_x, new_y, w, h, tux) ||
 	    isConflictModule(new_x, new_y, w, h) ) )
 	{
 		setTuxProportion(tux, zal_x, zal_y);
-- 
cgit v1.2.3