From: Samual <samual@xonotic.org>
Date: Thu, 13 Jan 2011 17:44:57 +0000 (-0500)
Subject: Attempt to fix resizing of the ball animation for the HUD... really doesn't work... 
X-Git-Tag: xonotic-v0.5.0~318^2~123^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=27912005871f608106490cf7309059be07be1cbf;p=xonotic%2Fxonotic-data.pk3dir.git

Attempt to fix resizing of the ball animation for the HUD... really doesn't work perfectly but it can't be perfect for the way I want it unfortunately. Still, this is better than before and works perfectly with default settings.
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 9592fe4b6..694302a4d 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4377,13 +4377,21 @@ void HUD_Mod_Keepaway(vector pos, vector mySize)
 		kaball_prevstatus = kaball;
 	}
 	
-	// todo: Fix the sizing with the expanding image
+	vector kaball_pos, kaball_size;
+	
+	if(mySize_x > mySize_y) {
+		kaball_pos = pos + eX * 0.25 * mySize_x;
+		kaball_size = eX * 0.5 * mySize_x + eY * mySize_y;
+	} else {
+		kaball_pos = pos + eY * 0.25 * mySize_y;
+		kaball_size = eY * 0.5 * mySize_y + eX * mySize_x;
+	}
 	
 	float kaball_statuschange_elapsedtime = time - kaball_statuschange_time;
 	float f = bound(0, kaball_statuschange_elapsedtime*2, 1);
 	
 	if(kaball_prevstatus && f < 1)
-		drawpic_aspect_skin_expanding(pos + eY * 0.25 * mySize_y, "keepawayball_carrying", eX * mySize_x + eY * mySize_y * 0.5, '1 1 1', panel_fg_alpha * kaball_alpha, DRAWFLAG_NORMAL, f);
+		drawpic_aspect_skin_expanding(kaball_pos, "keepawayball_carrying", kaball_size, '1 1 1', panel_fg_alpha * kaball_alpha, DRAWFLAG_NORMAL, f);
 	
 	if(kaball)
 		drawpic_aspect_skin(pos, "keepawayball_carrying", eX * mySize_x + eY * mySize_y, '1 1 1', panel_fg_alpha * kaball_alpha * f, DRAWFLAG_NORMAL);