- upravene indexovanie v index.c a space.c ktore indexovanie pouziva

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

12 files changed, 233 insertions, 221 deletions

diff --git a/src/base/arena.c b/src/base/arena.c
index 437f7a6..f7e917d 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -223,6 +223,11 @@ void drawArena(arena_t *arena)
 
 #endif
 
+static void action_tux(space_t *space, tux_t *tux, void *p)
+{
+	eventTux(tux);
+}
+
 void eventArena(arena_t *arena)
 {
 	int i;
@@ -240,7 +245,7 @@ void eventArena(arena_t *arena)
 
 	eventListItem(arena->spaceItem);
 	
-	eventListTux(arena->spaceTux->list);
+	actionSpace(arena->spaceTux, action_tux, NULL);
 
 	eventTimer(arena->listTimer);
 }
diff --git a/src/base/fake_audio.c b/src/base/fake_audio.c
deleted file mode 100644
index 2149c86..0000000
--- a/src/base/fake_audio.c
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#include "base/main.h"
-#include "base/fake_audio.h"
-
-bool_t isAudioInicialized()
-{
-	return TRUE;
-}
-
-void initAudio()
-{
-}
-
-void quitAudio()
-{
-}
-
-bool_t isSoundInicialized()
-{
-	return TRUE;
-}
-
-void initSound()
-{
-}
-
-void addSound(char *file, char *name, int group)
-{
-}
-
-void playSound(char *name, int group)
-{
-}
-
-void setSoundActive(bool_t n)
-{
-}
-
-bool_t isSoundActive()
-{
-	return FALSE;
-}
-
-void quitSound()
-{
-}
-
-bool_t isMusicInicialized()
-{
-	return FALSE;
-}
-
-void initMusic()
-{
-}
-
-void addMusic(char *file, char *name, int group)
-{
-}
-
-void stopMusic()
-{
-}
-
-void playMusic(char *name, int group)
-{
-}
-
-void setMusicActive(bool_t n)
-{
-}
-
-bool_t isMusicActive()
-{
-	return FALSE;
-}
-
-char* getCurrentMusic()
-{
-	return "no_sound";
-}
-
-void delAllMusicInGroup(int group)
-{
-}
-
-void quitMusic()
-{
-}
diff --git a/src/base/idManager.c b/src/base/idManager.c
index b4217ae..63667bf 100644
--- a/src/base/idManager.c
+++ b/src/base/idManager.c
@@ -74,10 +74,11 @@ static int findNewID()
 	}
 
 	do{
-		ret  = random() % MAX_ID;
-
+		ret  = ( random() % (listID->count + 8 ) ) + 1;
 	}while( isRegisterID(ret) != -1 );
 
+	//printf("new ID %d\n", ret);
+
 	return ret;
 }
 
diff --git a/src/base/index.c b/src/base/index.c
index b7ee929..77b0eac 100644
--- a/src/base/index.c
+++ b/src/base/index.c
@@ -8,81 +8,96 @@
 #include "list.h"
 #include "index.h"
 
-static int* index_newInt(int x)
+#define DEBUG_INDEX
+
+static index_item_t* newIndexItem(int key, void *data)
 {
-	int *new;
-	new = malloc( sizeof(int) );
-	*new = x;
+	index_item_t *new;
+
+	new = malloc( sizeof(index_item_t) );
+	new->key = key;
+	new->data = data;
+
 	return new;
 }
 
-#ifdef CHECK_INDEX
-static void printIndex(list_t *list)
+#ifdef DEBUG_INDEX
+static void printIndexItem(index_item_t *p)
+{
+	printf("key = %d data = %p\n", p->key, p->data);
+}
+
+static void printListIndexItem(list_t *list)
 {
 	int i;
 
-	printf("printIndex\n");
+	printf("list :\n");
+	printf("------------------\n");
 
 	for( i = 0 ; i < list->count ; i++ )
 	{
-		int thisIndex;
+		index_item_t *this;
 
-		thisIndex = *(int *)list->list[i];
-		printf("%d\n", thisIndex);
+		this = (index_item_t *)list->list[i];
+		printIndexItem(this);
 	}
 }
-#endif
 
