1 files changed, 268 insertions, 297 deletions

diff --git a/src/base/arena.c b/src/base/arena.c
index f1310d1..4391af9 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -13,439 +13,410 @@
 #include "modules.h"
 
 #ifndef PUBLIC_SERVER
-#include "hotKey.h"
-#include "screen_world.h"
-#include "screen_setting.h"
-#include "layer.h"
+#    include "hotKey.h"
+#    include "screen_world.h"
+#    include "screen_setting.h"
+#    include "layer.h"
 #endif
 
 static arena_t *currentArena;
 static int splitType;
 
 #ifndef PUBLIC_SERVER
-static int
-isBigArena(arena_t * arena)
+static int isBigArena(arena_t * arena)
 {
-    if (arena->w > WINDOW_SIZE_X || arena->h > WINDOW_SIZE_Y) {
-        return 1;
-    }
-    else {
-        return 0;
-    }
+	if (arena->w > WINDOW_SIZE_X || arena->h > WINDOW_SIZE_Y) {
+		return 1;
+	} else {
+		return 0;
+	}
 }
 
-static int
-isTuxNear(tux_t * tux1, tux_t * tux2)
+static int isTuxNear(tux_t * tux1, tux_t * tux2)
 {
-    if (abs(tux1->x - tux2->x) < WINDOW_SIZE_X &&
-        abs(tux1->y - tux2->y) < WINDOW_SIZE_Y) {
-        return 1;
-    }
+	if (abs(tux1->x - tux2->x) < WINDOW_SIZE_X &&
+		abs(tux1->y - tux2->y) < WINDOW_SIZE_Y) {
+		return 1;
+	}
 
-    return 0;
+	return 0;
 }
 #endif
 
-void
-setCurrentArena(arena_t * p)
+void setCurrentArena(arena_t * p)
 {
-    currentArena = p;
+	currentArena = p;
 }
 
-arena_t *
-getCurrentArena()
+arena_t *getCurrentArena()
 {
-    return currentArena;
+	return currentArena;
 }
 
-void
-hotkey_splitArena()
+void hotkey_splitArena()
 {
-    if (splitType == SCREEN_SPLIT_VERTICAL) {
-        splitType = SCREEN_SPLIT_HORIZONTAL;
-    }
-    else {
-        splitType = SCREEN_SPLIT_VERTICAL;
-    }
+	if (splitType == SCREEN_SPLIT_VERTICAL) {
+		splitType = SCREEN_SPLIT_HORIZONTAL;
+	} else {
+		splitType = SCREEN_SPLIT_VERTICAL;
+	}
 }
 
 #ifndef PUBLIC_SERVER
-void
-initArena()
+void initArena()
 {
-    splitType = SCREEN_SPLIT_VERTICAL;
+	splitType = SCREEN_SPLIT_VERTICAL;
 
-    if (getParam("--split-vertical")) {
-        splitType = SCREEN_SPLIT_VERTICAL;
-        printf("SCREEN_SPLIT_VERTICAL\n");
-    }
+	if (getParam("--split-vertical")) {
+		splitType = SCREEN_SPLIT_VERTICAL;
+		printf("SCREEN_SPLIT_VERTICAL\n");
+	}
 
-    if (getParam("--split-horizontal")) {
-        splitType = SCREEN_SPLIT_HORIZONTAL;
-        printf("SCREEN_SPLIT_HORIZONTAL\n");
-    }
+	if (getParam("--split-horizontal")) {
+		splitType = SCREEN_SPLIT_HORIZONTAL;
+		printf("SCREEN_SPLIT_HORIZONTAL\n");
+	}
 
-    registerHotKey(SDLK_F3, hotkey_splitArena);
+	registerHotKey(SDLK_F3, hotkey_splitArena);
 }
 
-void
-quitArena()
+void quitArena()
 {
-    unregisterHotKey(SDLK_F3);
+	unregisterHotKey(SDLK_F3);
 }
 #endif
 
