- upravy v kode

- prepis stirel pre space_t *
- v kode su dva vyhladavacie algortmy, implicitne sa pouziva ten ktory funguje :)
  ten co nefunguje je zamakrovany makrom SUPPORT_ERROR a este ho musim doladit



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

1 files changed, 5 insertions, 13 deletions

diff --git a/src/proto.c b/src/proto.c
index e14db9f..72e8f16 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -753,10 +753,9 @@ void proto_recv_shot_client(char *msg)
 
 	proto_send_check_client(check_id);
 
-	if( ( shot = getShotID(getCurrentArena()->listShot, shot_id) )  != NULL )
+	if( ( shot = getObjectFromSpaceWithID(getCurrentArena()->spaceShot, shot_id) )  != NULL )
 	{
-		delListItem(getCurrentArena()->listShot,
-			searchListItem(getCurrentArena()->listShot, shot), destroyShot);
+		delObjectFromSpaceWithObject(getCurrentArena()->spaceShot, shot, destroyShot);
 
 		//return;
 	}
@@ -772,7 +771,7 @@ void proto_recv_shot_client(char *msg)
 		transformOnlyLasser(shot);
 	}
 
-	addList(getCurrentArena()->listShot, shot);
+	addObjectToSpace(getCurrentArena()->spaceShot, shot);
 }
 
 #endif
@@ -807,18 +806,11 @@ void proto_recv_delshot_client(char *msg)
 
 	proto_send_check_client(check_id);
 
-	shot = getShotID(getCurrentArena()->listShot, id);
+	shot = getObjectFromSpaceWithID(getCurrentArena()->spaceShot, id);
 
 	if( shot != NULL )
 	{
-		int index;
-
-		index = searchListItem(getCurrentArena()->listShot, shot);
-
-		if( index >= 0 )
-		{
-			delListItem(getCurrentArena()->listShot, index, destroyShot);
-		}
+		delObjectFromSpaceWithObject(getCurrentArena()->spaceShot, shot, destroyShot);
 	}
 }