-#ifdef CHECK_INDEX
-static void checkIndex(list_t *list)
+static void checkList(list_t *list)
 {
-	int index, thisIndex;
 	int i;
+	int prev;
+	int this;
 
-	//printf("check index\n");
+	//return;
 
 	if( list->count == 0 )
 	{
 		printf("nothing\n");
-		return;
+		return;	
 	}
 
-	thisIndex = *(int *)list->list[0];
-
+	prev = ( (index_item_t *) list->list[0] )->key;
 
 	for( i = 1 ; i < list->count ; i++ )
 	{
-		index = *(int *)list->list[i];
-		//printf("check %d\n", index);
+		this = ( (index_item_t *) list->list[i] )->key;
 
-		if( index <= thisIndex )
+		if( prev >= this )
 		{
-			printIndex(list);
+			printListIndexItem(list);
 			assert( ! "error" );
 		}
 
-		thisIndex = index;
+		prev = this;
 	}
 }
 #endif
 
+static void destroyIndexItem(index_item_t *p)
+{
+	free(p);
+}
+
 list_t* newIndex()
 {
 	return newList();
 }
 
-int addToIndex(list_t *list, int index)
+void addToIndex(list_t *list, int key, void *data)
 {
-	int min, max;
-	int point;
-	int point_index;
+#ifdef DEBUG_INDEX
+	int count = 0;
+#endif
+
+	index_item_t *item;
+	index_item_t *this;
+	int min, max, point;
 	int len;
 
+	item = newIndexItem(key, data);
 	len = list->count;
 
-	//printf("addToIndex (%p, %d)\n", list, index);
-	//printIndex(list);
-
 	min = 0;
 	max = len-1;
 
@@ -90,42 +105,58 @@ int addToIndex(list_t *list, int index)
 	{
 		point = min + ( max - min ) / 2;
 
-		if(  max < 0 )
+#ifdef DEBUG_INDEX
+		if( ++count == len*5 )
 		{
-			insList(list, 0, index_newInt(index));
-#ifdef CHECK_INDEX
-			checkIndex(list);
+			printf("CICLIC ERROR\n");
+			printIndexItem(item);
+			printf("-------------------\n");
+			printListIndexItem(list);
+			assert( 0 );
+		}
 #endif
-			return 0;
+
+		if( max < 0 )
+		{
+			insList(list, 0, item);
+#ifdef DEBUG_INDEX
+			checkList(list);
+#endif
+			return;
 		}
 
-		if(  min >= len )
+		if( min >= len )
 		{
-			addList(list, index_newInt(index) );
-#ifdef CHECK_INDEX
-			checkIndex(list);
+			addList(list, item);
+#ifdef DEBUG_INDEX
+			checkList(list);
 #endif
-			return len;
+			return;
 		}
 		
-		point_index = *(int *)list->list[point];
+		this = (index_item_t *)list->list[point];
 
+/*
+		printf("min = %d max = %d point = %d len = %d offset = %d\n",
+			min, max, point, len, offset);
+
+*/
 		if( min > max )
 		{
-			insList(list, point,  index_newInt(index) );
-#ifdef CHECK_INDEX
-			checkIndex(list);
+			insList(list, point, item);
+#ifdef DEBUG_INDEX
+			checkList(list);
 #endif
-			return point;
+			return;
 		}
 
-		if( index > point_index )
+		if( item->key > this->key )
 		{
 			min = point + 1;
 			continue;
 		}
 
-		if( index < point_index )
+		if( item->key < this->key )
 		{
 			max = point - 1;
 			continue;
@@ -133,17 +164,17 @@ int addToIndex(list_t *list, int index)
 	}
 }
 
-int getFormIndex(list_t *list, int index)
+static int getOffsetFromIndex(list_t *list, int key)
 {
-	int point_index;
-	int len;
-	int min, max;
-	int point;
+	index_item_t *this;
+	int min, max, point, len;
 
-	//printf("getFormIndex %d\n", index);
-	//printIndex(list);
+	len = list->count;
 
-	len =list->count;
+	if( len == 0 )
+	{
+		return -1;
+	}
 
 	min = 0;
 	max = len-1;
@@ -156,21 +187,24 @@ int getFormIndex(list_t *list, int index)
 		{
 			return -1;
 		}
-
-		point_index = *(int *)list->list[point];
-
-		if( point_index == index )
+		
+		this = (index_item_t *)list->list[point];
+/*
+		printf("min = %d max = %d point = %d len = %d offset = %d\n",
+			min, max, point, len, offset);
+*/
+		if( key == this->key )
 		{
 			return point;
 		}
 
-		if( index > point_index )
+		if( key > this->key )
 		{
 			min = point + 1;
 			continue;
 		}
 
-		if( index < point_index )
+		if( key < this->key )
 		{
 			max = point - 1;
 			continue;
@@ -178,19 +212,78 @@ int getFormIndex(list_t *list, int index)
 	}
 }
 
-void delFromIndex(list_t *list, int index)
+void* getFromIndex(list_t *list, int key)
 {
 	int offset;
 
-	offset = getFormIndex(list, index);
-	assert( offset != -1 );
+	offset = getOffsetFromIndex(list, key);
+
+	if( offset != -1 )
+	{
+		index_item_t *this;
+
+		this = list->list[offset];
+		return this->data;
+	}
 
-	delListItem(list, offset, free);
+	return NULL;
+}
+
+void delFromIndex(list_t *list, int key)
+{
+	int offset;
+
+	offset = getOffsetFromIndex(list, key);
+
+	if( offset != -1 )
+	{
+		delListItem(list, offset, destroyIndexItem);
+	}
+}
+
+void delFromIndexWithObject(list_t *list, int key, void *f)
+{
+	int offset;
+
+	offset = getOffsetFromIndex(list, key);
+
+	if( offset != -1 )
+	{
+		index_item_t *this;
+		void (*fce)(void *p);
+
+		this = list->list[offset];
+
+		fce = f;
+		fce(this);
+
+		delListItem(list, offset, destroyIndexItem);
+	}
+}
+
+void actionIndexWithObject(list_t *list, void *f)
+{
+	int i;
+
+	for( i = 0 ; i < list->count ; i++)
+	{
+		index_item_t *this;
+		void (*fce)(void *p);
+
+		this = list->list[i];
+
+		fce = f;
+		fce(this);
+	}
 }
 
 void destroyIndex(list_t *list)
 {
-	assert( list != NULL);
+	destroyListItem(list, destroyIndexItem);
+}
 
-	destroyListItem(list, free);
+void destroyIndexWithObject(list_t *list, void *f)
+{
+	actionIndexWithObject(list, f);
+	destroyListItem(list, destroyIndexItem);
 }
diff --git a/src/base/index.h b/src/base/index.h
index 3799aa3..0dd544c 100644
--- a/src/base/index.h
+++ b/src/base/index.h
@@ -6,10 +6,19 @@
 #include "main.h"
 #include "list.h"
 
+typedef struct index_item_struct
+{
+	int key;
+	void *data;
+} index_item_t;
+
 extern list_t* newIndex();
-extern int addToIndex(list_t *list, int index);
-extern int getFormIndex(list_t *list, int index);
-extern void delFromIndex(list_t *list, int index);
+extern void addToIndex(list_t *list, int key, void *data);
+extern void* getFromIndex(list_t *list, int key);
+extern void delFromIndex(list_t *list, int key);
+extern void delFromIndexWithObject(list_t *list, int key, void *f);
+extern void actionIndexWithObject(list_t *list, void *f);
 extern void destroyIndex(list_t *list);
+extern void destroyIndexWithObject(list_t *list, void *f);
 
 #endif
diff --git a/src/base/item.c b/src/base/item.c
index 0eb70c3..bd61728 100644
--- a/src/base/item.c
+++ b/src/base/item.c
@@ -171,7 +171,7 @@ void addNewItem(space_t *spaceItem, int author_id)
 	int type;
 
 #ifdef PUBLIC_SERVER	
-	if( spaceItem->list->count >= atoi( getSetting("MAX_ITEM", "--max-item", "100") ) )
+	if( getSpaceCount(spaceItem) >= atoi( getSetting("MAX_ITEM", "--max-item", "100") ) )
 	{
 		return;
 	}
diff --git a/src/base/proto.c b/src/base/proto.c
index 47acd81..8386a52 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -90,12 +90,16 @@ void proto_send_hello_client(char *name)
 
 #endif
 
+static void action_sendItem(space_t *space, item_t *item, client_t *client)
+{
+	proto_send_additem_server(PROTO_SEND_ONE, client, item);
+}
+
 static void sendInfoCreateClient(client_t *client)
 {
 	list_t *listClient;
 	client_t *thisClient;
 	tux_t *thisTux;
-	item_t *thisItem;
 	int i;
 
 	assert( client != NULL );
@@ -120,11 +124,14 @@ static void sendInfoCreateClient(client_t *client)
 		}
 	}
 
