- 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

1 files changed, 11 insertions, 0 deletions

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);