7 files changed, 26 insertions, 26 deletions
diff --git a/src/base/arena.c b/src/base/arena.c
index 4f9f51f..a692830 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -222,24 +222,24 @@ static void drawBackground(arena_t * arena, int screen_x, int screen_y)
 
 static void action_tux_draw(space_t * space, tux_t * tux, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	tux_draw(tux);
 }
 
 static void action_item_draw(space_t * space, item_t * item, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	item_draw(item);
 }
 
 static void action_shot_draw(space_t * space, shot_t * shot, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	shot_draw(shot);
 }
@@ -381,8 +381,8 @@ void arena_draw(arena_t * arena)
 
 static void action_tux(space_t * space, tux_t * tux, void *p)
 {
-	UNUSET(space);
-	UNUSET(p);
+	UNUSED(space);
+	UNUSED(p);
 
 	tux_event(tux);
 }
diff --git a/src/base/item.c b/src/base/item.c
index 8de0e37..f7539ad 100644
--- a/src/base/item.c
+++ b/src/base/item.c
@@ -280,7 +280,7 @@ static void action_itemevent(space_t * space, item_t * item, void *p)
 {
 	my_time_t currentTime;
 
-	UNUSET(p);
+	UNUSED(p);
 
 	currentTime = timer_get_current_time();
 	item->count++;
diff --git a/src/base/main.h b/src/base/main.h
index f935972..8ea3afa 100644
--- a/src/base/main.h
+++ b/src/base/main.h
@@ -28,7 +28,7 @@
 #define DEBUG_MSG(msg,arg...) 
 #endif
 
-#define UNUSET(var)	if( 0 && var ){}
+#define UNUSED(var)	if( 0 && var ){}
 
 
 extern char *getParam(char *s);
diff --git a/src/base/proto.c b/src/base/proto.c
index b1a6799..f4a1972 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -100,7 +100,7 @@ void proto_send_hello_client(char *name)
 
 static void action_sendItem(space_t * space, item_t * item, client_t * client)
 {
-	UNUSET(space);
+	UNUSED(space);
 
 	proto_send_additem_server(PROTO_SEND_ONE, client, item);
 }
@@ -244,7 +244,7 @@ void proto_send_status_server(int type, client_t * client)
 
 void proto_recv_status_server(client_t * client, char *msg)
 {
-	UNUSET(msg);
+	UNUSED(msg);
 
 	proto_send_status_server(PROTO_SEND_ONE, client);
 }
@@ -882,7 +882,7 @@ void proto_send_module_client(char *msg)
 
 void proto_recv_module_server(client_t * client, char *msg)
 {
-	UNUSET(client);
+	UNUSED(client);
 
 	module_recv_msg(msg + 7);
 }
@@ -923,8 +923,8 @@ void proto_send_ping_client()
 
 void proto_recv_ping_server(client_t * client, char *msg)
 {
-	UNUSET(client);
-	UNUSET(msg);
+	UNUSED(client);
+	UNUSED(msg);
 }
 
 void proto_send_ping_server(int type, client_t * client)
@@ -939,7 +939,7 @@ void proto_send_ping_server(int type, client_t * client)
 
 void proto_recv_ping_client(char *msg)
 {
-	UNUSET(msg);
+	UNUSED(msg);
 }
 
 #endif
diff --git a/src/base/server.c b/src/base/server.c
index 6eeab70..472d71c 100644
--- a/src/base/server.c
+++ b/src/base/server.c
@@ -162,7 +162,7 @@ static void delZombieCLient(void *p_nothink)
 	my_time_t currentTime;
 	int i;
 
-	UNUSET(p_nothink);
+	UNUSED(p_nothink);
 
 	currentTime = timer_get_current_time();
 
@@ -192,7 +192,7 @@ static void eventPeriodicSyncClient(void *p_nothink)
 	tux_t *thisTux;
 	int i;
 
-	UNUSET(p_nothink);
+	UNUSED(p_nothink);
 
 #ifndef PUBLIC_SERVER
 	proto_send_newtux_server(PROTO_SEND_ALL_SEES_TUX, NULL, world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT));
@@ -213,7 +213,7 @@ static void eventPeriodicSyncClient(void *p_nothink)
 
 static void eventSendPingClients(void *p_nothink)
 {
-	UNUSET(p_nothink);
+	UNUSED(p_nothink);
 	
 	proto_send_ping_server(PROTO_SEND_ALL, NULL);
 }
diff --git a/src/base/shot.c b/src/base/shot.c
index b19877a..564f458 100644
--- a/src/base/shot.c
+++ b/src/base/shot.c
@@ -262,7 +262,7 @@ static void action_moveShot(space_t * space, shot_t * shot, void *p)
 	int new_x, new_y;
 	arena_t *arena;
 
-	UNUSET(p);
+	UNUSED(p);
 
 	arena = arena_get_current();
 
@@ -297,7 +297,7 @@ static int isValueInList(list_t * list, int x)
 
 static void action_check(space_t * space, shot_t * shot, client_t * client)
 {
-	UNUSET(space);
+	UNUSED(space);
 
 	if (isValueInList(client->listSeesShot, shot->id) == 0) {
 	    list_add(client->listSeesShot, newInt(shot->id));
diff --git a/src/base/tux.c b/src/base/tux.c
index d8fff10..baf185a 100644
--- a/src/base/tux.c
+++ b/src/base/tux.c
@@ -409,7 +409,7 @@ static void action_tux(space_t * space, tux_t * tux, shot_t * shot)
 {
 	arena_t *arena;
 
-	UNUSET(space);
+	UNUSED(space);
 	
 	arena = arena_get_current();
 
@@ -445,7 +445,7 @@ static void action_tux(space_t * space, tux_t * tux, shot_t * shot)
 
 static void action_shot(space_t * space, shot_t * shot, space_t * spaceTux)
 {
-	UNUSET(space);
+	UNUSED(space);
 
 	space_action_from_location(spaceTux, action_tux, shot, shot->x, shot->y, shot->w, shot->h);
 }
@@ -725,8 +725,8 @@ void tux_set_status(void *p, int x, int y, int w, int h)
 {
 	tux_t *tux;
 
-	UNUSET(w);
-	UNUSET(h);
+	UNUSED(w);
+	UNUSED(h);
 
 	tux = p;
 	tux_set_proportion(tux, x, y);
@@ -734,7 +734,7 @@ void tux_set_status(void *p, int x, int y, int w, int h)
 
 static void action_checkMine(space_t * space, item_t * item, tux_t * tux)
 {
-	UNUSET(space);
+	UNUSED(space);
 
 	if (item->type == ITEM_MINE && item->author_id == tux->id) {
 		item->author_id = ID_UNKNOWN;