-arena_t *
-newArena(int w, int h)
+arena_t *newArena(int w, int h)
 {
-    arena_t *new;
-    int zone_w, zone_h;
+	arena_t *new;
+	int zone_w, zone_h;
 
-    new = malloc(sizeof(arena_t));
+	new = malloc(sizeof(arena_t));
 
 #ifndef PUBLIC_SERVER
-    new->background = NULL;
-    strcpy(new->music, "");
+	new->background = NULL;
+	strcpy(new->music, "");
 #endif
 
-    new->w = w;
-    new->h = h;
+	new->w = w;
+	new->h = h;
 
-    new->listTimer = newList();
+	new->listTimer = newList();
 
-    if (w > 800 || h > 600) {
-        zone_w = 320;
-        zone_h = 240;
-    }
-    else {
-        zone_w = 80;
-        zone_h = 60;
-    }
+	if (w > 800 || h > 600) {
+		zone_w = 320;
+		zone_h = 240;
+	} else {
+		zone_w = 80;
+		zone_h = 60;
+	}
 
-    new->spaceTux =
-        newSpace(w, h, zone_w, zone_h, getStatusTux, setStatusTux);
-    new->spaceItem =
-        newSpace(w, h, zone_w, zone_h, getStatusItem, setStatusItem);
-    new->spaceShot =
-        newSpace(w, h, zone_w, zone_h, getStatusShot, setStatusShot);
+	new->spaceTux = newSpace(w, h, zone_w, zone_h, getStatusTux, setStatusTux);
+	new->spaceItem =
+		newSpace(w, h, zone_w, zone_h, getStatusItem, setStatusItem);
+	new->spaceShot =
+		newSpace(w, h, zone_w, zone_h, getStatusShot, setStatusShot);
 
-    new->countRound = 0;
-    new->max_countRound = 0;
+	new->countRound = 0;
+	new->max_countRound = 0;
 
-    return new;
+	return new;
 }
 
 int
 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);
+	return (x1 < x2 + w2 && x2 < x1 + w1 && y1 < y2 + h2 && y2 < y1 + h1);
 }
 
-int
-isFreeSpace(arena_t * arena, int x, int y, int w, int h)
+int isFreeSpace(arena_t * arena, int x, int y, int w, int h)
 {
-    if (x < 0 || y < 0 || x + w > arena->w || y + h > arena->h) {
-        return 0;
-    }
-
-    if (isConflictWithObjectFromSpace(arena->spaceTux, x, y, w, h))
-        return 0;
-    if (isConflictWithObjectFromSpace(arena->spaceShot, x, y, w, h))
-        return 0;
-    if (isConflictWithObjectFromSpace(arena->spaceItem, x, y, w, h))
-        return 0;
-    if (isConflictWithObjectFromSpace(arena->spaceShot, x, y, w, h))
-        return 0;
-
-    if (isConflictModule(x, y, w, h))
-        return 0;
-
-    return 1;
+	if (x < 0 || y < 0 || x + w > arena->w || y + h > arena->h) {
+		return 0;
+	}
+
+	if (isConflictWithObjectFromSpace(arena->spaceTux, x, y, w, h))
+		return 0;
+	if (isConflictWithObjectFromSpace(arena->spaceShot, x, y, w, h))
+		return 0;
+	if (isConflictWithObjectFromSpace(arena->spaceItem, x, y, w, h))
+		return 0;
+	if (isConflictWithObjectFromSpace(arena->spaceShot, x, y, w, h))
+		return 0;
+
+	if (isConflictModule(x, y, w, h))
+		return 0;
+
+	return 1;
 }
 
