Revert "X"

This reverts commit e12753d2ec9db83ec08bb9db63902a82fb245cdd.

1 files changed, 121 insertions, 155 deletions

diff --git a/src/client/panel.c b/src/client/panel.c
index 774d3e1..b84cdfb 100644
--- a/src/client/panel.c
+++ b/src/client/panel.c
@@ -19,196 +19,162 @@ static image_t *g_bonus;
 
 static bool_t isPanelInit = FALSE;
 
-bool_t
-isPanelInicialized()
+bool_t isPanelInicialized()
 {
-   return isPanelInit;
+	return isPanelInit;
 }
 
-void
-initPanel()
+void initPanel()
 {
-   assert(isImageInicialized() == TRUE);
-   assert(isInterfaceInicialized() == TRUE);
-
-   g_panel =
-      addImageData("panel.png", IMAGE_ALPHA, "panel", IMAGE_GROUP_BASE);
-   g_shot =
-      addImageData("panel_shot.png", IMAGE_ALPHA, "panel_image_shot",
-                   IMAGE_GROUP_BASE);
-   g_bonus =
-      addImageData("graf.bonus.png", IMAGE_ALPHA, "panel_graf_bonus",
-                   IMAGE_GROUP_BASE);
-
-   g_icon[GUN_SIMPLE] =
-      addImageData("icon.gun.simple.png", IMAGE_ALPHA, "panel_gun",
-                   IMAGE_GROUP_BASE);
-   g_icon[GUN_DUAL_SIMPLE] =
-      addImageData("icon.gun.dual.simple.png", IMAGE_ALPHA, "panel_dual",
-                   IMAGE_GROUP_BASE);
-   g_icon[GUN_TOMMY] =
-      addImageData("icon.gun.tommy.png", IMAGE_ALPHA, "panel_tommy",
-                   IMAGE_GROUP_BASE);
-   g_icon[GUN_SCATTER] =
-      addImageData("icon.gun.scatter.png", IMAGE_ALPHA, "panel_scatter",
-                   IMAGE_GROUP_BASE);
-   g_icon[GUN_LASSER] =
-      addImageData("icon.gun.lasser.png", IMAGE_ALPHA, "panel_lasser",
-                   IMAGE_GROUP_BASE);
-   g_icon[GUN_MINE] =
-      addImageData("icon.gun.mine.png", IMAGE_ALPHA, "panel_mine",
-                   IMAGE_GROUP_BASE);
-   g_icon[GUN_BOMBBALL] =
-      addImageData("icon.gun.bombball.png", IMAGE_ALPHA, "panel_bombball",
-                   IMAGE_GROUP_BASE);
-
-   g_icon[BONUS_SPEED] =
-      addImageData("icon.bonus.speed.png", IMAGE_ALPHA, "panel_speed",
-                   IMAGE_GROUP_BASE);
-   g_icon[BONUS_SHOT] =
-      addImageData("icon.bonus.shot.png", IMAGE_ALPHA, "panel_shot",
-                   IMAGE_GROUP_BASE);
-   g_icon[BONUS_TELEPORT] =
-      addImageData("icon.bonus.teleport.png", IMAGE_ALPHA, "panel_teleport",
-                   IMAGE_GROUP_BASE);
-   g_icon[BONUS_GHOST] =
-      addImageData("icon.bonus.ghost.png", IMAGE_ALPHA, "panel_ghost",
-                   IMAGE_GROUP_BASE);
-   g_icon[BONUS_4X] =
-      addImageData("icon.bonus.4x.png", IMAGE_ALPHA, "panel_4x",
-                   IMAGE_GROUP_BASE);
-   g_icon[BONUS_HIDDEN] =
-      addImageData("icon.bonus.hidden.png", IMAGE_ALPHA, "panel_hidden",
-                   IMAGE_GROUP_BASE);
-
-   isPanelInit = TRUE;
+	assert( isImageInicialized() == TRUE );
+	assert( isInterfaceInicialized() == TRUE );
+
+	g_panel = addImageData("panel.png", IMAGE_ALPHA, "panel", IMAGE_GROUP_BASE);
+	g_shot = addImageData("panel_shot.png", IMAGE_ALPHA, "panel_image_shot", IMAGE_GROUP_BASE);
+	g_bonus = addImageData("graf.bonus.png", IMAGE_ALPHA, "panel_graf_bonus", IMAGE_GROUP_BASE);
+
+	g_icon[GUN_SIMPLE] = addImageData("icon.gun.simple.png", IMAGE_ALPHA, "panel_gun", IMAGE_GROUP_BASE);
+	g_icon[GUN_DUAL_SIMPLE] = addImageData("icon.gun.dual.simple.png", IMAGE_ALPHA, "panel_dual", IMAGE_GROUP_BASE);
+	g_icon[GUN_TOMMY] = addImageData("icon.gun.tommy.png", IMAGE_ALPHA, "panel_tommy", IMAGE_GROUP_BASE);
+	g_icon[GUN_SCATTER] = addImageData("icon.gun.scatter.png", IMAGE_ALPHA, "panel_scatter", IMAGE_GROUP_BASE);
+	g_icon[GUN_LASSER] = addImageData("icon.gun.lasser.png", IMAGE_ALPHA, "panel_lasser", IMAGE_GROUP_BASE);
+	g_icon[GUN_MINE] = addImageData("icon.gun.mine.png", IMAGE_ALPHA, "panel_mine", IMAGE_GROUP_BASE);
+	g_icon[GUN_BOMBBALL] = addImageData("icon.gun.bombball.png", IMAGE_ALPHA, "panel_bombball", IMAGE_GROUP_BASE);
+
+	g_icon[BONUS_SPEED] = addImageData("icon.bonus.speed.png", IMAGE_ALPHA, "panel_speed", IMAGE_GROUP_BASE);
+	g_icon[BONUS_SHOT] = addImageData("icon.bonus.shot.png", IMAGE_ALPHA, "panel_shot", IMAGE_GROUP_BASE);
+	g_icon[BONUS_TELEPORT] = addImageData("icon.bonus.teleport.png", IMAGE_ALPHA, "panel_teleport", IMAGE_GROUP_BASE);
+	g_icon[BONUS_GHOST] = addImageData("icon.bonus.ghost.png", IMAGE_ALPHA, "panel_ghost", IMAGE_GROUP_BASE);
+	g_icon[BONUS_4X] = addImageData("icon.bonus.4x.png", IMAGE_ALPHA, "panel_4x", IMAGE_GROUP_BASE);
+	g_icon[BONUS_HIDDEN] = addImageData("icon.bonus.hidden.png", IMAGE_ALPHA, "panel_hidden", IMAGE_GROUP_BASE);
+
+	isPanelInit = TRUE;
 }
 
