X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud.qc;h=334ca34b3e935daab9de8f601996535e0f454fa0;hb=df0a07022b2f24ad36892fd832b490df8351f4db;hp=f7deec4fe145480f161cc63587e360e3acaad880;hpb=2605a0ef47d8f03bfbd47b02ea4d1279f90196f9;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index f7deec4fe..334ca34b3 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -75,17 +75,42 @@ void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector the
 	}
 }
 
+// drawpic wrapper to draw an image as large as possible with preserved aspect ratio into a box
+void drawpic_aspect(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) {
+	vector imgsize;
+	imgsize = drawgetimagesize(pic);
+	float imgaspect;
+	imgaspect = imgsize_x/imgsize_y;
+
+	vector oldsz;
+	oldsz = sz;
+	float aspect;
+	aspect = sz_x/sz_y;
+
+	if(aspect > imgaspect) {
+		sz_x = sz_y * imgaspect;
+		drawpic(pos + eX * (oldsz_x - sz_x) * 0.5, pic, sz, color, alpha, drawflag);
+	} else {
+		sz_y = sz_x / imgaspect; 
+		drawpic(pos + eY * (oldsz_y - sz_y) * 0.5, pic, sz, color, alpha, drawflag);
+	}
+}
+
 // draw HUD element with image from gfx/hud/hud_skin/foo.tga if it exists, otherwise gfx/hud/default/foo.tga
+// TODO: make a default skin, and fallback to these!
 void drawpic_skin(vector pos, string pic, vector sz, vector color, float alpha, float drawflag) {
-	drawpic(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, color, alpha, drawflag);
+	drawpic_aspect(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, color, alpha, drawflag);
 }
 
