From a463c1e44be7c8c97efd4a2bd95d81909246c35a Mon Sep 17 00:00:00 2001
From: Yamagi Burmeister <yamagi@yamagi.org>
Date: Fri, 18 Jun 2010 07:48:31 +0000
Subject: [PATCH] =?UTF-8?q?cl=5Finv.c=20reformat=20und=20in=20Sachen=20Kom?=
 =?UTF-8?q?mentaren=20aufger=C3=A4umt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/cl_ents.c |  2 +-
 src/client/cl_inv.c  | 84 +++++++++++++++++++++-----------------------
 2 files changed, 41 insertions(+), 45 deletions(-)

diff --git a/src/client/cl_ents.c b/src/client/cl_ents.c
index e3633a3e..08b24296 100644
--- a/src/client/cl_ents.c
+++ b/src/client/cl_ents.c
@@ -22,8 +22,8 @@
 
 extern	struct model_s	*cl_mod_powerscreen;
 int	vidref_val;
-
 int	bitcounts[32]; /* just for protocol profiling */
+
 int CL_ParseEntityBits (unsigned *bits) {
 	unsigned	b, total;
 	int			i;
diff --git a/src/client/cl_inv.c b/src/client/cl_inv.c
index 21058416..a33a135f 100644
--- a/src/client/cl_inv.c
+++ b/src/client/cl_inv.c
@@ -1,31 +1,25 @@
 /*
-Copyright (C) 1997-2001 Id Software, Inc.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-// cl_inv.c -- client inventory screen
+ * Copyright (C) 1997-2001 Id Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ */
 
 #include "header/client.h"
 
-/*
-================
-CL_ParseInventory
-================
-*/
 void CL_ParseInventory (void)
 {
 	int		i;
@@ -34,17 +28,11 @@ void CL_ParseInventory (void)
 		cl.inventory[i] = MSG_ReadShort (&net_message);
 }
 
-
-/*
-================
-Inv_DrawString
-================
-*/
 static void Inv_DrawString (int x, int y, char *string)
 {
 	while (*string)
 	{
-	  re.DrawChar (x, y, *string);
+		re.DrawChar (x, y, *string);
 		x+=8;
 		string++;
 	}
@@ -56,11 +44,6 @@ static void SetStringHighBit (char *s)
 		*s++ |= 128;
 }
 
-/*
-================
-CL_DrawInventory
-================
-*/
 #define	DISPLAY_ITEMS	17
 
 void CL_DrawInventory (void)
@@ -79,10 +62,12 @@ void CL_DrawInventory (void)
 
 	num = 0;
 	selected_num = 0;
+
 	for (i=0 ; i<MAX_ITEMS ; i++)
 	{
 		if (i==selected)
 			selected_num = num;
+
 		if (cl.inventory[i])
 		{
 			index[num] = i;
@@ -90,32 +75,41 @@ void CL_DrawInventory (void)
 		}
 	}
 
-	// determine scroll point
+	/* determine scroll point */
 	top = selected_num - DISPLAY_ITEMS/2;
+
 	if (num - top < DISPLAY_ITEMS)
 		top = num - DISPLAY_ITEMS;
+
 	if (top < 0)
 		top = 0;
 
 	x = (viddef.width-256)/2;
+
 	y = (viddef.height-240)/2;
 
-	// repaint everything next frame
+	/* repaint everything next frame */
 	SCR_DirtyScreen ();
 
 	re.DrawPic (x, y+8, "inventory");
 
 	y += 24;
+
 	x += 24;
+
 	Inv_DrawString (x, y, "hotkey ### item");
+
 	Inv_DrawString (x, y+8, "------ --- ----");
+
 	y += 16;
+
 	for (i=top ; i<num && i < top+DISPLAY_ITEMS ; i++)
 	{
 		item = index[i];
-		// search for a binding
+		/* search for a binding */
 		Com_sprintf (binding, sizeof(binding), "use %s", cl.configstrings[CS_ITEMS+item]);
 		bind = "";
+
 		for (j=0 ; j<256 ; j++)
 			if (keybindings[j] && !Q_stricmp (keybindings[j], binding))
 			{
@@ -124,18 +118,20 @@ void CL_DrawInventory (void)
 			}
 
 		Com_sprintf (string, sizeof(string), "%6s %3i %s", bind, cl.inventory[item],
-			cl.configstrings[CS_ITEMS+item] );
+
+		             cl.configstrings[CS_ITEMS+item] );
+
 		if (item != selected)
 			SetStringHighBit (string);
-		else	// draw a blinky cursor by the selected item
+		else 
 		{
+			/* draw a blinky cursor by the selected item */
 			if ( (int)(cls.realtime*10) & 1)
 				re.DrawChar (x-8, y, 15);
 		}
+
 		Inv_DrawString (x, y, string);
+
 		y += 8;
 	}
-
-
 }
-