-static void
-drawScore(tux_t * tux_right, tux_t * tux_left)
+static void drawScore(tux_t *tux_right, tux_t *tux_left)
 {
-   char strScoreLine[STR_SIZE];
-   int w, h;
-
-   if (tux_right != NULL && tux_left != NULL) {
-      sprintf(strScoreLine, "%d : %d", tux_right->score, tux_left->score);
-   }
-   else if (tux_right != NULL) {
-      sprintf(strScoreLine, "%d", tux_right->score);
-   }
-   else if (tux_left != NULL) {
-      sprintf(strScoreLine, "%d", tux_left->score);
-   }
-
-   getTextSize(strScoreLine, &w, &h);
-   drawFont(strScoreLine, PANEL_SCORE_LOCATION_X, PANEL_SCORE_LOCATION_Y,
-            COLOR_WHITE);
+	char strScoreLine[STR_SIZE];
+	int w, h;
+
+	if( tux_right != NULL && tux_left != NULL )
+	{
+		sprintf(strScoreLine, "%d : %d", tux_right->score, tux_left->score);
+	}
+	else if( tux_right != NULL )
+	{
+		sprintf(strScoreLine, "%d", tux_right->score);
+	}
+	else if( tux_left != NULL )
+	{
+		sprintf(strScoreLine, "%d", tux_left->score);
+	}
+
+	getTextSize(strScoreLine, &w , &h);
+	drawFont(strScoreLine, PANEL_SCORE_LOCATION_X, PANEL_SCORE_LOCATION_Y, COLOR_WHITE);
 }
 