+// TODO: aspect!
 void drawpic_skin_expanding(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) {
-	drawpic_expanding(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
+	return;
+	//drawpic_aspect_expanding(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
 }
 
 void drawpic_skin_expanding_two(vector pos, string pic, vector sz, vector rgb, float alpha, float flag, float fadelerp) {
-	drawpic_expanding_two(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
+	return;
+	//drawpic_aspect_expanding_two(pos, strcat("gfx/hud/", cvar_string("hud_skin"), "/", pic), sz, rgb, alpha, flag, fadelerp);
 }
 
 // return HUD background color
@@ -124,99 +149,6 @@ vector HUD_AccuracyColor(float accuracy)
 	return rgb;
 }
 
-// draw number in the XSCALE font
-void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags)
-{
-	float l, i;
-	string str, tmp, l_length;
-	float minus, plus;
-	vector vsize, num_color;
-
-	vsize_x = vsize_y = lettersize;
-	vsize_z = 0;
-
-	// showsign 1: always prefix with minus sign (useful in race distribution display)
-	// showsign 2: always prefix with plus sign (useful in race distribution display)
-	// showsign 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display)
-
-	if((showsign == 2 && num >= 0) || (num > 0 && showsign == 3))
-	{
-		plus = true;
-		pos_x -= lettersize;
-	} else
-		plus = false;
-
-	if(num < 0 || (num < 0 && showsign == 3) || (showsign == 1 && num <= 0))
-	{
-		minus = true;
-		num = -num;
-		pos_x -= lettersize;
-	} else
-		minus = false;
-
-	if(digits < 0)
-	{
-		tmp = ftos(num);
-		digits = -digits;
-		str = strcat(substring("0000000000", 0, digits - strlen(tmp)), tmp);
-	} else
-		str = ftos(num);
-
-	l = strlen(str);
-	l_length = ftos(l);
-
-	if(l > digits)
-	{
-		str = substring(str, l-digits, 999);
-		l = strlen(str);
-	} else if(l < digits)
-		pos_x += (digits-l) * lettersize;
-
-	if (highlighted == 1) {
-		vector hl_size;
-		hl_size_x = vsize_x * l + vsize_x * 0.2;
-		hl_size_y = vsize_y * 1.1;
-		hl_size_z = 0;
-		if(minus)
-			hl_size_x = hl_size_x + vsize_x;
-
-		vector hl_pos;
-		hl_pos_x = pos_x - lettersize/10;
-		hl_pos_y = pos_y - lettersize/20;
-		hl_pos_z = 0;
-
-		drawpic_skin(hl_pos, strcat("num_leading_", l_length), hl_size, '1 1 1', alpha, dflags);
-	}
-
-	if (stroke == 1)
-		num_color = '1 1 1';
-	else
-		num_color = rgb;
-
-	if(minus)
-	{
-		if (stroke == 1)
-			drawpic_skin(pos, "num_minus_stroke", vsize, rgb, alpha, dflags);
-		drawpic_skin(pos, "num_minus", vsize, num_color, alpha, dflags);
-		pos_x += lettersize;
-	} else if(plus)
-	{
-		if (stroke == 1)
-			drawpic_skin(pos, "num_plus_stroke", vsize, rgb, alpha, dflags);
-		drawpic_skin(pos, "num_plus", vsize, num_color, alpha, dflags);
-		pos_x += lettersize;
-	}
-
-	for(i = 0; i < l; ++i)
-	{
-		tmp = substring(str, i, 1);
-		if (stroke == 1)
-			drawpic_skin(pos, strcat("num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
-		drawpic_skin(pos, strcat("num_", tmp), vsize, num_color, alpha, dflags);
-		pos_x += lettersize;
-	}
-}
-
 vector HUD_Get_Num_Color (float x, float maxvalue)
 {
 	vector color;
@@ -252,13 +184,6 @@ vector HUD_Get_Num_Color (float x, float maxvalue)
 	}
 	return color;
 }
-// color the number differently based on how big it is (used in the health/armor panel)
-void HUD_DrawXNum_Colored (vector pos, float x, float digits, float lettersize, float alpha)
-{
-	vector color;
-	color = HUD_Get_Num_Color (x, 200);
-	HUD_DrawXNum(pos, x, digits, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL);
-}
 
 float stringwidth_colors(string s, vector theSize)
 {
@@ -570,7 +495,7 @@ void HUD_Panel_ExportCfg(string cfgname)
 		fputs(fh, strcat("seta hud_bg_alpha \"", cvar_string("hud_bg_alpha"), "\"", "\n"));
 		fputs(fh, strcat("seta hud_bg_border \"", cvar_string("hud_bg_border"), "\"", "\n"));
 		fputs(fh, strcat("seta hud_bg_padding \"", cvar_string("hud_bg_padding"), "\"", "\n"));
-		fputs(fh, strcat("seta hud_fg_alpha) \"", cvar_string("hud_fg_alpha"), "\"", "\n"));
+		fputs(fh, strcat("seta hud_fg_alpha \"", cvar_string("hud_fg_alpha"), "\"", "\n"));
 		fputs(fh, "\n");
 
 		fputs(fh, strcat("seta hud_dock \"", cvar_string("hud_dock"), "\"", "\n"));
@@ -634,57 +559,6 @@ void HUD_Panel_ExportCfg(string cfgname)
 	fclose(fh);
 }
 
-vector HUD_Panel_GetMinSize(float id)
-{
-	vector mySize;
-	// note: please only set mySize_y on aspect ratio forced panels
-	switch(id) {
-		case 0: 
-			mySize_x = 1/10; // at least 1/10 * height
-			mySize_y = 1/26; // at least 1/26 * width
-			break;
-		case 1: 
-			if(cvar("hud_inventory_onlycurrent"))
-				mySize_y = 2/5; //  2/5 width
-			else
-				mySize_x = 0.7; // at least 0.7 * height
-			break;
-		case 3: 
-			if(cvar("hud_healtharmor") == 2)
-			{
-				mySize_x = 4.35; // 4.35 * height, trial and error...
-				mySize_y = 0.01; // "unlimited" ;)
-			}
-			break;
-		case 4: 
-			mySize_x = 1.1; // 4/5 * height, trial and error...
-			mySize_y = 1/3; // 1/3 * width, trial and error...
-			break;
-		case 5: 
-			mySize_y = 1/4.1; // 1/4.1 * width, trial and error...
-			break;
-		case 7: 
-			mySize_y = 1/4; // 1/4 * width
-			break;
-		case 8: 
-			mySize_y = 1/4; // 1/4 * width
-			break;
-		case 9: 
-			mySize_y = 1/4; // 1/4 * width
-			break;
-		case 10: 
-			mySize_y = 1/2; // 1/2 * width
-			break;
-		case 11: 
-			mySize_y = 0.5898; // 0.5898 * width, reason: bg has weird dimensions...
-			break;
-		case 13: 
-			mySize_y = 0.25; // 0.25 * width, trial and error...
-			break;
-	}
-	return mySize;
-}
-
 // return active status of panel
 float HUD_Panel_CheckActive(float id)
 {
@@ -906,7 +780,9 @@ void HUD_Panel_DrawBg(float id, vector pos, vector mySize, float alpha)
 
 void HUD_Panel_DrawProgressBar(vector pos, float vertical, vector mySize, vector color, float alpha, float drawflag)
 {
-//float	drawsubpic(vector position, vector size, string pic, vector srcPosition, vector srcSize, vector rgb, float alpha, float flag) = #328;
+	if(!alpha)
+		return;
+
 	string pic;
 	pic = strcat("gfx/hud/", cvar_string("hud_skin"), "/");
 	if(vertical) {
@@ -1016,8 +892,8 @@ void HUD_Panel_SetPos(float id, vector pos)
 
 	if(cvar("hud_configure_grid"))
 	{
-		pos_x = floor((pos_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * cvar("hud_configure_grid_x") * vid_conwidth;
-		pos_y = floor((pos_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * cvar("hud_configure_grid_y") * vid_conheight;
+		pos_x = floor((pos_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_x"), 0.2) * vid_conwidth;
+		pos_y = floor((pos_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_y"), 0.2) * vid_conheight;
 	}
 
 	string s;
@@ -1027,7 +903,7 @@ void HUD_Panel_SetPos(float id, vector pos)
 }
 
 // check if resize will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector
-vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float ratio) {
+vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin) {
 	float i;
 
 	float targBorder;
@@ -1069,7 +945,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float
 			// in this case resizeorigin (bottom-right point) and the bottom-right point of the panel
 			dist_x = resizeorigin_x - targEndPos_x;
 			dist_y = resizeorigin_y - targEndPos_y;
-			if (dist_y < 0 || dist_x / dist_y > ratio)
+			if (dist_y < 0)
 				mySize_x = min(mySize_x, dist_x);
 			else
 				mySize_y = min(mySize_y, dist_y);
@@ -1087,7 +963,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float
 
 			dist_x = targPos_x - resizeorigin_x;
 			dist_y = resizeorigin_y - targEndPos_y;
-			if (dist_y < 0 || dist_x / dist_y > ratio)
+			if (dist_y < 0)
 				mySize_x = min(mySize_x, dist_x);
 			else
 				mySize_y = min(mySize_y, dist_y);
@@ -1105,7 +981,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float
 
 			dist_x = resizeorigin_x - targEndPos_x;
 			dist_y = targPos_y - resizeorigin_y;
-			if (dist_y < 0 || dist_x / dist_y > ratio)
+			if (dist_y < 0)
 				mySize_x = min(mySize_x, dist_x);
 			else
 				mySize_y = min(mySize_y, dist_y);
@@ -1123,7 +999,7 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float
 
 			dist_x = targPos_x - resizeorigin_x;
 			dist_y = targPos_y - resizeorigin_y;
-			if (dist_y < 0 || dist_x / dist_y > ratio)
+			if (dist_y < 0)
 				mySize_x = min(mySize_x, dist_x);
 			else
 				mySize_y = min(mySize_y, dist_y);
@@ -1165,30 +1041,6 @@ void HUD_Panel_SetPosSize(float id)
 		mySize_y = max(2 * cvar("con_chatsize") + 2 * HUD_Panel_GetPadding(id), mySize_y);
 	}
 
-	// cap against panel's own limits
-	vector minSize;
-	minSize = HUD_Panel_GetMinSize(id); // mySize_x at least minSize_x * mySize_y, and vice versa
-	float fixedRatio;
-	if(!minSize_x && minSize_y) // forced aspect ratio
-	{
-		minSize_x = 1/minSize_y;
-		fixedRatio = minSize_x;
-		mySize_x = max(minSize_x * mySize_y, mySize_x);
-		mySize_y = max(minSize_y * mySize_x, mySize_y);
-	}
-	else if(minSize_x && !minSize_y) // hybrid aspect ratio, currently supported only in one dimension
-	{
-		if (mySize_x/mySize_y < minSize_x) // resizing in x direction allows free aspect ratio
-		{
-			fixedRatio = minSize_x;
-			minSize_y = 1/minSize_x;
-			mySize_y = max(minSize_y * mySize_x, mySize_y);
-			mySize_x = max(minSize_x * mySize_y, mySize_x);
-		}
-		else
-			fixedRatio = -minSize_x; //negative so that it will be used ONLY after checkResize
-	}
-
 	// collision testing|
 	// -----------------+
 
@@ -1225,55 +1077,13 @@ void HUD_Panel_SetPosSize(float id)
 	// before checkresize, otherwise panel can be snapped partially inside another panel or panel aspect ratio can be broken
 	if(cvar("hud_configure_grid"))
 	{
-		mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * cvar("hud_configure_grid_x") * vid_conwidth;
-		mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * cvar("hud_configure_grid_y") * vid_conheight;
-	}
-
-	if (fixedRatio > 0)
-	{
-		// keep aspect ratio _MAXIMIZING_ the size
-		if (mySize_x / mySize_y > fixedRatio)
-			mySize_y = mySize_x / fixedRatio;
-		else
-			mySize_x = mySize_y * fixedRatio;
+		mySize_x = floor((mySize_x/vid_conwidth)/bound(0.005, cvar("hud_configure_grid_x"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_x"), 0.2) * vid_conwidth;
+		mySize_y = floor((mySize_y/vid_conheight)/bound(0.005, cvar("hud_configure_grid_y"), 0.2) + 0.5) * bound(0.005, cvar("hud_configure_grid_y"), 0.2) * vid_conheight;
 	}
 
 	if(cvar("hud_configure_checkcollisions"))
 	{
-		if (fixedRatio > 0)
-		{
-			mySize = HUD_Panel_CheckResize(id, mySize, resizeorigin, fixedRatio);
-
-			// Make sure once more that we DON'T cross the screen edges
-			// left/top screen edges
-			if(myPos_x < 0)
-				mySize_x = mySize_x + myPos_x;
-			if(myPos_y < 0)
-				mySize_y = mySize_y + myPos_y;
-
-			// bottom/right screen edges
-			if(myPos_x + mySize_x > vid_conwidth)
-				mySize_x = vid_conwidth - myPos_x;
-			if(myPos_y + mySize_y > vid_conheight)
-				mySize_y = vid_conheight - myPos_y;
-
-			// restore again aspect ratio, _minimizing_ the size
-			if (mySize_x / mySize_y < fixedRatio)
-				mySize_y = mySize_x / fixedRatio;
-			else
-				mySize_x = mySize_y * fixedRatio;
-		}
-		else
-		{
-			mySize = HUD_Panel_CheckResize(id, mySize, resizeorigin, mySize_x / mySize_y);
-			if (fixedRatio < 0)
-			{
-				fixedRatio = -fixedRatio;
-				// restore again aspect ratio, _minimizing_ the size
-				if (mySize_x / mySize_y < fixedRatio)
-					mySize_y = mySize_x / fixedRatio;
-			}
-		}
+		mySize = HUD_Panel_CheckResize(id, mySize, resizeorigin);
 	}
 
 	// minimum panel size cap, do this once more so we NEVER EVER EVER have a panel smaller than this, JUST IN CASE above code still makes the panel eg negative (impossible to resize back without changing cvars manually then)
@@ -1497,7 +1307,6 @@ void HUD_WeaponIcons_Clear()
 }
 
 entity weaponorder[WEP_MAXCOUNT];
-
 void weaponorder_swap(float i, float j, entity pass)
 {
 	entity h;
@@ -1506,6 +1315,7 @@ void weaponorder_swap(float i, float j, entity pass)
 	weaponorder[j] = h;
 }
 
+string weaponorder_cmp_str_save;
 string weaponorder_cmp_str;
 float weaponorder_cmp(float i, float j, entity pass)
 {
@@ -1526,19 +1336,34 @@ void HUD_WeaponIcons(void)
 	mySize = HUD_Panel_GetSize(id);
 
 	stat_weapons = getstati(STAT_WEAPONS);
+	weapon_cnt = 0;
 	for(i = WEP_FIRST; i <= WEP_LAST; ++i)
 	{
 		self = get_weaponinfo(i);
-		if(self.weapons && (self.impulse >= 0) && (stat_weapons & self.weapons) || hud_configure)
-		{
-			weaponorder[weapon_cnt] = self;
+		if(self.impulse >= 0)
 			++weapon_cnt;
-		}
 	}
 
 	// TODO make this configurable
 	weaponorder_cmp_str = strcat(" ", weaponorder_byimpulse, " ");
-	heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world);
+
+	if(weaponorder_cmp_str != weaponorder_cmp_str_save)
+	{
+		if(weaponorder_cmp_str_save)
+			strunzone(weaponorder_cmp_str_save);
+		weaponorder_cmp_str_save = strzone(weaponorder_cmp_str);
+		weapon_cnt = 0;
+		for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+		{
+			self = get_weaponinfo(i);
+			if(self.impulse >= 0)
+			{
+				weaponorder[weapon_cnt] = self;
+				++weapon_cnt;
+			}
+		}
+		heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world);
+	}
 
 	HUD_Panel_DrawBg(id, pos, mySize, 0);
 	float padding;
@@ -1578,36 +1403,41 @@ void HUD_WeaponIcons(void)
 	for(i = 0; i < weapon_cnt; ++i)
 	{
 		self = weaponorder[i];
-		if((self.weapons && (self.impulse >= 0) && (stat_weapons & self.weapons)) || hud_configure)
-		{
-			weapid = self.impulse;
+		weapid = self.impulse;
 
-			alpha = (self.weapon == activeweapon) ? 1 : 0.6;
+		alpha = (self.weapon == activeweapon) ? 1 : 0.6;
 
-			weapon_hit = weapon_hits[self.weapon-WEP_FIRST];
-			weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
+		weapon_hit = weapon_hits[self.weapon-WEP_FIRST];
+		weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
 
-			// draw background behind currently selected weapon
-			if(self.weapon == activeweapon)
-				drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_current_bg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		// draw background behind currently selected weapon
+		if(self.weapon == activeweapon)
+			drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_current_bg", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 
-			// draw the weapon accuracy on the HUD
-			if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
-			{
-				if(weapon_damage)
-					weapon_stats = floor(100 * weapon_hit / weapon_damage);
+		// draw the weapon accuracy on the HUD
+		if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
+		{
+			if(weapon_damage)
+				weapon_stats = floor(100 * weapon_hit / weapon_damage);
 
-				accuracy_color = HUD_AccuracyColor(weapon_stats);
-				if(weapon_damage)
-					drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_accuracy", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), accuracy_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			}
+			accuracy_color = HUD_AccuracyColor(weapon_stats);
+			if(weapon_damage)
+				drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), "weapon_accuracy", eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), accuracy_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		}
 
-			// draw the weapon icon
+		// draw the weapon icon
+		if((self.impulse >= 0) && (stat_weapons & self.weapons))
+		{
 			drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '1 1 1', fade * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 
 			if(cvar_or("hud_weaponicons_number", 1))
 				drawstring(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), ftos(weapid), '1 1 0' * 0.5 * mySize_y*(1/rows), '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
+		// draw a "ghost weapon icon" if you don't have the weapon
+		else
+		{
+			drawpic_skin(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), strcat("weapon", self.netname), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), '0 0 0', HUD_Panel_GetFgAlpha(id) * 0.5, DRAWFLAG_NORMAL);
+		}
 
 		++row;
 		if(row >= rows)
@@ -1660,13 +1490,68 @@ string GetAmmoPicture(float i)
 	}
 }
 
+void DrawAmmoItem(vector myPos, vector mySize, float itemcode, float currently_selected)
+{
+	float a;
+	a = getstati(GetAmmoStat(itemcode)); // how much ammo do we have of type itemcode?
+	if(hud_configure)
+		a = 100;
+
+	vector color;
+	if(a < 10)
+		color = '0.7 0 0';
+	else
+		color = '1 1 1';
+
+	float alpha;
+	if(currently_selected)
+		alpha = 1;
+	else
+		alpha = 0.7;
+
+	vector newSize, newPos;
+	if(mySize_x/mySize_y > 3)
+	{
+		newSize_x = 3 * mySize_y;
+		newSize_y = mySize_y;
+
+		newPos_x = myPos_x + (mySize_x - newSize_x) / 2;
+		newPos_y = myPos_y;
+	}
+	else
+	{
+		newSize_y = 1/3 * mySize_x;
+		newSize_x = mySize_x;
+
+		newPos_y = myPos_y + (mySize_y - newSize_y) / 2;
+		newPos_x = myPos_x;
+	}
+
+	vector picpos, numpos;
+	if(cvar("hud_inventory_iconalign"))
+	{
+		numpos = newPos;
+		picpos = newPos + eX * 2 * newSize_y;
+	}
+	else
+	{
+		numpos = newPos + eX * newSize_y;
+		picpos = newPos;
+	}
+
+	if (currently_selected)
+		drawpic_skin(newPos, "ammo_current_bg", newSize, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_INVENTORY), DRAWFLAG_NORMAL);
+
+	drawstring_aspect(numpos, ftos(a), eX * (2/3) * newSize_x + eY * newSize_y, newSize_y, color, HUD_Panel_GetFgAlpha(HUD_PANEL_INVENTORY) * alpha, DRAWFLAG_NORMAL);
+	drawpic_skin(picpos, GetAmmoPicture(itemcode), '1 1 0' * newSize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_INVENTORY) * alpha, DRAWFLAG_NORMAL);
+}
+
 void HUD_Inventory(void)
 {
 	float id = HUD_PANEL_INVENTORY;
-	float i;
-	float stat_items;
+	float i, currently_selected;
 
-	vector pos, mySize, mysize, mypos;
+	vector pos, mySize;
 	pos = HUD_Panel_GetPos(id);
 	mySize = HUD_Panel_GetSize(id);
 
@@ -1679,77 +1564,35 @@ void HUD_Inventory(void)
 		mySize -= '2 2 0' * padding;
 	}
 
-	// ammo
-	stat_items = getstati(STAT_ITEMS);
-	for (i = 0; i < 4; ++i) {
-		float a;
-		a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?
-		if(hud_configure)
-			a = 100;
+	float rows, columns;
+	rows = mySize_y/mySize_x;
+	rows = bound(1, floor((sqrt(4 * (3/1) * rows * AMMO_COUNT + rows * rows) + rows + 0.5) / 2), AMMO_COUNT);
+	//                               ^^^ ammo item aspect goes here
 
+	columns = ceil(AMMO_COUNT/rows);
+
+	float row, column;
+	// ammo
+	for (i = 0; i < AMMO_COUNT; ++i) {
+		currently_selected = getstati(STAT_ITEMS) & GetAmmoItemCode(i);
 		if(cvar("hud_inventory_onlycurrent")) {
 			if(hud_configure)
 				i = 2;
-			if (stat_items & GetAmmoItemCode(i) || hud_configure) {
-				drawpic_skin(pos, GetAmmoPicture(i), '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				if(a < 10)
-					HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				else
-					HUD_DrawXNum(pos + eX * mySize_y + eY * 0.25 * mySize_y, a, strlen(ftos(a)), 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			}
-			if(hud_configure)
-				break;
+			if (currently_selected || hud_configure)
+				DrawAmmoItem(pos, mySize, i, currently_selected);
+			break;
 		} else {
-			if (a > 0) {
-				if(mySize_x/mySize_y >= 10) { // arrange horizontally
-					switch (i) {
-						case 0: mypos_x = pos_x; 			mypos_y = pos_y; 			break; // shells
-						case 1: mypos_x = pos_x + 0.25 * mySize_x;	mypos_y = pos_y; 			break; // bullets
-						case 2: mypos_x = pos_x + 0.5  * mySize_x; 	mypos_y = pos_y; 			break; // rockets
-						case 3: mypos_x = pos_x + 0.75 * mySize_x; 	mypos_y = pos_y;			break; // cells
-					}
-					mysize_x = 0.25 * mySize_x;
-					mysize_y = mySize_y;
-				} else if(mySize_x/mySize_y >= 2.5) { // arrange in a 2x2 grid
-					switch (i) {
-						case 0: mypos_x = pos_x + 0.5 * mySize_x; 	mypos_y = pos_y + 0.5 * mySize_y; 	break; // shells
-						case 1: mypos_x = pos_x + 0.5 * mySize_x;	mypos_y = pos_y; 			break; // bullets
-						case 2: mypos_x = pos_x; 			mypos_y = pos_y + 0.5 * mySize_y; 	break; // rockets
-						case 3: mypos_x = pos_x; 			mypos_y = pos_y; 			break; // cells
-					}
-					mysize_x = 0.5 * mySize_x;
-					mysize_y = 0.5 * mySize_y;
-				} else { // arrange vertically
-					switch (i) {
-						case 0: mypos_x = pos_x; 			mypos_y = pos_y; 			break; // shells
-						case 1: mypos_x = pos_x;			mypos_y = pos_y + 0.25 * mySize_y; 	break; // bullets
-						case 2: mypos_x = pos_x; 			mypos_y = pos_y + 0.5  * mySize_y; 	break; // rockets
-						case 3: mypos_x = pos_x; 			mypos_y = pos_y + 0.75 * mySize_y; 	break; // cells
-					}
-					mysize_x = mySize_x;
-					mysize_y = 0.25 * mySize_y;
-				}
-
-				if (stat_items & GetAmmoItemCode(i))
-					drawpic_skin(mypos, "ammo_current_bg", mysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				drawpic_skin(mypos + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				if (a < 10) {
-					if(stat_items & GetAmmoItemCode(i))
-						HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-					else
-						HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0 0', 0, 0, HUD_Panel_GetFgAlpha(id) * 0.7, DRAWFLAG_NORMAL);
-				} else {
-					if(stat_items & GetAmmoItemCode(i))
-						HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-					else
-						HUD_DrawXNum(mypos + eX * 0.8 * mysize_y + eY * 0.25 * mysize_y, a, strlen(ftos(a)), 0, 0.5 * mysize_y, '0.7 0.7 0.7', 0, 0, HUD_Panel_GetFgAlpha(id) * 0.7, DRAWFLAG_NORMAL);
-				}
+			DrawAmmoItem(pos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows), eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows), i, currently_selected);
+			++row;
+			if(row >= rows)
+			{
+				row = 0;
+				column = column + 1;
 			}
 		}
 	}
 }
 
-
 // Powerups (#2)
 //
 void HUD_Powerups(void) {
@@ -1791,8 +1634,6 @@ void HUD_Powerups(void) {
 		shield_time = 27;
 	}
 
-	float len;
-
 	vector barpos, barsize;
 	vector picpos;
 	vector numpos;
@@ -1821,122 +1662,136 @@ void HUD_Powerups(void) {
 	leftalpha = bound(0, leftexact, 1);
 	rightalpha = bound(0, rightexact, 1);
 
+	float baralign, iconalign;
+	baralign = cvar(strcat("hud_", HUD_Panel_GetName(id), "_baralign"));
+	iconalign = cvar(strcat("hud_", HUD_Panel_GetName(id), "_iconalign"));
+
 	if (mySize_x/mySize_y > 4)
 	{
 		if(leftcnt)
 		{
-			len = strlen(ftos(leftcnt));
-
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+			if(baralign == 1 || baralign == 3) { // right align
 				barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/30);
 				barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y;
-				picpos = pos + eX * 0.5 * mySize_x - eX * mySize_y;
-				numpos = picpos - eX * 2 * 0.5 * mySize_y + eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
-			} else {
+			} else { // left align
 				barpos = pos;
 				barsize = eX * 0.5 * mySize_x * min(1, leftcnt/30) + eY * mySize_y;
+			}
+
+			if(iconalign == 1 || iconalign == 3) { // right align
+				picpos = pos + eX * (2/6) * mySize_x;
+				numpos = pos;
+			} else { // left align
 				picpos = pos;
-				numpos = picpos + eX * mySize_y - eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
+				numpos = pos + eX * (1/6) * mySize_x;
 			}
 
 			HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			if(leftcnt <= 5)
 				drawpic_skin_expanding_two(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1));
 			else
-				drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(numpos, leftcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawpic_skin(picpos, leftname, eX * (1/6) * mySize_x + eY * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawstring_aspect(numpos, ftos(leftcnt), eX * (2/6) * mySize_x + eY * mySize_y, mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
 
 		if(rightcnt)
 		{
-			len = strlen(ftos(rightcnt));
-
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+			if(baralign == 0 || baralign == 3) { // left align
 				barpos = pos + eX * 0.5 * mySize_x;
 				barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y;
-				picpos = pos + eX * 0.5 * mySize_x;
-				numpos = picpos + eX * mySize_y - eX * (2-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
-			} else {
+			} else { // right align
 				barpos = pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/30);
 				barsize = eX * 0.5 * mySize_x * min(1, rightcnt/30) + eY * mySize_y;
-				picpos = pos + eX * mySize_x - eX * mySize_y;
-				numpos = picpos - eX * mySize_y + eY * 0.25 * mySize_y;
+			}
+
+			if(iconalign == 0 || iconalign == 3) { // left align
+				picpos = pos + eX * (3/6) * mySize_x;
+				numpos = pos + eX * (4/6) * mySize_x;
+			} else { // right align
+				picpos = pos + eX * (5/6) * mySize_x;
+				numpos = pos + eX * (3/6) * mySize_x;
 			}
 
 			HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			if(rightcnt <= 5)
 				drawpic_skin_expanding_two(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1));
 			else
-				drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(numpos, rightcnt, 2, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawpic_skin(picpos, rightname, eX * (1/6) * mySize_x + eY * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawstring_aspect(numpos, ftos(rightcnt), eX * (2/6) * mySize_x + eY * mySize_y, mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
 	}
 	else if (mySize_x/mySize_y > 1.5)
 	{
 		if(leftcnt)
 		{
-			len = strlen(ftos(leftcnt));
-
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+			if(baralign == 1 || baralign == 3) { // right align
 				barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/30);
 				barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y;
-				picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y;
-				numpos = picpos - eX * len * 0.5 * mySize_y;
-			} else {
+			} else { // left align
 				barpos = pos;
 				barsize = eX * mySize_x * min(1, leftcnt/30) + eY * 0.5 * mySize_y;
+			}
+
+			if(iconalign == 1 || iconalign == 3) { // right align
+				picpos = pos + eX * (2/3) * mySize_x;
+				numpos = pos;
+			} else { // left align
 				picpos = pos;
-				numpos = picpos + eX * 0.5 * mySize_y;
+				numpos = pos + eX * (1/3) * mySize_x;
 			}
 
 			HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			if(leftcnt <= 5)
 				drawpic_skin_expanding_two(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1));
 			else
-				drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(numpos, leftcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawpic_skin(picpos, leftname, eX * (1/3) * mySize_x + eY * 0.5 * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawstring_aspect(numpos, ftos(leftcnt), eX * (2/3) * mySize_x + eY * 0.5 * mySize_y, mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
 
 		if(rightcnt)
 		{
-			len = strlen(ftos(rightcnt));
-
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-				barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
-				barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
-				picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y + eY * 0.5 * mySize_y;
-				numpos = picpos - eX * len * 0.5 * mySize_y;
-			} else {
+			if(baralign == 0 || baralign == 3) { // left align
 				barpos = pos + eY * 0.5 * mySize_y;
 				barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
+			} else { // right align
+				barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
+				barsize = eX * mySize_x * min(1, rightcnt/30) + eY * 0.5 * mySize_y;
+			}
+
+			if(iconalign == 0 || iconalign == 3) { // left align
 				picpos = pos + eY * 0.5 * mySize_y;
-				numpos = picpos + eX * 0.5 * mySize_y;
+				numpos = pos + eX * (1/3) * mySize_x + eY * 0.5 * mySize_y;
+			} else { // right align
+				picpos = pos + eX * (2/3) * mySize_x + eY * 0.5 * mySize_y;
+				numpos = pos + eY * 0.5 * mySize_y;
 			}
 
 			HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			if(rightcnt <= 5)
 				drawpic_skin_expanding_two(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1));
 			else
-				drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(numpos, rightcnt, len, 0, 0.5 * mySize_y, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawpic_skin(picpos, rightname, eX * (1/3) * mySize_x + eY * 0.5 * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawstring_aspect(numpos, ftos(rightcnt), eX * (2/3) * mySize_x + eY * 0.5 * mySize_y, mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
 	}
 	else
 	{
 		if(leftcnt)
 		{
-			len = strlen(ftos(leftcnt));
-
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+			if(baralign == 1 || baralign == 3) { // down align
+				barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30);
+				barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30);
+			} else { // up align
 				barpos = pos;
 				barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30);
+			}
+
+			if(iconalign == 1 || iconalign == 3) { // down align
+				picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x);
+				numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x;
+			} else { // up align
 				picpos = pos + eX * 0.05 * mySize_x;
-				numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x;
-			} else {
-				barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/30);
-				barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/30);
-				picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.65 * mySize_x;
-				numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.25 * mySize_x;
+				numpos = pos + eY * 0.4 * mySize_x;
 			}
 
 			HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
@@ -1944,23 +1799,25 @@ void HUD_Powerups(void) {
 				drawpic_skin_expanding_two(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (leftcnt - leftexact) / 0.5, 1));
 			else
 				drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(numpos, leftcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, 0.25 * mySize_x, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
 
 		if(rightcnt)
 		{
-			len = strlen(ftos(rightcnt));
-
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+			if(baralign == 0 || baralign == 3) { // up align
 				barpos = pos + eX * 0.5 * mySize_x;
 				barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30);
-				picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
-				numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
-			} else {
+			} else { // down align
 				barpos = pos + eY * mySize_y - eY * mySize_y * min(1, rightcnt/30) + eX * 0.5 * mySize_x;
 				barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/30);
-				picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.65 * mySize_x + eX * 0.5 * mySize_x;
-				numpos = pos + eX * ((2-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x;
+			}
+
+			if(iconalign == 0 || iconalign == 3) { // up align
+				picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
+				numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
+			} else { // down align
+				picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x) + eX * 0.5 * mySize_x;
+				numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x;
 			}
 
 			HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
@@ -1968,7 +1825,7 @@ void HUD_Powerups(void) {
 				drawpic_skin_expanding_two(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE, bound(0, (rightcnt - rightexact) / 0.5, 1));
 			else
 				drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(numpos, rightcnt, len, 0, 0.25 * mySize_x, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, 0.25 * mySize_x, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
 	}
 }
@@ -2008,7 +1865,6 @@ void HUD_HealthArmor(void)
 	if(health <= 0)
 		return;
 
-	float len;
 	vector barpos, barsize;
 	vector picpos;
 	vector numpos;
@@ -2047,7 +1903,7 @@ void HUD_HealthArmor(void)
 			if(armor)
 				drawpic_skin(picpos, "armor", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		}
-		HUD_DrawXNum_Colored(numpos, x, 3, mySize_y, HUD_Panel_GetFgAlpha(id)); // draw the combined health and armor
+		//HUD_DrawXNum_Colored(numpos, x, 3, mySize_y, HUD_Panel_GetFgAlpha(id)); // draw the combined health and armor
 
 		// fuel
 		if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
@@ -2060,7 +1916,6 @@ void HUD_HealthArmor(void)
 		if(fuel)
 			HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL);
 	}
-
 	else
 	{
 		string leftname, rightname;
@@ -2091,167 +1946,189 @@ void HUD_HealthArmor(void)
 			rightalpha = min((armor+10)/55, 1);
 		}
 
+		float baralign, iconalign;
+		baralign = cvar(strcat("hud_", HUD_Panel_GetName(id), "_baralign"));
+		iconalign = cvar(strcat("hud_", HUD_Panel_GetName(id), "_iconalign"));
+
 		if (mySize_x/mySize_y > 5)
 		{
 			if(leftactive)
 			{
-				len = strlen(ftos(leftcnt));
-
-				if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+				if(baralign == 1 || baralign == 3) { // right align
 					barpos = pos + eX * 0.5 * mySize_x - eX * 0.5 * mySize_x * min(1, leftcnt/200);
 					barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y;
-					picpos = pos + eX * 0.5 * mySize_x - eX * mySize_y;
-					numpos = picpos - eX * 3 * 0.5 * mySize_y + eX * (3-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
-				} else {
+				} else { // left align
 					barpos = pos;
 					barsize = eX * 0.5 * mySize_x * min(1, leftcnt/200) + eY * mySize_y;
+				}
+
+				if(iconalign == 1 || iconalign == 3) { // right align
+					picpos = pos + eX * (2/6) * mySize_x;
+					numpos = pos;
+				} else { // left align
 					picpos = pos;
-					numpos = picpos + eX * mySize_y + eY * 0.25 * mySize_y;
+					numpos = pos + eX * (1/6) * mySize_x;
 				}
 
 				HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				drawpic_skin(picpos, leftname, '1 1 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+				drawpic_skin(picpos, leftname, eX * (1/6) * mySize_x + eY * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawstring_aspect(numpos, ftos(leftcnt), eX * (2/6) * mySize_x + eY * mySize_y, mySize_y, HUD_Get_Num_Color(leftcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			}
 
 			if(rightactive)
 			{
-				len = strlen(ftos(rightcnt));
-
-				if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+				if(baralign == 0 || baralign == 3) { // left align
 					barpos = pos + eX * 0.5 * mySize_x;
 					barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y;
-					picpos = pos + eX * 0.5 * mySize_x;
-					numpos = picpos + eX * mySize_y - eX * (3-len) * 0.5 * mySize_y + eY * 0.25 * mySize_y;
-				} else {
+				} else { // right align
 					barpos = pos + eX * mySize_x - eX * 0.5 * mySize_x * min(1, rightcnt/200);
 					barsize = eX * 0.5 * mySize_x * min(1, rightcnt/200) + eY * mySize_y;
-					picpos = pos + eX * mySize_x - eX * mySize_y;
-					numpos = picpos - eX * 1.5 * mySize_y + eY * 0.25 * mySize_y;
+				}
+
+				if(iconalign == 0 || iconalign == 3) { // left align
+					picpos = pos + eX * (3/6) * mySize_x;
+					numpos = pos + eX * (4/6) * mySize_x;
+				} else { // right align
+					picpos = pos + eX * (5/6) * mySize_x;
+					numpos = pos + eX * (3/6) * mySize_x;
 				}
 
 				HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				drawpic_skin(picpos, rightname, '1 1 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum_Colored(numpos, rightcnt, 3, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+				drawpic_skin(picpos, rightname, eX * (1/6) * mySize_x + eY * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawstring_aspect(numpos, ftos(rightcnt), eX * (2/6) * mySize_x + eY * mySize_y, mySize_y, HUD_Get_Num_Color(rightcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			}
 
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-				barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
-				barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
-			} else {
-				barpos = pos;
-				barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
-			}
 			if(fuel)
+			{
+				if(baralign == 0 || baralign == 3) { // left align
+					barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
+					barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
+				} else {
+					barpos = pos;
+					barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.2 * mySize_y;
+				}
 				HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL);
+			}
 		}
 		else if (mySize_x/mySize_y > 2)
 		{
 			if(leftactive)
 			{
-				len = strlen(ftos(leftcnt));
-
-				if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+				if(baralign == 1 || baralign == 3) { // right align
 					barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/200);
-					barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y;
-					picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y;
-					numpos = picpos - eX * len * 0.5 * mySize_y;
-				} else {
+					barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
+				} else { // left align
 					barpos = pos;
-					barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y;
+					barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
+				}
+
+				if(iconalign == 1 || iconalign == 3) { // right align
+					picpos = pos + eX * (2/3) * mySize_x;
+					numpos = pos;
+				} else { // left align
 					picpos = pos;
-					numpos = picpos + eX * 0.5 * mySize_y;
+					numpos = pos + eX * (1/3) * mySize_x;
 				}
 
 				HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				drawpic_skin(picpos, leftname, '0.5 0.5 0' * mySize_y, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+				drawpic_skin(picpos, leftname, eX * (1/3) * mySize_x + eY * 0.5 * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawstring_aspect(numpos, ftos(leftcnt), eX * (2/3) * mySize_x + eY * 0.5 * mySize_y, mySize_y, HUD_Get_Num_Color(leftcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			}
 
 			if(rightactive)
 			{
-				len = strlen(ftos(rightcnt));
-
-				if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-					barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
-					barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
-					picpos = pos + eX * mySize_x - eX * 0.5 * mySize_y + eY * 0.5 * mySize_y;
-					numpos = picpos - eX * len * 0.5 * mySize_y;
-				} else {
+				if(baralign == 0 || baralign == 3) { // left align
 					barpos = pos + eY * 0.5 * mySize_y;
 					barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
+				} else { // right align
+					barpos = pos + eX * mySize_x - eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
+					barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y;
+				}
+
+				if(iconalign == 0 || iconalign == 3) { // left align
 					picpos = pos + eY * 0.5 * mySize_y;
-					numpos = picpos + eX * 0.5 * mySize_y;
+					numpos = pos + eX * (1/3) * mySize_x + eY * 0.5 * mySize_y;
+				} else { // right align
+					picpos = pos + eX * (2/3) * mySize_x + eY * 0.5 * mySize_y;
+					numpos = pos + eY * 0.5 * mySize_y;
 				}
 
 				HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				drawpic_skin(picpos, rightname, '0.5 0.5 0' * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.5 * mySize_y, HUD_Panel_GetFgAlpha(id));
+				drawpic_skin(picpos, rightname, eX * (1/3) * mySize_x + eY * 0.5 * mySize_y, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawstring_aspect(numpos, ftos(rightcnt), eX * (2/3) * mySize_x + eY * 0.5 * mySize_y, mySize_y, HUD_Get_Num_Color(rightcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			}
 
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-				barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
-				barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y;
-			} else {
-				barpos = pos;
-				barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y;
-			}
 			if(fuel)
+			{
+				if(baralign == 0 || baralign == 3) { // left align
+					barpos = pos + eX * mySize_x - eX * mySize_x * min(1, fuel/100);
+					barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y;
+				} else {
+					barpos = pos;
+					barsize = eX * mySize_x * min(1, fuel/100) + eY * 0.1 * mySize_y;
+				}
 				HUD_Panel_DrawProgressBar(barpos, 0, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL);
+			}
 		}
 		else
 		{
 			if(leftactive)
 			{
-				len = strlen(ftos(leftcnt));
-
-				if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+				if(baralign == 1 || baralign == 3) { // down align
+					barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200);
+					barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200);
+				} else { // up align
 					barpos = pos;
 					barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200);
+				}
+
+				if(iconalign == 1 || iconalign == 3) { // down align
+					picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x);
+					numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x;
+				} else { // up align
 					picpos = pos + eX * 0.05 * mySize_x;
-					numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x;
-				} else {
-					barpos = pos + eY * mySize_y - eY * mySize_y * min(1, leftcnt/200);
-					barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, leftcnt/200);
-					picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.566 * mySize_x;
-					numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.166 * mySize_x;
+					numpos = pos + eY * 0.4 * mySize_x;
 				}
 
 				HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(leftname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 				drawpic_skin(picpos, leftname, '0.4 0.4 0' * mySize_x, '1 1 1', leftalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum_Colored(numpos, leftcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id));
+				drawstring_aspect(numpos, ftos(leftcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, 0.25 * mySize_x, HUD_Get_Num_Color(leftcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			}
 
 			if(rightactive)
 			{
-				len = strlen(ftos(rightcnt));
-
-				if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
+				if(baralign == 0 || baralign == 3) { // up align
 					barpos = pos + eX * 0.5 * mySize_x;
 					barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200);
-					picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
-					numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
-				} else {
+				} else { // down align
 					barpos = pos + eY * mySize_y - eY * mySize_y * min(1, rightcnt/200) + eX * 0.5 * mySize_x;
 					barsize = eX * 0.5 * mySize_x + eY * mySize_y * min(1, rightcnt/200);
-					picpos = pos + eX * 0.05 * mySize_x + eY * mySize_y - eY * 0.566 * mySize_x + eX * 0.5 * mySize_x;
-					numpos = pos + eX * ((3-len)/2) * 0.25 * mySize_x + eY * mySize_y - eY * 0.166 * mySize_x + eX * 0.5 * mySize_x;
+				}
+
+				if(iconalign == 0 || iconalign == 3) { // up align
+					picpos = pos + eX * 0.05 * mySize_x + eX * 0.5 * mySize_x;
+					numpos = pos + eY * 0.4 * mySize_x + eX * 0.5 * mySize_x;
+				} else { // down align
+					picpos = pos + eX * 0.05 * mySize_x + eY * (mySize_y - 0.65 * mySize_x) + eX * 0.5 * mySize_x;
+					numpos = pos + eY * mySize_y - eY * 0.25 * mySize_x + eX * 0.5 * mySize_x;
 				}
 
 				HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor(rightname), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 				drawpic_skin(picpos, rightname, '0.4 0.4 0' * mySize_x, '1 1 1', rightalpha * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum_Colored(numpos, rightcnt, len, 0.166 * mySize_x, HUD_Panel_GetFgAlpha(id));
+				drawstring_aspect(numpos, ftos(rightcnt), eX * 0.5 * mySize_x + eY * 0.25 * mySize_x, 0.25 * mySize_x, HUD_Get_Num_Color(rightcnt, 200), HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			}
 
-			if(cvar(strcat("hud_", HUD_Panel_GetName(id), "_mirror"))) {
-				barpos = pos;
-				barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100);
-			} else {
-				barpos = pos + eY * mySize_y - eY * mySize_y * min(1, fuel/100);
-				barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100);
-			}
 			if(fuel)
+			{
+				if(baralign == 0 || baralign == 3) { // left align
+					barpos = pos;
+					barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100);
+				} else {
+					barpos = pos + eY * mySize_y - eY * mySize_y * min(1, fuel/100);
+					barsize = eX * 0.05 * mySize_x + eY * mySize_y * min(1, fuel/100);
+				}
 				HUD_Panel_DrawProgressBar(barpos, 1, barsize, HUD_Panel_GetProgressBarColor("fuel"), HUD_Panel_GetFgAlpha(id) * 0.8, DRAWFLAG_NORMAL);
+			}
 		}
 	}
 }
@@ -2333,8 +2210,8 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
 			HUD_KillNotify_Push(s1, "", 0, DEATH_CAMP);
 			if (alsoprint)
 				print ("^1",s1, "^1 thought they found a nice camping ground\n");
-		} else if (type == DEATH_MIRRORDAMAGE) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_MIRRORDAMAGE);
+		} else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
+			HUD_KillNotify_Push(s1, "", 0, type);
 			if (alsoprint)
 				print ("^1",s1, "^1 didn't become friends with the Lord of Teamplay\n");
 		} else if (type == DEATH_CHEAT) {
@@ -2360,8 +2237,8 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
 			if (alsoprint)
 				print("^1", s1, "^1 ", Weapon_KillMessage(type), "\n");
 		}
-		else if(type == KILL_TEAM || type == KILL_TEAM_SPREE) {
-			HUD_KillNotify_Push(s1, s2, 1, DEATH_MIRRORDAMAGE);
+		else if(type == KILL_TEAM_RED || type == KILL_TEAM_BLUE || type == KILL_TEAM_SPREE) {
+			HUD_KillNotify_Push(s1, s2, 1, type);
 			if(alsoprint)
 			{
 				if(cvar("cl_gentle")) {
@@ -2372,15 +2249,15 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
 			}
 			if (stof(s2) > 2 && type == KILL_TEAM_SPREE) {
 				if(cvar("cl_gentle"))
-					print ("^1",s1,"^1 ended a ",s2," scoring spree by going against a team mate\n");
+					print ("^1",s1,"^1 ended a ",s3," scoring spree by going against a team mate\n");
 				else
-					print ("^1",s1,"^1 ended a ",s2," kill spree by killing a team mate\n");
+					print ("^1",s1,"^1 ended a ",s3," kill spree by killing a team mate\n");
 			}
 			else if (stof(s2) > 2) {
 				if(cvar("cl_gentle"))
-					print ("^1",s1,"'s ^1",s2," scoring spree was ended by a team mate!\n");
+					print ("^1",s1,"'s ^1",s3," scoring spree was ended by a team mate!\n");
 				else
-					print ("^1",s1,"'s ^1",s2," kill spree was ended by a team mate!\n");
+					print ("^1",s1,"'s ^1",s3," kill spree was ended by a team mate!\n");
 			}
 		}
 		else if(type == KILL_FIRST_BLOOD)
@@ -2653,7 +2530,7 @@ void HUD_Centerprint(string s1, string s2, float type, float msg)
 				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to preserve your health"));
 			else
 				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You grew too old without taking your medicine"));
-		} else if (type == DEATH_MIRRORDAMAGE) {
+		} else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
 			if(cvar("cl_gentle"))
 				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't go against team mates!"));
 			else
@@ -2667,9 +2544,9 @@ void HUD_Centerprint(string s1, string s2, float type, float msg)
 				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You killed your own dumb self!"));
 		}
 	} else if(msg == MSG_KILL) {
-		if (type == KILL_TEAM) {
+		if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
 			if(cvar("cl_gentle")) {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against a team mate!"));
+				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against", s1, ",a team mate!"));
 			} else {
 				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You fragged ", s1, ", a team mate!"));
 			}
@@ -2687,13 +2564,13 @@ void HUD_Centerprint(string s1, string s2, float type, float msg)
 			}
 		} else if (type == KILL_TYPEFRAG) { // s2 contains "advanced kill messages" such as ping, handicap...
 			if(cvar("cl_gentle")) {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You scored against ^7", s1, "^7 who was typing!", s2));
+				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You scored against ^7", s1, "^1 who was typing!", s2));
 			} else {
 				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You typefragged ^7", s1, s2));
 			}
 		} else if (type == KILL_TYPEFRAGGED) {
 			if(cvar("cl_gentle")) {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, "^7 while you were typing!", s2));
+				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, "^1 while you were typing!", s2));
 			} else {
 				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were typefragged by ^7", s1, s2));
 			}
@@ -2705,14 +2582,14 @@ void HUD_Centerprint(string s1, string s2, float type, float msg)
 			}
 		} else if (type == KILL_FRAGGED) {
 			if(cvar("cl_gentle")) {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You were scored against by ^7", s1, s2));
+				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, s2));
 			} else {
-				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You were fragged by ^7", s1, s2));
+				centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were fragged by ^7", s1, s2));
 			}
 		}
 	} else if(msg == MSG_KILL_ACTION) {
 		// TODO: invent more centerprints here?
-		centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Watch your step!", s1));
+		centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Watch your step!"));
 	}
 }
 
@@ -2811,9 +2688,14 @@ void HUD_Notify (void)
 				drawpic_skin(weap_pos, "notify_camping", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
-			else if(killnotify_deathtype[j] == DEATH_MIRRORDAMAGE)
+			else if(killnotify_deathtype[j] == KILL_TEAM_RED)
 			{
-				drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+			}
+			else if(killnotify_deathtype[j] == KILL_TEAM_BLUE)
+			{
+				drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
 			else if(killnotify_deathtype[j] == DEATH_DROWN)
@@ -2907,9 +2789,15 @@ void HUD_Notify (void)
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
-			else if(killnotify_deathtype[j] == DEATH_MIRRORDAMAGE)
+			else if(killnotify_deathtype[j] == KILL_TEAM_RED)
 			{
-				drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 1 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '1 0 0', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
+			}
+			else if(killnotify_deathtype[j] == KILL_TEAM_BLUE)
+			{
+				drawpic_skin(weap_pos, "notify_teamkill", '2 1 0' * height, '0 0 1', HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_attacker, attacker, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 				drawcolorcodedstring(pos_victim, victim, fontsize, HUD_Panel_GetFgAlpha(id) * a, DRAWFLAG_NORMAL);
 			}
@@ -3103,6 +2991,19 @@ void HUD_Notify (void)
 
 // Timer (#5)
 //
+string seconds_tostring(float sec)
+{
+	float minutes;
+	minutes = floor(sec / 60);
+
+	sec -= minutes * 60;
+
+	string s;
+	s = ftos(100 + sec);
+
+	return strcat(ftos(minutes), ":", substring(s, 1, 3));
+}
+
 void HUD_Timer(void)
 {
 	float id = HUD_PANEL_TIMER;
@@ -3119,14 +3020,15 @@ void HUD_Timer(void)
 		mySize -= '2 2 0' * padding;
 	}
 
-	float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft;
+	string timer;
+	float timelimit, elapsedTime, timeleft, minutesLeft;
 
 	timelimit = getstatf(STAT_TIMELIMIT);
 
 	timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time);
 	timeleft = ceil(timeleft);
+
 	minutesLeft = floor(timeleft / 60);
-	secondsLeft = timeleft - minutesLeft*60;
 
 	vector timer_color;
 	if(minutesLeft >= 5 || warmup_stage || timelimit == 0) //don't use red or yellow in warmup or when there is no timelimit
@@ -3139,25 +3041,16 @@ void HUD_Timer(void)
 	if (cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) {
 		if (time < getstatf(STAT_GAMESTARTTIME)) {
 			//while restart is still active, show 00:00
-			minutes = seconds = 0;
+			timer = seconds_tostring(0);
 		} else {
 			elapsedTime = floor(time - getstatf(STAT_GAMESTARTTIME)); //127
-			minutes = floor(elapsedTime / 60);
-			seconds = elapsedTime - minutes*60;
+			timer = seconds_tostring(elapsedTime);
 		}
 	} else {
-		minutes = minutesLeft;
-		seconds = secondsLeft;
+		timer = seconds_tostring(timeleft);
 	}
 
-	if(minutes > 999)
-		seconds = 99;
-	minutes = min(minutes, 999);
-	if(minutesLeft >= 1 || cvar("hud_timer_increment") || timelimit == 0 || warmup_stage) {
-		HUD_DrawXNum(pos + eX * mySize_x - eX * 5.1 * mySize_y, minutes, 3, 0, mySize_y, timer_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-		drawpic_skin(pos + eX * mySize_x - eX * 2.57 * mySize_y, "num_colon", '1 1 0' * mySize_y, timer_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	}
-	HUD_DrawXNum(pos + eX * mySize_x - eX * 2 * mySize_y, seconds, -2, 0, mySize_y, timer_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawstring_aspect(pos, timer, mySize, mySize_y, timer_color, HUD_Panel_GetFgAlpha(HUD_PANEL_TIMER), DRAWFLAG_NORMAL);
 }
 
 // Radar (#6)
@@ -3305,7 +3198,7 @@ void HUD_Score(void)
 	}
 
 	float score, distribution, leader;
-	float score_len, distr_len;
+	float score_len;
 	vector distribution_color;
 	entity tm, pl, me;
 	me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1];
@@ -3349,19 +3242,19 @@ void HUD_Score(void)
 				distribution_color = eX;
 				minusplus = 2; // minusplus 1: always prefix with plus sign
 			}
-			HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-			HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			//HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			//HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 			drawpic_skin(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "num_dot", '16 16 0', distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
 		}
 		// race record display
 		if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead
 			drawpic_skin(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "num_leading_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 
-		HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-		HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0'  - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		//HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		//HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0'  - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "num_dot", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
 
-		HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		//HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		drawpic_skin(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "num_colon", '30 30 0', '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_ADDITIVE);
 		*/
 	} else if (!teamplay) { // non-teamgames
@@ -3393,12 +3286,13 @@ void HUD_Score(void)
 			distribution_color = eX;
 
 		score_len = strlen(ftos(score));
-		distr_len = strlen(ftos(distribution));
 
-		HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y, distribution, 3, 3, 0.33 * mySize_y, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		drawstring_aspect(pos + eX * 0.75 * mySize_x, ftos(distribution), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, (1/3) * mySize_y, distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 		if (leader)
-			drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-		HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, distribution_color, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+			drawpic_skin(pos, strcat("num_leading_", ftos(score_len)), eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		drawfont = hud_bigfont;
+		drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, mySize_y, distribution_color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+		drawfont = hud_font;
 	} else { // teamgames
 		float max_fragcount;
 		max_fragcount = -99;
@@ -3421,14 +3315,16 @@ void HUD_Score(void)
 				if (max_fragcount == score)
 					leader = 1;
 				if (leader)
-					drawpic_skin(pos + eX * mySize_x - eX * score_len * mySize_y - eX * 3 * 0.33 * mySize_y, strcat("num_leading_", ftos(score_len)), eX * score_len * mySize_y + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * mySize_y - eX * 3 * 0.33 * mySize_y, score, 3, 0, mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+					drawpic_skin(pos, strcat("num_leading_", ftos(score_len)), eX * 0.75 * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawfont = hud_bigfont;
+				drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize_x + eY * mySize_y, mySize_y, GetTeamRGB(tm.team) * 0.8, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawfont = hud_font;
 			} else {
 				if (max_fragcount == score)
 					leader = 1;
 				if (leader)
-					drawpic_skin(pos + eX * mySize_x - eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y * teamnum, strcat("num_leading_", ftos(score_len)), eX * 0.33 * score_len * mySize_y + eY * 0.33 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-				HUD_DrawXNum(pos + eX * mySize_x - eX * 3 * 0.33 * mySize_y + eY * 0.33 * mySize_y * teamnum, score, 3, 0, 0.33 * mySize_y, GetTeamRGB(tm.team) * 0.8, 0, 0, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+					drawpic_skin(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, strcat("num_leading_", ftos(score_len)), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+				drawstring_aspect(pos + eX * 0.75 * mySize_x + eY * (1/3) * teamnum * mySize_y, ftos(score), eX * 0.25 * mySize_x + eY * (1/3) * mySize_y, (1/3) * mySize_y, GetTeamRGB(tm.team) * 0.8, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 				teamnum += 1;
 			}
 		}
@@ -3677,6 +3573,7 @@ void HUD_Mod_CTF_Reset(void)
 void HUD_Mod_CTF(vector pos, vector mySize)
 {
 	vector redflag_pos, blueflag_pos;
+	vector flag_size;
 	float f; // every function should have that
 
 	float redflag, blueflag; // current status
@@ -3781,25 +3678,37 @@ void HUD_Mod_CTF(vector pos, vector mySize)
 			break;
 	}
 
-	if (myteam == COLOR_TEAM1) { // always draw own flag on left
-		redflag_pos = pos;
-		blueflag_pos = pos + eX * mySize_y;
+	if(mySize_x > mySize_y) {
+		if (myteam == COLOR_TEAM1) { // always draw own flag on left
+			redflag_pos = pos;
+			blueflag_pos = pos + eX * 0.5 * mySize_x;
+		} else {
+			blueflag_pos = pos;
+			redflag_pos = pos + eX * 0.5 * mySize_x;
+		}
+		flag_size = eX * 0.5 * mySize_x + eY * mySize_y;
 	} else {
-		blueflag_pos = pos;
-		redflag_pos = pos + eX * mySize_y;
+		if (myteam == COLOR_TEAM1) { // always draw own flag on left
+			redflag_pos = pos;
+			blueflag_pos = pos + eY * 0.5 * mySize_y;
+		} else {
+			blueflag_pos = pos;
+			redflag_pos = pos + eY * 0.5 * mySize_y;
+		}
+		flag_size = eY * 0.5 * mySize_y + eX * mySize_x;
 	}
 
 	f = bound(0, redflag_statuschange_elapsedtime*2, 1);
 	if(red_icon_prevstatus && f < 1)
-		drawpic_skin_expanding(redflag_pos, red_icon_prevstatus, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha_prevstatus, DRAWFLAG_NORMAL, f);
+		drawpic_skin_expanding(redflag_pos, red_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha_prevstatus, DRAWFLAG_NORMAL, f);
 	if(red_icon)
-		drawpic_skin(redflag_pos, red_icon, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha * f, DRAWFLAG_NORMAL);
+		drawpic_skin(redflag_pos, red_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * red_alpha * f, DRAWFLAG_NORMAL);
 
 	f = bound(0, blueflag_statuschange_elapsedtime*2, 1);
 	if(blue_icon_prevstatus && f < 1)
-		drawpic_skin_expanding(blueflag_pos, blue_icon_prevstatus, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f);
+		drawpic_skin_expanding(blueflag_pos, blue_icon_prevstatus, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f);
 	if(blue_icon)
-		drawpic_skin(blueflag_pos, blue_icon, '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha * f, DRAWFLAG_NORMAL);
+		drawpic_skin(blueflag_pos, blue_icon, flag_size, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS) * blue_alpha * f, DRAWFLAG_NORMAL);
 }
 
 // Keyhunt HUD modicon section
@@ -3818,18 +3727,29 @@ void HUD_Mod_KH(vector pos, vector mySize)
 	float a, aa;
 	vector p, pa, kh_size, kh_asize;
 
-	p_x = pos_x;
-	p_y = pos_y + 0.25 * mySize_y;
-
 	kh_keys = getstati(STAT_KH_KEYS);
 
-	kh_size_x = mySize_x * 0.25;
-	kh_size_y = 0.75 * mySize_y;
+	p_x = pos_x;
+	if(mySize_x > mySize_y)
+	{
+		p_y = pos_y + 0.25 * mySize_y;
+		pa = p - eY * 0.25 * mySize_y;
 
-	pa = p - eY * 0.25 * mySize_y;
+		kh_size_x = mySize_x * 0.25;
+		kh_size_y = 0.75 * mySize_y;
+		kh_asize_x = mySize_x * 0.25;
+		kh_asize_y = mySize_y * 0.25;
+	}
+	else
+	{
+		p_y = pos_y + 0.125 * mySize_y;
+		pa = p - eY * 0.125 * mySize_y;
 
-	kh_asize_x = mySize_x * 0.25;
-	kh_asize_y = mySize_y * 0.25;
+		kh_size_x = mySize_x * 0.5;
+		kh_size_y = 0.375 * mySize_y;
+		kh_asize_x = mySize_x * 0.5;
+		kh_asize_y = mySize_y * 0.125;
+	}
 
 	float i, key;
 
@@ -3913,8 +3833,26 @@ void HUD_Mod_KH(vector pos, vector mySize)
 					break;
 			}
 		}
-		p_x += 0.25 * mySize_x;
-		pa_x += 0.25 * mySize_x;
+		if(mySize_x > mySize_y)
+		{
+			p_x += 0.25 * mySize_x;
+			pa_x += 0.25 * mySize_x;
+		}
+		else
+		{
+			if(i == 1)
+			{
+				p_y = pos_y + 0.625 * mySize_y;
+				pa_y = pos_y + 0.5 * mySize_y;
+				p_x = pos_x;
+				pa_x = pos_x;
+			}
+			else
+			{
+				p_x += 0.5 * mySize_x;
+				pa_x += 0.5 * mySize_x;
+			}
+		}
 	}
 }
 
@@ -3941,13 +3879,23 @@ void HUD_Mod_NexBall(vector pos, vector mySize)
 			p = 2 - p;
 
 		//Draw the filling
-		HUD_Panel_DrawProgressBar(pos, 0, eX * p * mySize_x + eY * mySize_y, HUD_Panel_GetProgressBarColor("nexball"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
+		vector barsize;
+		float vertical;
+		if(mySize_x > mySize_y)
+		{
+			barsize = eX * p * mySize_x + eY * mySize_y;
+			vertical = 0;
+		}
+		else
+		{
+			barsize = eX * mySize_x + eY * p * mySize_y;
+			vertical = 1;
+		}
+		HUD_Panel_DrawProgressBar(pos, vertical, barsize, HUD_Panel_GetProgressBarColor("nexball"), cvar("hud_progressbar_alpha") * HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
 	}
 
-	pos_x += 0.5 * mySize_x - 0.5 * mySize_y; //horizontal margin to the picture
-
 	if (stat_items & IT_KEY1)
-		drawpic_skin(pos, "nexball_carrying", '1 1 0' * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
+		drawpic_skin(pos, "nexball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
 }
 
 // Race/CTS HUD mod icons
@@ -3998,7 +3946,7 @@ void HUD_Mod_Race(vector pos, vector mySize)
 	f = time - crecordtime_change_time;
 
 	if (f > 1) {
-		drawstring(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
+		drawstring_aspect(pos, "Personal best ", eX * 0.5 * mySize_x + eY * 0.25 * mySize_y, 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
 		drawstring(pos + eY * 0.2 * mySize_y, TIME_ENCODED_TOSTRING(t), '1 1 0' * 0.2 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
 	} else {
 		drawstring(pos, "Personal best ", '1 1 0' * 0.15 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(HUD_PANEL_MODICONS), DRAWFLAG_NORMAL);
@@ -4148,16 +4096,17 @@ void HUD_DrawPressedKeys(void)
 		mySize -= '2 2 0' * padding;
 	}
 
+	vector keysize;
+	keysize = eX * mySize_x * (1/3) + eY * mySize_y * 0.5;
 	float pressedkeys;
 
 	pressedkeys = getstatf(STAT_PRESSED_KEYS);
-	drawpic_skin(pos, "key_bg.tga",           mySize, '1 1 1', 0.1 * HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	drawpic_skin(pos + eX * mySize_x - eX * 0.22 * mySize_x +       eY * 0.195 * mySize_y, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"),        '1 1 0' * (1/3) * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.040 * mySize_y, ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"),     '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	drawpic_skin(pos + eX * 0.023 * mySize_x +                      eY * 0.195 * mySize_y, ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"),              '1 1 0' * (1/3) * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	drawpic_skin(pos + eX * 0.1 * mySize_x +                        eY * 0.486 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"),              '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	drawpic_skin(pos + eX * 0.5 * mySize_x - eX * 0.23 * mySize_y + eY * 0.486 * mySize_y, ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"),  '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
-	drawpic_skin(pos + eX * mySize_x - eX * 0.372 * mySize_x +      eY * 0.486 * mySize_y, ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"),           '1 1 0' * 0.46 * mySize_y, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_skin(pos, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_skin(pos + eX * mySize_x * (1/3), ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_skin(pos + eX * mySize_x * (2/3), ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_skin(pos + eY * 0.5 * mySize_y, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (1/3), ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawpic_skin(pos + eY * 0.5 * mySize_y + eX * mySize_x * (2/3), ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), keysize, '1 1 1', HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 }
 
 // Handle chat as a panel (#12)
@@ -4256,7 +4205,7 @@ void HUD_EngineInfo(void)
 
 	vector color;
 	color = HUD_Get_Num_Color (prevfps, 100);
-	drawstring(pos, strcat("FPS: ", ftos_decimals(prevfps, cvar("hud_engineinfo_framecounter_decimals"))), '1 1 0' * 0.5 * mySize_y, color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
+	drawstring_aspect(pos, strcat("FPS: ", ftos_decimals(prevfps, cvar("hud_engineinfo_framecounter_decimals"))), mySize, mySize_y, color, HUD_Panel_GetFgAlpha(id), DRAWFLAG_NORMAL);
 }
 /*
 ==================
@@ -4393,20 +4342,23 @@ void HUD_Main (void)
 	{
 		float i;
 		// x-axis
-		for(i = 0; i < 1/bound(0.005, bound(0.005, cvar("hud_configure_grid_x"), 0.2), 0.2); ++i)
+		for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_x"), 0.2); ++i)
 		{
-			drawfill(eX * i * vid_conwidth * bound(0.005, bound(0.005, cvar("hud_configure_grid_x"), 0.2), 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL);
+			drawfill(eX * i * vid_conwidth * bound(0.005, cvar("hud_configure_grid_x"), 0.2), eX + eY * vid_conheight, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL);
 		}
 		// y-axis
-		for(i = 0; i < 1/bound(0.005, bound(0.005, cvar("hud_configure_grid_y"), 0.2), 0.2); ++i)
+		for(i = 0; i < 1/bound(0.005, cvar("hud_configure_grid_y"), 0.2); ++i)
 		{
-			drawfill(eY * i * vid_conheight * bound(0.005, bound(0.005, cvar("hud_configure_grid_y"), 0.2), 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL);
+			drawfill(eY * i * vid_conheight * bound(0.005, cvar("hud_configure_grid_y"), 0.2), eY + eX * vid_conwidth, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL);
 		}
 	}
 
-	if(cvar_string("hud_dock") != "")
-		drawpic_skin('0 0 0', cvar_string("hud_dock"), eX * vid_conwidth + eY * vid_conheight, HUD_Panel_Dock_GetColor(), cvar("hud_dock_alpha") * menu_fade_alpha, DRAWFLAG_NORMAL);
+	if(cvar_string("hud_dock") != "" && cvar_string("hud_dock") != "0")
+		drawpic('0 0 0', strcat("gfx/hud/", cvar_string("hud_skin"), "/", cvar_string("hud_dock")), eX * vid_conwidth + eY * vid_conheight, HUD_Panel_Dock_GetColor(), cvar("hud_dock_alpha") * menu_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock...
 
+	if(HUD_Panel_CheckActive(HUD_PANEL_RADAR) || hud_configure)
+		if(cvar_string("hud_radar") != "0" && (cvar("hud_radar") == 2 || teamplay))
+			HUD_Radar();
 	if(HUD_Panel_CheckActive(HUD_PANEL_WEAPONICONS) || hud_configure)
 		HUD_WeaponIcons();
 	if(HUD_Panel_CheckActive(HUD_PANEL_INVENTORY) || hud_configure)
@@ -4419,10 +4371,6 @@ void HUD_Main (void)
 		HUD_Notify();
 	if(HUD_Panel_CheckActive(HUD_PANEL_TIMER) || hud_configure)
 		HUD_Timer();
-	// TODO hud'ify
-	if(HUD_Panel_CheckActive(HUD_PANEL_RADAR) || hud_configure)
-		if(cvar_string("hud_radar") != "0" && (cvar("hud_radar") == 2 || teamplay))
-			HUD_Radar();
 	if(HUD_Panel_CheckActive(HUD_PANEL_SCORE) || hud_configure)
 		HUD_Score();
 	if(HUD_Panel_CheckActive(HUD_PANEL_RACETIMER) || hud_configure)
@@ -4439,7 +4387,7 @@ void HUD_Main (void)
 	if(HUD_Panel_CheckActive(HUD_PANEL_CHAT) || hud_configure)
 		HUD_Chat();
 	else
-		cvar_set("con_csqcpositioning", "0");
+		cvar_set("con_chatrect", "0");
 	if(HUD_Panel_CheckActive(HUD_PANEL_ENGINEINFO) || hud_configure)
 		HUD_EngineInfo();