-void
-findFreeSpace(arena_t * arena, int *x, int *y, int w, int h)
+void findFreeSpace(arena_t * arena, int *x, int *y, int w, int h)
 {
-    int z_x;
-    int z_y;
+	int z_x;
+	int z_y;
 
-    assert(x != NULL);
-    assert(y != NULL);
+	assert(x != NULL);
+	assert(y != NULL);
 
-    do {
-        z_x = random() % (arena->w - w);
-        z_y = random() % (arena->h - h);
-    } while (isFreeSpace(arena, z_x, z_y, w, h) == 0);
+	do {
+		z_x = random() % (arena->w - w);
+		z_y = random() % (arena->h - h);
+	} while (isFreeSpace(arena, z_x, z_y, w, h) == 0);
 
-    *x = z_x;
-    *y = z_y;
+	*x = z_x;
+	*y = z_y;
 }
 
 void
 getCenterScreen(int *screen_x, int *screen_y, int x, int y, int screen_size_x,
-                int screen_size_y)
+				int screen_size_y)
 {
-    arena_t *arena;
+	arena_t *arena;
 
-    arena = getCurrentArena();
+	arena = getCurrentArena();
 
-    *screen_x = x - screen_size_x / 2;
-    *screen_y = y - screen_size_y / 2;
+	*screen_x = x - screen_size_x / 2;
+	*screen_y = y - screen_size_y / 2;
 
-    if (*screen_x < 0) {
-        *screen_x = 0;
-    }
+	if (*screen_x < 0) {
+		*screen_x = 0;
+	}
 
-    if (*screen_y < 0) {
-        *screen_y = 0;
-    }
+	if (*screen_y < 0) {
+		*screen_y = 0;
+	}
 
-    if (*screen_x + screen_size_x >= arena->w) {
-        *screen_x = arena->w - screen_size_x;
-    }
+	if (*screen_x + screen_size_x >= arena->w) {
+		*screen_x = arena->w - screen_size_x;
+	}
 
-    if (*screen_y + screen_size_y >= arena->h) {
-        *screen_y = arena->h - screen_size_y;
-    }
+	if (*screen_y + screen_size_y >= arena->h) {
+		*screen_y = arena->h - screen_size_y;
+	}
 }
 
 #ifndef PUBLIC_SERVER
 
-static void
-drawBackground(arena_t * arena, int screen_x, int screen_y)
+static void drawBackground(arena_t * arena, int screen_x, int screen_y)
 {
 
-    if (isBigArena(arena)) {
-        int i, j;
-
-        for (i = screen_y / arena->background->h;
-             i <=
-             screen_y / arena->background->h +
-             WINDOW_SIZE_Y / arena->background->h + 1; i++) {
-            for (j = screen_x / arena->background->w;
-                 j <=
-                 screen_x / arena->background->w +
-                 WINDOW_SIZE_X / arena->background->w + 1; j++) {
-                addLayer(arena->background, j * arena->background->w,
-                         i * arena->background->h, 0, 0, arena->background->w,
-                         arena->background->h, -100);
-
-                //count++;
-            }
-        }
-    }
-    else {
-        addLayer(arena->background,
-                 0, 0,
-                 0, 0, arena->background->w, arena->background->h, -100);
-    }
+	if (isBigArena(arena)) {
+		int i, j;
+
+		for (i = screen_y / arena->background->h;
+			 i <=
+			 screen_y / arena->background->h +
+			 WINDOW_SIZE_Y / arena->background->h + 1; i++) {
+			for (j = screen_x / arena->background->w;
+				 j <=
+				 screen_x / arena->background->w +
+				 WINDOW_SIZE_X / arena->background->w + 1; j++) {
+				addLayer(arena->background, j * arena->background->w,
+						 i * arena->background->h, 0, 0, arena->background->w,
+						 arena->background->h, -100);
+
+				//count++;
+			}
+		}
+	} else {
+		addLayer(arena->background,
+				 0, 0, 0, 0, arena->background->w, arena->background->h, -100);
+	}
 }
 
-static void
-action_drawTux(space_t * space, tux_t * tux, void *p)
+static void action_drawTux(space_t * space, tux_t * tux, void *p)
 {
-    drawTux(tux);
+	drawTux(tux);
 }
 
-static void
-action_drawItem(space_t * space, item_t * item, void *p)
+static void action_drawItem(space_t * space, item_t * item, void *p)
 {
-    drawItem(item);
+	drawItem(item);
 }
 
-static void
-action_drawShot(space_t * space, shot_t * shot, void *p)
+static void action_drawShot(space_t * space, shot_t * shot, void *p)
 {
-    drawShot(shot);
+	drawShot(shot);
 }
 