-static void
-drawShot(int n, int x, int y)
+static void drawShot(int n, int x, int y)
 {
-   drawImage(g_shot, x, y, n * PANEL_SHOT_WIDTH, 0, PANEL_SHOT_WIDTH,
-             PANEL_SHOT_HEIGHT);
+	drawImage(g_shot, x, y,n * PANEL_SHOT_WIDTH, 0, PANEL_SHOT_WIDTH, PANEL_SHOT_HEIGHT);
 }
 
-static void
-drawShotInfo(tux_t * tux, int x, int y)
+static void drawShotInfo(tux_t *tux,int x, int y)
 {
-   int i;
-
-   if (tux->pickup_time > 0) {
-      for (i = 0; i < tux->pickup_time / 3; i++) {
-         drawShot(PANEL_SHOT_LINE, x + i * PANEL_SHOT_WIDTH, y);
-      }
-
-      return;
-   }
-
-   for (i = 0; i < GUN_MAX_SHOT; i++) {
-      if (tux->shot[tux->gun] > i) {
-         drawShot(PANEL_SHOT_FILL, x + i * (PANEL_SHOT_WIDTH + 2), y);
-      }
-      else {
-         drawShot(PANEL_SHOT_EMPTY, x + i * (PANEL_SHOT_WIDTH + 2), y);
-      }
-   }
+	int i;
+
+	if( tux->pickup_time > 0 )
+	{
+		for( i = 0 ; i < tux->pickup_time / 3 ; i++ )
+		{
+			drawShot(PANEL_SHOT_LINE, x + i * PANEL_SHOT_WIDTH, y);
+		}
+
+		return;
+	}
+
+	for( i = 0 ; i < GUN_MAX_SHOT ; i++ )
+	{
+		if( tux->shot[tux->gun] > i )
+		{
+			drawShot(PANEL_SHOT_FILL, x + i * ( PANEL_SHOT_WIDTH + 2 ), y);
+		}
+		else
+		{
+			drawShot(PANEL_SHOT_EMPTY, x + i * ( PANEL_SHOT_WIDTH + 2 ) , y);
+		}
+	}
 }
 
-static void
-drawGunInfo(tux_t * tux, int x, int y)
+static void drawGunInfo(tux_t *tux,int x, int y)
 {
-   drawImage(g_icon[tux->gun], x, y, 0, 0,
-             g_icon[tux->gun]->w, g_icon[tux->gun]->h);
+	drawImage(g_icon[ tux->gun ], x, y, 0, 0,
+		g_icon[ tux->gun ]->w, g_icon[ tux->gun ]->h);
 }
 
-static void
-drawBonusInfo(tux_t * tux, int x, int y)
+static void drawBonusInfo(tux_t *tux,int x, int y)
 {
-   drawImage(g_icon[tux->bonus], x, y, 0, 0, g_icon[tux->bonus]->w,
-             g_icon[tux->bonus]->h);
+	drawImage(g_icon[ tux->bonus ], x, y, 0, 0, g_icon[ tux->bonus ]->w, g_icon[ tux->bonus ]->h);
 }
 
-static void
-drawGrafBonus(tux_t * tux, int x, int y)
+static void drawGrafBonus(tux_t *tux,int x, int y)
 {
-   int offset;
+	int offset;
 
-   offset = tux->bonus_time / 5;
-   drawImage(g_bonus, x, y, 0, 0, g_bonus->w, g_bonus->h / 2);
-   drawImage(g_bonus, x + 1, y, 0, g_bonus->h / 2, offset, g_bonus->h / 2);
+	offset = tux->bonus_time / 5;
+	drawImage(g_bonus, x, y, 0, 0, g_bonus->w, g_bonus->h/2);
+	drawImage(g_bonus, x+1, y, 0, g_bonus->h/2, offset, g_bonus->h/2);
 }
 
