X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fslider.c;h=c92db27e984f84be22a86ff2ae8049d190c3d478;hb=5dbda91e68e08abcedef699f99c3654c8f97242b;hp=9a8a35fdcbc699d03ba12742342bb45f0e7fe0f4;hpb=7a8e4ad81bf523a53882ef97822b0641e424730c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/item/slider.c b/qcsrc/menu/item/slider.c
index 9a8a35fdc..c92db27e9 100644
--- a/qcsrc/menu/item/slider.c
+++ b/qcsrc/menu/item/slider.c
@@ -10,6 +10,7 @@ CLASS(Slider) EXTENDS(Label)
 	METHOD(Slider, mousePress, float(entity, vector))
 	METHOD(Slider, mouseDrag, float(entity, vector))
 	METHOD(Slider, mouseRelease, float(entity, vector))
+	METHOD(Slider, focusEnter, void(entity))
 	METHOD(Slider, valueToText, string(entity, float))
 	METHOD(Slider, toString, string(entity))
 	METHOD(Slider, setValue, void(entity, float))
@@ -47,7 +48,6 @@ ENDCLASS(Slider)
 void Slider_setValue(entity me, float val)
 {
 	if (me.animated) {
-		anim.stopObjAnim(anim, me);
 		anim.removeObjAnim(anim, me);
 		makeHostedEasing(me, Slider_setSliderValue, easingQuadInOut, 1, me.sliderValue, val);
 	} else {
@@ -61,7 +61,7 @@ void Slider_setSliderValue(entity me, float val)
 }
 string Slider_toString(entity me)
 {
-	return sprintf(_("%d (%s)"), me.value, me.valueToText(me, me.value));
+	return sprintf("%d (%s)", me.value, me.valueToText(me, me.value));
 }
 void Slider_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
@@ -104,7 +104,7 @@ float Slider_keyDown(entity me, float key, float ascii, float shift)
 	if(me.disabled)
 		return 0;
 	inRange = (almost_in_bounds(me.valueMin, me.value, me.valueMax));
-	if(key == K_LEFTARROW || key == K_KP_LEFTARROW || key == K_MWHEELUP)
+	if(key == K_LEFTARROW || key == K_KP_LEFTARROW || key == K_MWHEELDOWN)
 	{
 		if(inRange)
 			me.setValue(me, median(me.valueMin, me.value - me.valueKeyStep, me.valueMax));
@@ -112,7 +112,7 @@ float Slider_keyDown(entity me, float key, float ascii, float shift)
 			me.setValue(me, me.valueMax);
 		return 1;
 	}
-	if(key == K_RIGHTARROW || key == K_KP_RIGHTARROW || key == K_MWHEELDOWN)
+	if(key == K_RIGHTARROW || key == K_KP_RIGHTARROW || key == K_MWHEELUP)
 	{
 		if(inRange)
 			me.setValue(me, median(me.valueMin, me.value + me.valueKeyStep, me.valueMax));
@@ -120,7 +120,7 @@ float Slider_keyDown(entity me, float key, float ascii, float shift)
 			me.setValue(me, me.valueMin);
 		return 1;
 	}
-	if(key == K_PGUP || key == K_KP_PGUP)
+	if(key == K_PGDN || key == K_KP_PGDN)
 	{
 		if(inRange)
 			me.setValue(me, median(me.valueMin, me.value - me.valuePageStep, me.valueMax));
@@ -128,7 +128,7 @@ float Slider_keyDown(entity me, float key, float ascii, float shift)
 			me.setValue(me, me.valueMax);
 		return 1;
 	}
-	if(key == K_PGDN || key == K_KP_PGDN)
+	if(key == K_PGUP || key == K_KP_PGUP)
 	{
 		if(inRange)
 			me.setValue(me, median(me.valueMin, me.value + me.valuePageStep, me.valueMax));
@@ -156,7 +156,7 @@ float Slider_mouseDrag(entity me, vector pos)
 	if(me.disabled)
 		return 0;
 
-	anim.finishObjAnim(anim, me);
+	anim.removeObjAnim(anim, me);
 	animed = me.animated;
 	me.animated = false;
 
@@ -235,8 +235,6 @@ float Slider_mousePress(entity me, vector pos)
 			//me.mouseDrag(me, pos);
 		}
 	}
-	if(cvar("menu_sounds"))
-		localsound("sound/misc/menu2.wav");
 	return 1;
 }
 float Slider_mouseRelease(entity me, vector pos)
@@ -244,12 +242,20 @@ float Slider_mouseRelease(entity me, vector pos)
 	me.pressed = 0;
 	if(me.disabled)
 		return 0;
+	if(cvar("menu_sounds"))
+		localsound("sound/misc/menu2.wav");
 	return 1;
 }
 void Slider_showNotify(entity me)
 {
 	me.focusable = !me.disabled;
 }
+void Slider_focusEnter(entity me)
+{
+	if(cvar("menu_sounds") > 1)
+		localsound("sound/misc/menu1.wav");
+	SUPER(Slider).focusEnter(me);
+}
 void Slider_draw(entity me)
 {
 	float controlLeft;