-static void
-drawObjects(arena_t * arena, int screen_x, int screen_y)
+static void drawObjects(arena_t * arena, int screen_x, int screen_y)
 {
-    actionSpaceFromLocation(arena->spaceTux, action_drawTux, NULL,
-                            screen_x, screen_y, WINDOW_SIZE_X, WINDOW_SIZE_Y);
+	actionSpaceFromLocation(arena->spaceTux, action_drawTux, NULL,
+							screen_x, screen_y, WINDOW_SIZE_X, WINDOW_SIZE_Y);
 
-    actionSpaceFromLocation(arena->spaceItem, action_drawItem, NULL,
-                            screen_x, screen_y, WINDOW_SIZE_X, WINDOW_SIZE_Y);
+	actionSpaceFromLocation(arena->spaceItem, action_drawItem, NULL,
+							screen_x, screen_y, WINDOW_SIZE_X, WINDOW_SIZE_Y);
 
-    actionSpaceFromLocation(arena->spaceShot, action_drawShot, NULL,
-                            screen_x, screen_y, WINDOW_SIZE_X, WINDOW_SIZE_Y);
+	actionSpaceFromLocation(arena->spaceShot, action_drawShot, NULL,
+							screen_x, screen_y, WINDOW_SIZE_X, WINDOW_SIZE_Y);
 
-    drawModule(screen_x, screen_y, WINDOW_SIZE_X, WINDOW_SIZE_Y);
+	drawModule(screen_x, screen_y, WINDOW_SIZE_X, WINDOW_SIZE_Y);
 }
 
 static void
 drawSplitArenaForTux(arena_t * arena, tux_t * tux, int location_x,
-                     int location_y)
+					 int location_y)
 {
-    int screen_x, screen_y;
-
-    switch (splitType) {
-    case SCREEN_SPLIT_HORIZONTAL:
-        getCenterScreen(&screen_x, &screen_y, tux->x, tux->y, WINDOW_SIZE_X,
-                        WINDOW_SIZE_Y / 2);
-        break;
-    case SCREEN_SPLIT_VERTICAL:
-        getCenterScreen(&screen_x, &screen_y, tux->x, tux->y,
-                        WINDOW_SIZE_X / 2, WINDOW_SIZE_Y);
-        break;
-    default:
-        screen_x = -1;
-        screen_y = -1;
-        assert(!"stupd error ");
-        break;
-    }
-
-    drawBackground(arena, screen_x, screen_y);
-    drawObjects(arena, screen_x, screen_y);
-
-    switch (splitType) {
-    case SCREEN_SPLIT_HORIZONTAL:
-        drawLayerSplit(location_x, location_y, screen_x, screen_y,
-                       WINDOW_SIZE_X, WINDOW_SIZE_Y / 2);
-        break;
-    case SCREEN_SPLIT_VERTICAL:
-        drawLayerSplit(location_x, location_y, screen_x, screen_y,
-                       WINDOW_SIZE_X / 2, WINDOW_SIZE_Y);
-        break;
-    default:
-        screen_x = -1;
-        screen_y = -1;
-        assert(!"stupd error ");
-        break;
-    }
+	int screen_x, screen_y;
+
+	switch (splitType) {
+	case SCREEN_SPLIT_HORIZONTAL:
+		getCenterScreen(&screen_x, &screen_y, tux->x, tux->y, WINDOW_SIZE_X,
+						WINDOW_SIZE_Y / 2);
+		break;
+	case SCREEN_SPLIT_VERTICAL:
+		getCenterScreen(&screen_x, &screen_y, tux->x, tux->y,
+						WINDOW_SIZE_X / 2, WINDOW_SIZE_Y);
+		break;
+	default:
+		screen_x = -1;
+		screen_y = -1;
+		assert(!"stupd error ");
+		break;
+	}
+
+	drawBackground(arena, screen_x, screen_y);
+	drawObjects(arena, screen_x, screen_y);
+
+	switch (splitType) {
+	case SCREEN_SPLIT_HORIZONTAL:
+		drawLayerSplit(location_x, location_y, screen_x, screen_y,
+					   WINDOW_SIZE_X, WINDOW_SIZE_Y / 2);
+		break;
+	case SCREEN_SPLIT_VERTICAL:
+		drawLayerSplit(location_x, location_y, screen_x, screen_y,
+					   WINDOW_SIZE_X / 2, WINDOW_SIZE_Y);
+		break;
+	default:
+		screen_x = -1;
+		screen_y = -1;
+		assert(!"stupd error ");
+		break;
+	}
 }
 