-static void
-drawTuxRight(tux_t * tux)
+static void drawTuxRight(tux_t *tux)
 {
-   if (tux == NULL) {
-      return;
-   }
-
-   drawShotInfo(tux, PANEL_LOCATION_X + 740, PANEL_LOCATION_Y + 34);
-   drawGunInfo(tux, PANEL_LOCATION_X + 620, PANEL_LOCATION_Y + 30);
-
-   if (tux->bonus != BONUS_NONE) {
-      drawGrafBonus(tux, PANEL_LOCATION_X + 460, PANEL_LOCATION_Y + 50);
-      drawBonusInfo(tux, PANEL_LOCATION_X + 460, PANEL_LOCATION_Y + 30);
-   }
+	if( tux == NULL )
+	{
+		return;
+	}
+
+	drawShotInfo(tux, PANEL_LOCATION_X+740, PANEL_LOCATION_Y+34);
+	drawGunInfo(tux, PANEL_LOCATION_X+620, PANEL_LOCATION_Y+30);
+
+	if( tux->bonus != BONUS_NONE )
+	{
+		drawGrafBonus(tux, PANEL_LOCATION_X+460, PANEL_LOCATION_Y+50);
+		drawBonusInfo(tux, PANEL_LOCATION_X+460, PANEL_LOCATION_Y+30);
+	}
 }
 
-static void
-drawTuxLeft(tux_t * tux)
+static void drawTuxLeft(tux_t *tux)
 {
-   if (tux == NULL) {
-      return;
-   }
-
-   drawShotInfo(tux, PANEL_LOCATION_X + 8, PANEL_LOCATION_Y + 34);
-   drawGunInfo(tux, PANEL_LOCATION_X + 130, PANEL_LOCATION_Y + 30);
-
-   if (tux->bonus != BONUS_NONE) {
-      drawGrafBonus(tux, PANEL_LOCATION_X + 200, PANEL_LOCATION_Y + 50);
-      drawBonusInfo(tux, PANEL_LOCATION_X + 200, PANEL_LOCATION_Y + 30);
-   }
+	if( tux == NULL )
+	{
+		return;
+	}
+
+	drawShotInfo(tux, PANEL_LOCATION_X+8, PANEL_LOCATION_Y+34);
+	drawGunInfo(tux, PANEL_LOCATION_X+130, PANEL_LOCATION_Y+30);
+
+	if( tux->bonus != BONUS_NONE )
+	{
+		drawGrafBonus(tux, PANEL_LOCATION_X+200, PANEL_LOCATION_Y+50);
+		drawBonusInfo(tux, PANEL_LOCATION_X+200, PANEL_LOCATION_Y+30);
+	}
 }
 
-void
-drawPanel(tux_t * tux_right, tux_t * tux_left)
+void drawPanel(tux_t *tux_right, tux_t *tux_left)
 {
-   drawImage(g_panel, PANEL_LOCATION_X, PANEL_LOCATION_Y, 0, 0, g_panel->w,
-             g_panel->h);
-   drawScore(tux_right, tux_left);
+	drawImage(g_panel, PANEL_LOCATION_X, PANEL_LOCATION_Y, 0, 0, g_panel->w, g_panel->h);
+	drawScore(tux_right, tux_left);
 
-   if (isRecivedNewMsg()) {
-      drawFont("recived new msg", PANEL_LOCATION_X, PANEL_LOCATION_Y,
-               COLOR_WHITE);
-   }
+	if( isRecivedNewMsg() )
+	{
+		drawFont("recived new msg", PANEL_LOCATION_X, PANEL_LOCATION_Y, COLOR_WHITE);
+	}
 
-   drawTuxRight(tux_right);
-   drawTuxLeft(tux_left);
+	drawTuxRight(tux_right);
+	drawTuxLeft(tux_left);
 }
 
-void
-quitPanel()
+void quitPanel()
 {
-   isPanelInit = FALSE;
+	isPanelInit = FALSE;
 }
+