- hrac moze sucastne chodit aj strielat

- na indexovanie poloziek v list_t sa pouizva index.c ( postaveny na list_t )
- oprava chyby, porgram sa zrutil ak nebolo inicializovane audio
- zexxov patch



git-svn-id: http://opensvn.csie.org/tuxanci_ng@80 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

5 files changed, 15 insertions, 949 deletions

diff --git a/src/modules/Makefile b/src/modules/Makefile
index ba52738..81f6c54 100755
--- a/src/modules/Makefile
+++ b/src/modules/Makefile
@@ -1,27 +1,30 @@
 
 all: modWall.so modPipe.so modTeleport.so modAI.so
 
-list.o: list.c list.h
-	$(CC) $(CFLAGS) -fPIC -o list.o -c list.c
+list.o: ../base/list.c ../base/list.h
+	$(CC) $(CFLAGS) -fPIC -o list.o -c ../base/list.c
 
-space.o: space.c space.h
-	$(CC) $(CFLAGS) -fPIC -o space.o -c space.c
+space.o: ../base/space.c ../base/space.h
+	$(CC) $(CFLAGS) -fPIC -o space.o -c ../base/space.c
 
-modWall.so: list.o space.o
+index.o: ../base/index.c ../base/index.h
+	$(CC) $(CFLAGS) -fPIC -o index.o -c ../base/index.c
+
+modWall.so: list.o space.o index.o
 	gcc $(CFLAGS) -fPIC -c modWall.c -o modWall.o
-	gcc $(CFLAGS) -I../include -shared -fPIC -o modWall.so modWall.o list.o space.o
+	gcc $(CFLAGS) -I../include -shared -fPIC -o modWall.so modWall.o list.o space.o index.o
 
-modPipe.so: list.o space.o
+modPipe.so: list.o space.o index.o
 	gcc $(CFLAGS) -fPIC -c modPipe.c -o modPipe.o
-	gcc $(CFLAGS) -I../include -shared -fPIC -o modPipe.so modPipe.o list.o space.o
+	gcc $(CFLAGS) -I../include -shared -fPIC -o modPipe.so modPipe.o list.o space.o index.o
 
-modTeleport.so: list.o space.o
+modTeleport.so: list.o space.o index.o
 	gcc $(CFLAGS) -fPIC -c modTeleport.c -o modTeleport.o
-	gcc $(CFLAGS) -I../include -shared -fPIC -o modTeleport.so modTeleport.o list.o space.o
+	gcc $(CFLAGS) -I../include -shared -fPIC -o modTeleport.so modTeleport.o list.o space.o index.o
 
-modAI.so: list.o space.o
+modAI.so: list.o space.o index.o
 	gcc $(CFLAGS) -fPIC -c modAI.c -o modAI.o
-	gcc $(CFLAGS) -I../include -shared -fPIC -o modAI.so modAI.o list.o space.o
+	gcc $(CFLAGS) -I../include -shared -fPIC -o modAI.so modAI.o list.o space.o index.o
 
 clean:
 	rm -rf *.o 