-void
-drawSplitArena(arena_t * arena)
+void drawSplitArena(arena_t * arena)
 {
-    tux_t *tux = NULL;
-
-    tux = getControlTux(TUX_CONTROL_KEYBOARD_RIGHT);
-
-    if (tux != NULL) {
-        switch (splitType) {
-        case SCREEN_SPLIT_HORIZONTAL:
-            drawSplitArenaForTux(arena, tux, 0, WINDOW_SIZE_Y / 2);
-            break;
-        case SCREEN_SPLIT_VERTICAL:
-            drawSplitArenaForTux(arena, tux, WINDOW_SIZE_X / 2, 0);
-            break;
-        }
-    }
-
-    tux = getControlTux(TUX_CONTROL_KEYBOARD_LEFT);
-
-    if (tux != NULL) {
-        drawSplitArenaForTux(arena, tux, 0, 0);
-    }
+	tux_t *tux = NULL;
+
+	tux = getControlTux(TUX_CONTROL_KEYBOARD_RIGHT);
+
+	if (tux != NULL) {
+		switch (splitType) {
+		case SCREEN_SPLIT_HORIZONTAL:
+			drawSplitArenaForTux(arena, tux, 0, WINDOW_SIZE_Y / 2);
+			break;
+		case SCREEN_SPLIT_VERTICAL:
+			drawSplitArenaForTux(arena, tux, WINDOW_SIZE_X / 2, 0);
+			break;
+		}
+	}
+
+	tux = getControlTux(TUX_CONTROL_KEYBOARD_LEFT);
+
+	if (tux != NULL) {
+		drawSplitArenaForTux(arena, tux, 0, 0);
+	}
 }
 
-void
-drawCenterArena(arena_t * arena, int x, int y)
+void drawCenterArena(arena_t * arena, int x, int y)
 {
-    int screen_x, screen_y;
+	int screen_x, screen_y;
 
-    getCenterScreen(&screen_x, &screen_y, x, y, WINDOW_SIZE_X, WINDOW_SIZE_Y);
-    drawBackground(arena, screen_x, screen_y);
-    drawObjects(arena, screen_x, screen_y);
-    drawLayerCenter(x, y);
+	getCenterScreen(&screen_x, &screen_y, x, y, WINDOW_SIZE_X, WINDOW_SIZE_Y);
+	drawBackground(arena, screen_x, screen_y);
+	drawObjects(arena, screen_x, screen_y);
+	drawLayerCenter(x, y);
 }
 
-void
-drawSimpleArena(arena_t * arena)
+void drawSimpleArena(arena_t * arena)
 {
-    int screen_x, screen_y;
-    tux_t *tux = NULL;
+	int screen_x, screen_y;
+	tux_t *tux = NULL;
 
-    tux = getControlTux(TUX_CONTROL_KEYBOARD_RIGHT);
+	tux = getControlTux(TUX_CONTROL_KEYBOARD_RIGHT);
 
-    if (tux == NULL) {
-        return;
-    }
+	if (tux == NULL) {
+		return;
+	}
 
-    screen_x = 0;
-    screen_y = 0;
+	screen_x = 0;
+	screen_y = 0;
 
-    drawBackground(arena, screen_x, screen_y);
-    drawObjects(arena, screen_x, screen_y);
-    drawLayer(tux->x, tux->y);
+	drawBackground(arena, screen_x, screen_y);
+	drawObjects(arena, screen_x, screen_y);
+	drawLayer(tux->x, tux->y);
 }
 
