From: terencehill <piuntn@gmail.com>
Date: Wed, 8 Jun 2011 20:43:14 +0000 (+0200)
Subject: Better function names
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~38
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=13e9f7ac3149e9e03810503b6d67657dab66b491;p=xonotic%2Fxonotic-data.pk3dir.git

Better function names
---

diff --git a/qcsrc/menu/item/image.c b/qcsrc/menu/item/image.c
index 354225a20..ade512b85 100644
--- a/qcsrc/menu/item/image.c
+++ b/qcsrc/menu/item/image.c
@@ -6,8 +6,8 @@ CLASS(Image) EXTENDS(Item)
 	METHOD(Image, resizeNotify, void(entity, vector, vector, vector, vector))
 	METHOD(Image, updateAspect, void(entity))
 	METHOD(Image, setZoom, void(entity, float, float))
-	METHOD(Image, startZoomMove, float(entity, vector))
-	METHOD(Image, zoomMove, float(entity, vector))
+	METHOD(Image, drag_setStartPos, float(entity, vector))
+	METHOD(Image, drag, float(entity, vector))
 	ATTRIB(Image, src, string, string_null)
 	ATTRIB(Image, color, vector, '1 1 1')
 	ATTRIB(Image, forcedAspect, float, 0)
@@ -82,7 +82,7 @@ void Image_updateAspect(entity me)
 		me.imgOrigin_y = 0.5 - me.zoomOffset_y * me.imgSize_y;
 	}
 }
-float Image_startZoomMove(entity me, vector coords)
+float Image_drag_setStartPos(entity me, vector coords)
 {
 	//if (me.zoomFactor > 1) //mousewheel zoom may start from a non-zoomed-in image
 	{
@@ -91,7 +91,7 @@ float Image_startZoomMove(entity me, vector coords)
 	}
 	return 1;
 }
-float Image_zoomMove(entity me, vector coords)
+float Image_drag(entity me, vector coords)
 {
 	if (me.zoomFactor > 1)
 	{
diff --git a/qcsrc/menu/xonotic/screenshotimage.c b/qcsrc/menu/xonotic/screenshotimage.c
index 1c8a939e4..b5c8ae807 100644
--- a/qcsrc/menu/xonotic/screenshotimage.c
+++ b/qcsrc/menu/xonotic/screenshotimage.c
@@ -38,17 +38,17 @@ void XonoticScreenshotImage_configureXonoticScreenshotImage(entity me, string th
 
 float XonoticScreenshotImage_mousePress(entity me, vector coords)
 {
-	return me.startZoomMove(me, coords);
+	return me.drag_setStartPos(me, coords);
 }
 
 float XonoticScreenshotImage_mouseDrag(entity me, vector coords)
 {
-	return me.zoomMove(me, coords);
+	return me.drag(me, coords);
 }
 
 float XonoticScreenshotImage_mouseMove(entity me, vector coords)
 {
-	return me.startZoomMove(me, coords);
+	return me.drag_setStartPos(me, coords);
 }
 
 void XonoticScreenshotImage_draw(entity me)