From a8bec57e7a9be7b1fa36ef8be618db4e46cbd599 Mon Sep 17 00:00:00 2001
From: oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>
Date: Tue, 15 Apr 2008 19:28:48 +0000
Subject: - oprava chyby #0007 #0006 #0005 - nova zbran bombball - client
 dostava svoju vlastnu poziciu od servera kazdych 5000 ms

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

(limited to 'src/arena.c')

diff --git a/src/arena.c b/src/arena.c
index 760c51b..b762937 100644
--- a/src/arena.c
+++ b/src/arena.c
@@ -139,6 +139,17 @@ void eventArena(arena_t *arena)
 	eventTimer(arena->listTimer);
 }
 
+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) )
+	{
+		return 1;
+	}
+
+	return 0;
+}
+
 void destroyArena(arena_t *p)
 {
 	destroyListItem(p->listTux, destroyTux);
-- 
cgit v1.2.3