diff --git a/src/modules/list.c b/src/modules/list.c
deleted file mode 100755
index d182210..0000000
--- a/src/modules/list.c
+++ /dev/null
@@ -1,241 +0,0 @@
-
-#include "base/main.h"
-#include "base/list.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-list_t* newList()
-{
-	list_t *new;
-
-	new = malloc( sizeof(list_t) );
-	memset(new, 0, sizeof(list_t) );
-
-	return new;
-}
-
-list_t* cloneList(list_t *p)
-{
-	list_t *new;
-
-	assert( p != NULL );
-
-	new = malloc( sizeof(list_t) );
-	memcpy(new, p, sizeof(list_t) );
-
-	if( p->list != NULL )
-	{
-		new->list = malloc( p->alloc * sizeof(void *) );
-		memcpy(new->list, p->list, p->alloc * sizeof(void *));
-	}
-
-	return new;
-}
-
-list_t* cloneListItem(list_t *p, void *f)
-{
-	list_t *new;
-	void* (*fce)(void *);
-	int i;
-
-	assert( p != NULL );
-	assert( f != NULL );
-
-	new = cloneList(p);
-	fce = f;
-
-	for(i = 0 ; i < p->count ; i++)
-		new->list[i] = fce(p->list[i]);
-
-	return new;
-}
-
-void addList(list_t *p, void *item)
-{
-	assert( p != NULL );
-
-	if( p->alloc == 0 )
-	{
-		p->alloc = LIST_ALLOC_LIMIT;
-		p->count = 1;
-		p->list = malloc(p->alloc * sizeof(void *) );
-		p->list[0] = item;
-
-		return;
-	}
-
-	if( p->count + 1 <= p->alloc )
-	{
-		p->list[p->count] = item;
-		p->count += 1;
-
-		return;
-	}
-
-	if( p->count + 1 > p->alloc )
-	{
-		void **new;
-
-#ifdef DEBUG_LIST
-		printf("realokujem z %d na %d (count=%d)\n",
-		p->alloc, p->alloc+LIST_ALLOC_LIMIT, p->count);
-#endif
-
-		p->alloc += LIST_ALLOC_LIMIT;
-		new = malloc(p->alloc * sizeof(void *) );
-		memcpy(new, p->list, p->count * sizeof(void *) );
-		free(p->list);
-		p->list = new;
-		p->list[p->count] = item;
-		p->count++;
-
-		return;
-	}
-}
-
-void insList(list_t *p, int n, void *item)
-{
-	assert( p != NULL );
-
-	addList(p, NULL); // :)
-
-	assert( n >= 0 || n < p->count );
-
-	memmove(p->list+n+1, p->list+n, ( (p->count-1) - n ) * sizeof(void *));
-
-	p->list[n] = item;
-}
-
-void *getList(list_t *p, int n)
-{
-	assert( p != NULL );
-	assert( n >= 0 || n < p->count );
-
-	return p->list[n];
-}
-
-int searchListItem(list_t *p, void *n)
-{
-	int i;
-
-	assert( p != NULL );
-
-	for( i = 0 ; i < p->count ; i++ )
-		if( p->list[i] == n )return i;
-
-	return -1;
-}
-
-void delList(list_t *p, int n)
-{
-	assert( p != NULL );
-	assert( n >= 0 || n < p->count );
-
-	memmove(p->list+n, p->list+n+1,  ( (p->count-1) - n ) * sizeof(void *));
-	
-	p->count--;
-
-	if( p->count + LIST_ALLOC_LIMIT < p->alloc )
-	{
-		void **new;
-
-#ifdef DEBUG_LIST
-		printf("realokujem z %d na %d (count=%d)\n",
-		p->alloc, p->alloc-LIST_ALLOC_LIMIT, p->count);
-#endif
-
-		p->alloc -= LIST_ALLOC_LIMIT;
-		new = malloc(p->alloc * sizeof(void *) );
-		memcpy(new, p->list, p->count * sizeof(void *) );
-		free(p->list);
-		p->list = new;
-	}
-}
-
-void delListItem(list_t *p, int n, void *f)
-{
-	int (*fce)(void *);
-
-	assert( p != NULL );
-	assert( n >= 0 || n < p->count );
-
-	fce = f;
-	if( fce != NULL )fce(p->list[n]);
-
-	delList(p, n);
-}
-
-void listDoEmpty(list_t *p)
-{
-	p->count = 0;
-}
-
-void destroyList(list_t *p)
-{
-	assert( p != NULL );
-
-	if( p->list != NULL )free(p->list);
-	free(p);
-}
-
-void destroyListItem(list_t *p, void *f)
-{
-	void (*fce)(void *);
-	int i;
-
-	assert( p != NULL );
-	assert( f != NULL );
-
-	fce = f;
-
-	for(i = 0 ; i < p->count ; i++)
-		fce(p->list[i]);
-
-	destroyList(p);
-}
-
-/*
-typedef struct pokus_str
-{
-	int x;
-} pokus;
-
-pokus* newPokus(int n)
-{
-	pokus *new;
-	new = malloc(sizeof(pokus));
-	new->x = n;
-	return new;
-}
-
-pokus *clonePokus(pokus *p)
-{
-	pokus *new;
-	new = malloc(sizeof(pokus));
-	memcpy(new, p, sizeof(pokus));
-	return new;
-}
-
-void destroyPokus(pokus *p)
-{
-	free(p);
-}
-
-int main()
-{
-	list_t *my;
-	int i;
-
-	my = newList();
-
-	for(i = 0; i < 100; i++)
-		addList(my, newPokus(i));
-
-	destroyListItem(my, destroyPokus);
-
-	return 0;
-}
-*/
diff --git a/src/modules/list.h b/src/modules/list.h
deleted file mode 100755
index 17a8e2d..0000000
--- a/src/modules/list.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#ifndef LIST_H
-
-#define LIST_H
-
-#include "base/main.h"
-
-#define LIST_ALLOC_LIMIT 16
-
-typedef struct list_str
-{
-	void **list;
-	int count;
-	int alloc;
-} list_t;
-
-extern list_t* newList();
-extern list_t* cloneList(list_t *p);
-extern list_t* cloneListItem(list_t *p, void *f);
-
-extern void addList(list_t *p, void *item);
-extern void insList(list_t *p, int n, void *item);
-extern void *getList(list_t *p,int n);
-extern int searchListItem(list_t *p, void *n);
-
-extern void delList(list_t *p,int n);
-extern void delListItem(list_t *p,int n,void *f);
-extern void listDoEmpty(list_t *p);
-
-extern void destroyList(list_t *p);
-extern void destroyListItem(list_t *p,void *f);
-
-#endif
diff --git a/src/modules/space.c b/src/modules/space.c
deleted file mode 100644
index 62cfa48..0000000
--- a/src/modules/space.c
+++ /dev/null
@@ -1,625 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "base/main.h"
-#include "modules/list.h"
-#include "modules/space.h"
-
-#define DEBUG_SPACE
-#define ERROR_SUPPORT
-
-#ifdef DEBUG_SPACE
-
-
-typedef struct recv_struct
-{
-	int id;
-	int x, y;
-	int w, h;
-} recv_t;
-
-recv_t* newRecv(int id, int x , int y, int w, int h)
-{
-	recv_t *new;
-
-	new = malloc( sizeof(recv_t) );
-	memset(new, 0, sizeof(recv_t));
-
-	new->id = id;
-	new->x = x;
-	new->y = y;
-	new->w = w;
-	new->h = h;
-
-	return new;
-}
-
-void getStatus(void *p, int *id, int *x, int *y, int *w, int *h)
-{
-	recv_t *recv;
-
-	recv = p;
-
-	*id = recv->id;
-	*x = recv->x;
-	*y = recv->y;
-	*w = recv->w;
-	*h = recv->h;
-}
-
-void setStatus(void *p, int x, int y, int w, int h)
-{
-	recv_t *recv;
-
-	recv = p;
-
-	recv->x = x;
-	recv->y = y;
-	recv->w = w;
-	recv->h = h;
-	recv->x = x;
-}
-
-void destroyRecv(recv_t *p)
-{
-	free(p);
-}
-
-#endif
-
-static int my_conflictSpace(int x1,int y1,int w1,int h1,int x2,int y2,int w2,int h2)
-{
-	return (x1<x2+w2 && x2<x1+w1 && y1<y2+h2 && y2<y1+h1);
-}
-
-space_t *newSpace(int w, int h, int segW, int segH,
-		  void (*getStatus)(void *p, int *id, int *x, int *y, int *w, int *h),
-		  void (*setStatus)(void *p, int x, int y, int w, int h))
-{
-	space_t *new;
-	int i, j;
-
-	new = malloc( sizeof(space_t) );
-	memset(new, 0, sizeof(space_t));
-
-	new->w = w / segW + 1;
-	new->h = h / segH + 1;
-	new->segW = segW;
-	new->segH = segH;
-	new->getStatus = getStatus;
-	new->setStatus = setStatus;
-	new->list = newList();
-
-	new->area = malloc( new->w * sizeof(list_t **) );
-
-	for( i = 0 ; i < new->w ; i++ )
-	{
-		new->area[i] = malloc( new->h * sizeof(list_t *) );
-	}
-
-	for( i = 0 ; i < new->h ; i++ )
-	{
-		for( j = 0 ; j < new->w ; j++ )
-		{
-			new->area[j][i] = newList();
-		}
-	}
-
-	return new;
-}
-
-static void getSegment(space_t *p, int x, int y, int w, int h,
-		       int *segX, int *segY, int *segW, int *segH)
-{
-	*segX = x / p->segW;
-	*segY = y / p->segH;
-	*segW = ( (x+w) / p->segW + 1 ) - *segX;
-	*segH = ( (y+h) / p->segH + 1 ) - *segY;
-}
-
-#ifdef ERROR_SUPPORT
-
-void printListID(space_t *space)
-{
-	int i;
-
-	for( i = 0 ; i < space->list->count ; i++ )
-	{
-		int id, x, y, w, h;
-
-		space->getStatus(space->list->list[i], &id, &x, &y, &w, &h);
-		printf("%d\n", id);
-	}
-
-	putchar('\n');
-}
-
-static void checkList(space_t *space)
-{
-	int id, x, y, w, h;
-	int thisId;
-	int i;
-
-	if( space->list->count == 0 )
-	{
-		printf("nothing\n");
-		return;	
-	}
-
-	space->getStatus(space->list->list[0], &thisId, &x, &y, &w, &h);
-
-	for( i = 1 ; i < space->list->count ; i++ )
-	{
-		space->getStatus(space->list->list[i], &id, &x, &y, &w, &h);
-
-		if( id <= thisId )
-		{
-			printListID(space);
-			assert( ! "error" );
-		}
-
-		thisId = id;
-	}
-}
-
-static void addToListOnTheBaseIndex(space_t *space, void *p)
-{
-	int id, point_id, inc_point_id;
-	int x, y, w, h;
-	int len;
-	int min, max;
-	int point;
-
-
-	len = space->list->count;
-
-	space->getStatus(p, &id, &x, &y, &w, &h);
-/*
-	printf("addToListOnTheBaseIndex (%d)\n", id);
-	printListID(space);
-	assert( id >= 0 );
-*/
-	if( len == 0 )
-	{
-		//printf("OK first\n");
-		addList(space->list, p);
-		return;
-	}
-
-	if( len == 1 )
-	{
-		space->getStatus(space->list->list[0], &point_id, &x, &y, &w, &h);
-		
-		if( id > point_id )
-		{
-			addList(space->list, p);
-		}
-
-		if( id < point_id )
-		{
-			insList(space->list, 0, p);
-		}
-
-		//printf("OK\n");
-
-		return;
-	}
-
-	min = 0;
-	max = len-1;
-/*
-	if( max < 0 )
-	{
-		max = 0;
-	}
-*/
-	for(;;)
-	{
-		point = min + ( max - min ) / 2;
-/*
-		space->getStatus(space->list->list[min], &id_min, &x, &y, &w, &h);
-		space->getStatus(space->list->list[max], &id_max, &x, &y, &w, &h);
-*/
-		//printf("min = %d max = %d point = %d len = %d id = %d\n", min, max, point, len, id);
-
-		if(  max < 0 )
-		{
-			//printf("OK first\n");
-			insList(space->list, 0, p);
-			//checkList(space);
-			return;
-		}
-
-		if(  point+1 >= len /*|| min >= len*/ )
-		{
-			addList(space->list, p);
-			//printf("OK height\n");
-			//checkList(space);
-			return;
-		}
-		
-		space->getStatus(space->list->list[point], &point_id, &x, &y, &w, &h);
-		space->getStatus(space->list->list[point+1], &inc_point_id, &x, &y, &w, &h);
-/*
-		if( min == max )
-		{
-			//printf("OK\n");
-			insList(space->list, min, p);
-			checkList(space);
-			return;
-		}
-*/
-		if( point_id < id && id < inc_point_id )
-		{
-			//printf("OK\n");
-			insList(space->list, point+1, p);
-			//checkList(space);
-			return;
-		}
-
-		if( id > inc_point_id )
-		{
-			min = point + 1;
-			continue;
-		}
-
-		if( id < point_id )
-		{
-			max = point - 1;
-			continue;
-		}
-	}
-}
-
-#endif
-
-void addObjectToSpace(space_t *p, void *item)
-{
-	int segX, segY, segW, segH;
-	int id, x, y, w, h;
-	int i, j;
-
-	p->getStatus(item, &id, &x, &y, &w, &h);
-	getSegment(p, x, y, w, h, &segX, &segY, &segW, &segH);
-
-	for( i = segY ; i < segY + segH ; i++ )
-	{
-		for( j = segX ; j < segX + segW ; j++ )
-		{
-			if( j < 0 || j >= p->w || i < 0 || i >= p->h )
-			{
-				continue;
-			}
-
-			addList(p->area[j][i], item);
-		}
-	}
-
-#ifdef ERROR_SUPPORT
-	addToListOnTheBaseIndex(p, item);
-#endif
-
-#ifndef ERROR_SUPPORT
-	addList(p->list, item);
-#endif
-}
-
-void getObjectFromSpace(space_t *p, int x, int y, int w, int h, list_t *list)
-{
-	int segX, segY, segW, segH;
-	int id, this_x, this_y, this_w, this_h;
-	int i, j, k;
-
-	getSegment(p, x, y, w, h, &segX, &segY, &segW, &segH);
-
-	for( i = segY ; i < segY + segH ; i++ )
-	{
-		for( j = segX ; j < segX + segW ; j++ )
-		{
-			void *this;
-
-			for( k = 0 ; k < p->area[j][i]->count ; k++ )
-			{
-				if( j < 0 || j >= p->w || i < 0 || i >= p->h )
-				{
-					continue;
-				}
-
-				this = p->area[j][i]->list[k];
-				p->getStatus(this, &id, &this_x, &this_y, &this_w, &this_h);
-
-				if( my_conflictSpace(x, y, w, h, this_x, this_y, this_w, this_h) &&
-				     searchListItem(list, this) == -1 )
-				{
-					addList(list, this);
-				}
-			}
-		}
-	}
-}
-
-int searchObjectInSpace(space_t *space, int id)
-{
-	int point_id;
-	int x, y, w, h;
-	int len;
-	int min, max;
-	int point;
-
-/*
-	printf("getObjectFromSpaceWithID %d\n", id);
-	printListID(space);
-*/	
-	len = space->list->count;
-
-	min = 0;
-	max = len-1;
-
-	for(;;)
-	{
-		point = min + ( max - min ) / 2;
-
-		//printf("min = %d max = %d point = %d len = %d id = %d\n", min, max, point, len, id);
-
-		if(  max < 0 || point >= len || max < min )
-		{
-			return -1;
-		}
-
-		space->getStatus(space->list->list[point], &point_id, &x, &y, &w, &h);
-
-		if( min == max )
-		{
-			space->getStatus(space->list->list[min], &point_id, &x, &y, &w, &h);
-		}
-
-		if( point_id == id )
-		{
-			return point;
-		}
-
-		if( id > point_id )
-		{
-			min = point + 1;
-			continue;
-		}
-
-		if( id < point_id )
-		{
-			max = point - 1;
-			continue;
-		}
-	}
-}
-
-void* getObjectFromSpaceWithID(space_t *space, int id)
-{
-	int index;
-
-	index = searchObjectInSpace(space, id);
-
-	return ( index != -1 ? space->list->list[index] : NULL );
-}
-
-int isConflictWithObjectFromSpace(space_t *p, int x, int y, int w, int h)
-{
-	int segX, segY, segW, segH;
-	int id, this_x, this_y, this_w, this_h;
-	int i, j, k;
-
-	getSegment(p, x, y, w, h, &segX, &segY, &segW, &segH);
-
-	for( i = segY ; i < segY + segH ; i++ )
-	{
-		for( j = segX ; j < segX + segW ; j++ )
-		{
-			void *this;
-
-			for( k = 0 ; k < p->area[j][i]->count ; k++ )
-			{
-				if( j < 0 || j >= p->w || i < 0 || i >= p->h )
-				{
-					continue;
-				}
-
-				this = p->area[j][i]->list[k];
-				p->getStatus(this, &id, &this_x, &this_y, &this_w, &this_h);
-
-				if( my_conflictSpace(x, y, w, h, this_x, this_y, this_w, this_h) )
-				{
-					return 1;
-				}
-			}
-		}
-	}
-
-	return 0;
-}
-
-int isConflictWithObjectFromSpaceBut(space_t *p, int x, int y, int w, int h, void *but)
-{
-	int segX, segY, segW, segH;
-	int id, this_x, this_y, this_w, this_h;
-	int i, j, k;
-
-	getSegment(p, x, y, w, h, &segX, &segY, &segW, &segH);
-
-	for( i = segY ; i < segY + segH ; i++ )
-	{
-		for( j = segX ; j < segX + segW ; j++ )
-		{
-			void *this;
-
-			for( k = 0 ; k < p->area[j][i]->count ; k++ )
-			{
-				if( j < 0 || j >= p->w || i < 0 || i >= p->h )
-				{
-					continue;
-				}
-
-				this = p->area[j][i]->list[k];
-
-				if( this == but )
-				{
-					continue;
-				}
-
-				p->getStatus(this, &id, &this_x, &this_y, &this_w, &this_h);
-
-				if( my_conflictSpace(x, y, w, h, this_x, this_y, this_w, this_h) )
-				{
-					return 1;
-				}
-			}
-		}
-	}
-
-	return 0;
-}
-
-void delObjectFromSpace(space_t *p, void *item)
-{
-	int segX, segY, segW, segH;
-	int id, x, y, w, h;
-	int index;
-	int i, j;
-
-	p->getStatus(item, &id, &x, &y, &w, &h);
-	getSegment(p, x, y, w, h, &segX, &segY, &segW, &segH);
-
-	for( i = segY ; i < segY + segH ; i++ )
-	{
-		for( j = segX ; j < segX + segW ; j++ )
-		{
-			if( j < 0 || j >= p->w || i < 0 || i >= p->h )
-			{
-				continue;
-			}
-
-			index = searchListItem(p->area[j][i], item);
-			assert( index != -1 );
-			delList(p->area[j][i], index);
-		}
-	}
-
-	index = searchObjectInSpace(p, id);
-	assert( index != -1 );
-	delList(p->list, index);
-}
-
-void delObjectFromSpaceWithObject(space_t *p, void *item, void *f)
-{
-	void (*fce)(void *param);
-
-	fce = f;
-
-	delObjectFromSpace(p, item);
-	fce(item);
-}
-
-void moveObjectInSpace(space_t *p, void *item, int move_x, int move_y)
-{
-	int old_segX, old_segY, old_segW, old_segH;
-	int new_segX, new_segY, new_segW, new_segH;
-	int id, x, y, w, h;
-
-	p->getStatus(item, &id, &x, &y, &w, &h);
-	getSegment(p, x, y, w, h, &old_segX, &old_segY, &old_segW, &old_segH);
-	getSegment(p, move_x, move_y, w, h, &new_segX, &new_segY, &new_segW, &new_segH);
-/*
-	printf("%d %d %d %d  -> %d %d %d %d \n",
-		old_segX, old_segY, old_segW, old_segH,
-		new_segX, new_segY, new_segW, new_segH);
-*/
-	if( old_segX != new_segX || old_segY != new_segY ||
-	    old_segW != new_segW || old_segH != new_segH )
-	{
-		delObjectFromSpace(p, item);
-		p->setStatus(item, move_x, move_y, w, h);
-		addObjectToSpace(p, item);
-		return;
-	}
-
-	p->setStatus(item, move_x, move_y, w, h);
-}
-
-void printSpace(space_t *p)
-{
-	int i, j;
-
-	printf("print space : \n");
-
-	for( i = 0 ; i < p->h ; i++ )
-	{
-		for( j = 0 ; j < p->w ; j++ )
-		{
-			printf("%3d ", p->area[j][i]->count);
-		}
-
-		putchar('\n');
-	}
-}
-
-void destroySpace(space_t *p)
-{
-	int j, i;
-
-	destroyList(p->list);
-
-	for( i = 0 ; i < p->h ; i++ )
-	{
-		for( j = 0 ; j < p->w ; j++ )
-		{
-			destroyList(p->area[j][i]);
-		}
-	}
-
-	for( i = 0 ; i < p->w ; i++ )
-	{
-		free(p->area[i]);
-	}
-
-	free(p->area);
-	free(p);
-}
-
-void destroySpaceWithObject(space_t *p, void *f)
-{
-	void (*fce)(void *param);
-	int i;
-
-	fce = f;
-
-	for( i = 0 ; i < p->list->count ; i++ )
-		fce(p->list->list[i]);
-
-	destroySpace(p);
-}
-
-#ifdef DEBUG_SPACE
-
-void test_space()
-{/*
-	space_t *space;
-	recv_t *recv;
-
-	space = newSpace(5000, 2500, 320, 240, getStatus, setStatus);
-
-	addObjectToSpace(space, newRecv(5, 0, 0, 1, 1) );
-	addObjectToSpace(space, newRecv(7, 0, 0, 1, 1) );
-	addObjectToSpace(space, newRecv(8, 0, 0, 1, 1) );
-	addObjectToSpace(space, newRecv(9, 0, 0, 1, 1) );
-	addObjectToSpace(space, newRecv(6, 0, 0, 1, 1) );
-*/
-/*
-	recv = getObjectFromSpaceWithID(space, 6);
-	if( recv != NULL )printf("id = %d\n", recv->id);
-*/
-//	printListID(space);
-}
-
-#endif
-
diff --git a/src/modules/space.h b/src/modules/space.h
deleted file mode 100644
index 35d55a4..0000000
--- a/src/modules/space.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#ifndef SPACE_H
-
-#define SPACE_H
-
-#include "base/main.h"
-#include "modules/list.h"
-
-typedef struct space_struct
-{
-	int w;
-	int h;
-	int segW;
-	int segH;
-	list_t ***area;
-	list_t *list;
-	void (*getStatus)(void *p, int *id, int *x, int *y, int *w, int *h);
-	void (*setStatus)(void *p, int x, int y, int w, int h);
-} space_t;
-
-extern space_t *newSpace(int w, int h, int segW, int segH,
-		  void (*getStatus)(void *p, int *id, int *x, int *y, int *w, int *h),
-		  void (*setStatus)(void *p, int x, int y, int w, int h));
-
-extern void addObjectToSpace(space_t *p, void *item);
-extern void getObjectFromSpace(space_t *p, int x, int y, int w, int h, list_t *list);
-extern void* getObjectFromSpaceWithID(space_t *p, int id);
-extern int isConflictWithObjectFromSpace(space_t *p, int x, int y, int w, int h);
-extern int isConflictWithObjectFromSpaceBut(space_t *p, int x, int y, int w, int h, void *but);
-extern void delObjectFromSpace(space_t *p, void *item);
-extern void delObjectFromSpaceWithObject(space_t *p, void *item, void *f);
-extern void moveObjectInSpace(space_t *p, void *item, int move_x, int move_y);
-extern void printSpace(space_t *p);
-extern void destroySpace(space_t *p);
-extern void destroySpaceWithObject(space_t *p, void *f);
-
-#endif
-