-void
-drawArena(arena_t * arena)
+void drawArena(arena_t * arena)
 {
-    if (isBigArena(arena) &&
-        getNetTypeGame() == NET_GAME_TYPE_NONE && !isSettingAI()) {
-        tux_t *tux1;
-        tux_t *tux2;
+	if (isBigArena(arena) &&
+		getNetTypeGame() == NET_GAME_TYPE_NONE && !isSettingAI()) {
+		tux_t *tux1;
+		tux_t *tux2;
 
-        tux1 = getControlTux(TUX_CONTROL_KEYBOARD_RIGHT);
-        tux2 = getControlTux(TUX_CONTROL_KEYBOARD_LEFT);
+		tux1 = getControlTux(TUX_CONTROL_KEYBOARD_RIGHT);
+		tux2 = getControlTux(TUX_CONTROL_KEYBOARD_LEFT);
 
-        if (isTuxNear(tux1, tux2)) {
-            drawCenterArena(arena, (tux1->x + tux2->x) / 2,
-                            (tux1->y + tux2->y) / 2);
-        }
-        else {
-            drawSplitArena(arena);
-        }
+		if (isTuxNear(tux1, tux2)) {
+			drawCenterArena(arena, (tux1->x + tux2->x) / 2,
+							(tux1->y + tux2->y) / 2);
+		} else {
+			drawSplitArena(arena);
+		}
 
-        return;
-    }
+		return;
+	}
 
-    if (isBigArena(arena)) {
-        tux_t *tux = NULL;
+	if (isBigArena(arena)) {
+		tux_t *tux = NULL;
 
-        tux = getControlTux(TUX_CONTROL_KEYBOARD_RIGHT);
+		tux = getControlTux(TUX_CONTROL_KEYBOARD_RIGHT);
 
-        if (tux == NULL) {
-            return;
-        }
+		if (tux == NULL) {
+			return;
+		}
 
-        drawCenterArena(arena, tux->x, tux->y);
-        return;
-    }
+		drawCenterArena(arena, tux->x, tux->y);
+		return;
+	}
 
-    drawSimpleArena(arena);
+	drawSimpleArena(arena);
 }
 
 #endif
 
-static void
-action_tux(space_t * space, tux_t * tux, void *p)
+static void action_tux(space_t * space, tux_t * tux, void *p)
 {
-    eventTux(tux);
+	eventTux(tux);
 }
 
-void
-eventArena(arena_t * arena)
+void eventArena(arena_t * arena)
 {
-    int i;
+	int i;
 
-    for (i = 0; i < 8; i++) {
-        checkShotIsInTuxScreen(arena);
+	for (i = 0; i < 8; i++) {
+		checkShotIsInTuxScreen(arena);
 
-        eventConflictShotWithItem(arena);
-        eventConflictTuxWithShot(arena);
-        eventModule();
+		eventConflictShotWithItem(arena);
+		eventConflictTuxWithShot(arena);
+		eventModule();
 
-        eventMoveListShot(arena);
-    }
+		eventMoveListShot(arena);
+	}
 
-    eventListItem(arena->spaceItem);
+	eventListItem(arena->spaceItem);
 
-    actionSpace(arena->spaceTux, action_tux, NULL);
+	actionSpace(arena->spaceTux, action_tux, NULL);
 
-    eventTimer(arena->listTimer);
+	eventTimer(arena->listTimer);
 }
 
-void
-destroyArena(arena_t * p)
+void destroyArena(arena_t * p)
 {
-    destroySpaceWithObject(p->spaceTux, destroyTux);
-    destroySpaceWithObject(p->spaceItem, destroyItem);
-    destroySpaceWithObject(p->spaceShot, destroyShot);
-    destroyTimer(p->listTimer);
-    free(p);
+	destroySpaceWithObject(p->spaceTux, destroyTux);
+	destroySpaceWithObject(p->spaceItem, destroyItem);
+	destroySpaceWithObject(p->spaceShot, destroyShot);
+	destroyTimer(p->listTimer);
+	free(p);
 }