-	for( i = 0 ; i < getCurrentArena()->spaceItem->list->count; i++)
+	actionSpace(getCurrentArena()->spaceItem, action_sendItem, client);
+/*
+	for( i = 0 ; i < getCurrentArena()->spaceItem->listIndex->count; i++)
 	{
 		thisItem = (item_t *) getCurrentArena()->spaceItem->list->list[i];
 		proto_send_additem_server(PROTO_SEND_ONE, client, thisItem);
 	}
+*/
 }
 
 void proto_recv_hello_server(client_t *client, char *msg)
@@ -203,7 +210,7 @@ void proto_send_status_server(int type, client_t *client)
 #endif
 
 	version = TUXANCI_VERSION;
-	clients = getCurrentArena()->spaceTux->list->count;
+	clients = getCurrentArena()->spaceTux->listIndex->count;
 	maxclients = getServerMaxClients();
 	uptime = (unsigned int)getUpdateServer();
 	arena = getArenaNetName( getChoiceArenaId() );
diff --git a/src/base/space.c b/src/base/space.c
index 42fce71..382c4a4 100644
--- a/src/base/space.c
+++ b/src/base/space.c
@@ -48,7 +48,6 @@ space_t *newSpace(int w, int h, int segW, int segH,
 	new->segH = segH;
 	new->getStatus = getStatus;
 	new->setStatus = setStatus;
-	new->list = newList();
 	new->listIndex = newIndex();
 
 	new->zone = malloc( new->w * sizeof(list_t **) );
@@ -78,12 +77,24 @@ static void getSegment(space_t *p, int x, int y, int w, int h,
 	*segH = ( (y+h) / p->segH + 1 ) - *segY;
 }
 
+int getSpaceCount(space_t *p)
+{
+	return p->listIndex->count;
+}
+
+void* getItemFromSpace(space_t *p, int offset)
+{
+	index_item_t *this;
+
+	this = (index_item_t *)p->listIndex->list[offset];
+	return this->data;
+}
+
 void addObjectToSpace(space_t *p, void *item)
 {
 	int segX, segY, segW, segH;
 	int id, x, y, w, h;
 	int i, j;
-	int offset;
 
 	p->getStatus(item, &id, &x, &y, &w, &h);
 	getSegment(p, x, y, w, h, &segX, &segY, &segW, &segH);
@@ -101,8 +112,7 @@ void addObjectToSpace(space_t *p, void *item)
 		}
 	}
 
