X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fscreenshotimage.qc;h=42e168b4b58b2617d5978b7bce289bd8ac4a8131;hp=a800a849486aceae4d7651f2adbaf41a4c36db40;hb=a394baa72a77a2db64709e44caa89a6fb4aaf5f4;hpb=ea48961feb50159e05ef56f38b7fd0ebc15cc64e

diff --git a/qcsrc/menu/xonotic/screenshotimage.qc b/qcsrc/menu/xonotic/screenshotimage.qc
index a800a84948..42e168b4b5 100644
--- a/qcsrc/menu/xonotic/screenshotimage.qc
+++ b/qcsrc/menu/xonotic/screenshotimage.qc
@@ -1,27 +1,9 @@
-#ifdef INTERFACE
-CLASS(XonoticScreenshotImage) EXTENDS(XonoticImage)
-	METHOD(XonoticScreenshotImage, configureXonoticScreenshotImage, void(entity))
-	METHOD(XonoticScreenshotImage, load, void(entity, string))
-	METHOD(XonoticScreenshotImage, draw, void(entity))
-	ATTRIB(XonoticScreenshotImage, focusable, float, 1) // mousePress and mouseDrag work only if focusable is set
-	METHOD(XonoticScreenshotImage, mousePress, float(entity, vector))
-	METHOD(XonoticScreenshotImage, mouseDrag, float(entity, vector))
-	METHOD(XonoticScreenshotImage, mouseMove, float(entity, vector))
-	METHOD(XonoticScreenshotImage, resizeNotify, void(entity, vector, vector, vector, vector))
-	ATTRIB(XonoticScreenshotImage, realFontSize, vector, '0 0 0')
-	ATTRIB(XonoticScreenshotImage, fontSize, float, SKINFONTSIZE_NORMAL)
-	ATTRIB(XonoticScreenshotImage, showTitle, float, 1)
-	ATTRIB(XonoticScreenshotImage, screenshotTime, float, 0)
-	ATTRIB(XonoticScreenshotImage, screenshotTitle, string, string_null)
-ENDCLASS(XonoticScreenshotImage)
-entity makeXonoticScreenshotImage();
-#endif
+#include "screenshotimage.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticScreenshotImage()
 {
 	entity me;
-	me = spawnXonoticScreenshotImage();
+	me = NEW(XonoticScreenshotImage);
 	me.configureXonoticScreenshotImage(me);
 	return me;
 }
@@ -74,12 +56,11 @@ void XonoticScreenshotImage_draw(entity me)
 		if (time < me.zoomTime + 2) // 1 seconds at full alpha, 1 second fading out
 		{
 			string zoomString;
-			float z;
-			z = me.zoomFactor * 100;
-			if (z - floor(z) == 0)
-				zoomString = sprintf("%d%%", z);
+			float myzoom = me.zoomFactor * 100;
+			if (myzoom - floor(myzoom) == 0)
+				zoomString = sprintf("%d%%", myzoom);
 			else
-				zoomString = sprintf("%.2f%%", z);
+				zoomString = sprintf("%.2f%%", myzoom);
 			theAlpha = (2 - (time - me.zoomTime));
 			draw_Text('0.05 0.95 0', zoomString, me.realFontSize, '1 1 1', theAlpha, false);
 		}
@@ -92,4 +73,3 @@ void XonoticScreenshotImage_resizeNotify(entity me, vector relOrigin, vector rel
 	me.realFontSize_y = me.fontSize / absSize.y;
 	me.realFontSize_x = me.fontSize / absSize.x;
 }
-#endif