X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fimage.qc;h=73b302c4a7716a6e7f7b363b030a3d46ff7058a8;hb=0b6694545ba935bbac13c20fc11842ba1850d972;hp=06ac91f025fcb53c80804f4dcb2f4ac0f56e2838;hpb=eac60648c4017e495060dd3ba9e50ac4bad5000a;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item/image.qc b/qcsrc/menu/item/image.qc
index 06ac91f02..73b302c4a 100644
--- a/qcsrc/menu/item/image.qc
+++ b/qcsrc/menu/item/image.qc
@@ -18,9 +18,10 @@
 
 	void Image_draw(entity me)
 	{
-		if (me.imgSize.x > 1 || me.imgSize.y > 1) draw_SetClip();
+		bool willClip = me.imgSize.x > 1 || me.imgSize.y > 1;
+		if (willClip) draw_SetClip();
 		draw_Picture(me.imgOrigin, me.src, me.imgSize, me.color, 1);
-		if (me.imgSize.x > 1 || me.imgSize.y > 1) draw_ClearClip();
+		if (willClip) draw_ClearClip();
 		SUPER(Image).draw(me);
 	}
 	void Image_updateAspect(entity me)
@@ -137,13 +138,13 @@
 		}
 		return 1;
 	}
-	void Image_setZoom(entity me, float z, float atMousePosition)
+	void Image_setZoom(entity me, float newzoom, float atMousePosition)
 	{
 		float prev_zoomFactor;
 		prev_zoomFactor = me.zoomFactor;
-		if (z < 0)  // multiply by the current zoomFactor (but can also snap to real dimensions or to box)
+		if (newzoom < 0)  // multiply by the current zoomFactor (but can also snap to real dimensions or to box)
 		{
-			me.zoomFactor *= -z;
+			me.zoomFactor *= -newzoom;
 			float realSize_in_the_middle, boxSize_in_the_middle;
 			realSize_in_the_middle = ((prev_zoomFactor - 1) * (me.zoomFactor - 1) < 0);
 			boxSize_in_the_middle = (me.zoomBox > 0 && (prev_zoomFactor - me.zoomBox) * (me.zoomFactor - me.zoomBox) < 0);
@@ -162,14 +163,14 @@
 				me.zoomFactor = me.zoomBox; // snap to box
 			}
 		}
-		else if (z == 0)                    // reset (no zoom)
+		else if (newzoom == 0)                    // reset (no zoom)
 		{
 			if (me.zoomBox > 0) me.zoomFactor = me.zoomBox;
 			else me.zoomFactor = 1;
 		}
 		else  // directly set
 		{
-			me.zoomFactor = z;
+			me.zoomFactor = newzoom;
 		}
 		me.zoomFactor = bound(1 / 16, me.zoomFactor, 16);
 		if (me.zoomMax > 0 && me.zoomFactor > me.zoomMax) me.zoomFactor = me.zoomMax;