-	offset = addToIndex(p->listIndex, id);
-	insList(p->list, offset, item);
+	addToIndex(p->listIndex, id, item);
 }
 
 void getObjectFromSpace(space_t *p, int x, int y, int w, int h, list_t *list)
@@ -141,11 +151,7 @@ void getObjectFromSpace(space_t *p, int x, int y, int w, int h, list_t *list)
 
 void* getObjectFromSpaceWithID(space_t *space, int id)
 {
-	int index;
-
-	index = getFormIndex(space->listIndex, id);
-
-	return ( index != -1 ? space->list->list[index] : NULL );
+	return getFromIndex(space->listIndex, id);
 }
 
 int isConflictWithObjectFromSpace(space_t *p, int x, int y, int w, int h)
@@ -249,11 +255,6 @@ void delObjectFromSpace(space_t *p, void *item)
 		}
 	}
 
-	index = getFormIndex(p->listIndex, id);
-	assert( index != -1 );
-
-	delList(p->list, index);
-
 	delFromIndex(p->listIndex, id);
 }
 
@@ -317,13 +318,13 @@ void actionSpace(space_t *space, void *f, void *p)
 	int i;
 
 	fce = f;
-	len = space->list->count;
+	len = space->listIndex->count;
 
 	for( i = 0 ; i < len ; i++ )
 	{
-		fce(space, space->list->list[i], p);
+		fce(space, getItemFromSpace(space, i), p);
 
-		if( space->list->count == len-1 )
+		if( space->listIndex->count == len-1 )
 		{
 			len--;
 			i--;
@@ -358,7 +359,6 @@ void destroySpace(space_t *p)
 {
 	int j, i;
 
-	destroyList(p->list);
 	destroyIndex(p->listIndex);
 
 	for( i = 0 ; i < p->h ; i++ )
@@ -385,33 +385,11 @@ void destroySpaceWithObject(space_t *p, void *f)
 
 	fce = f;
 
-	for( i = 0 ; i < p->list->count ; i++ )
-		fce(p->list->list[i]);
+	for( i = 0 ; i < p->listIndex->count ; i++ )
+	{
+		fce( getItemFromSpace(p, 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/base/space.h b/src/base/space.h
index 868c5a9..cf2d7c8 100644
--- a/src/base/space.h
+++ b/src/base/space.h
@@ -21,7 +21,6 @@ typedef struct space_struct
 
 	zone_t ***zone;
 
-	list_t *list;
 	list_t *listIndex;
 
 	void (*getStatus)(void *p, int *id, int *x, int *y, int *w, int *h);
@@ -32,6 +31,8 @@ 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 int getSpaceCount(space_t *p);
+extern void* getItemFromSpace(space_t *p, int offset);
 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);
diff --git a/src/base/tux.c b/src/base/tux.c
index 75b6c03..f35a530 100644
--- a/src/base/tux.c
+++ b/src/base/tux.c
@@ -675,26 +675,32 @@ static void eventBonus(tux_t *tux)
 	}
 }
 
+void eventTux(tux_t *tux)
+{
+	arena_t *arena;
+
+	arena = getCurrentArena();
+
+#ifndef PUBLIC_SERVER
+	tuxControl(tux);
+#endif
+	pickUpGun(tux);
+	eventBonus(tux);
+	eventGiveTuxListItem(tux, arena->spaceItem);
+}
+
 void eventListTux(list_t *listTux)
 {
 	tux_t *thisTux;
-	arena_t *arena;
 	int i;
 
 	assert( listTux != NULL );
-	arena = getCurrentArena();
 
 	for( i = 0 ; i < listTux->count ; i++ )
 	{
 		thisTux  = (tux_t *)listTux->list[i];
 		assert( thisTux != NULL );
-
-#ifndef PUBLIC_SERVER
-		tuxControl(thisTux);
-#endif
-		pickUpGun(thisTux);
-		eventBonus(thisTux);
-		eventGiveTuxListItem(thisTux, arena->spaceItem);
+		eventTux(thisTux);
 	}
 }
 
diff --git a/src/base/tux.h b/src/base/tux.h
index 2d39195..17cc0e9 100644
--- a/src/base/tux.h
+++ b/src/base/tux.h
@@ -124,6 +124,7 @@ extern void eventConflictTuxWithShot(arena_t *arena);
 extern void eventConflictTuxWithTeleport(list_t *listTux, list_t *listTeleport);
 extern void tuxTeleport(tux_t *tux);
 extern void actionTux(tux_t *tux, int action);
+extern void eventTux(tux_t *tux);
 extern void eventListTux(list_t *listTux);
 extern tux_t* getTuxID(list_t *listTux, int id);
 extern void getTuxProportion(tux_t *tux, int *x,int *y, int *w, int *h);
diff --git a/src/base/udp_server.c b/src/base/udp_server.c
index 1c0c38d..ce54802 100644
--- a/src/base/udp_server.c
+++ b/src/base/udp_server.c
@@ -184,7 +184,7 @@ static void eventClientUdpSelect(sock_udp_t *sock_server)
 
 	if( client == NULL )
 	{
-		if( getCurrentArena()->spaceTux->list->count+1 > getServerMaxClients() )
+		if( getSpaceCount(getCurrentArena()->spaceTux)+1 > getServerMaxClients() )
 		{
 			destroySockUdp(sock_client);
 			return;