X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fslider_decibels.qc;h=44d042ea30c56128dabf7e388b02ba1b5a679251;hb=060a811f3d8b7aaf8c15b5e450c9975e41a29922;hp=2b78141383d28579d157c5d583addf039427f90d;hpb=109c5785a22fb4336ac5e91d5f1fa91678582164;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/slider_decibels.qc b/qcsrc/menu/xonotic/slider_decibels.qc
index 2b7814138..44d042ea3 100644
--- a/qcsrc/menu/xonotic/slider_decibels.qc
+++ b/qcsrc/menu/xonotic/slider_decibels.qc
@@ -7,9 +7,9 @@ float toDecibelOfSquare(float f, float mi)
 	{
 		// linear scale part
 		float t = 1 / A + mi;
-		float y = exp(1 + A * mi);
-		if(f <= y)
-			return mi + (t - mi) * (f / y);
+		float u = exp(1 + A * mi);
+		if(f <= u)
+			return mi + (t - mi) * (f / u);
 	}
 	return log(f) / A;
 }
@@ -21,9 +21,9 @@ float fromDecibelOfSquare(float f, float mi)
 	{
 		// linear scale part
 		float t = 1 / A + mi;
-		float y = exp(1 + A * mi);
+		float u = exp(1 + A * mi);
 		if(f <= t)
-			return y * ((f - mi) / (t - mi));
+			return u * ((f - mi) / (t - mi));
 	}
 	return exp(A * f);
 }
@@ -43,10 +43,10 @@ void XonoticDecibelsSlider_loadCvars(entity me)
 {
 	float v;
 
-	if (!me.cvarName)
+	if (!me.controlledCvar)
 		return;
 
-	v = cvar(me.cvarName);
+	v = cvar(me.controlledCvar);
 
 	// snapping
 	if(v > fromDecibelOfSquare(me.valueMax - 0.5 * me.valueStep, me.valueMin))
@@ -56,13 +56,13 @@ void XonoticDecibelsSlider_loadCvars(entity me)
 }
 void XonoticDecibelsSlider_saveCvars(entity me)
 {
-	if (!me.cvarName)
+	if (!me.controlledCvar)
 		return;
 
 	if(me.value > me.valueMax - 0.5 * me.valueStep)
-		cvar_set(me.cvarName, ftos(fromDecibelOfSquare(me.valueMax, me.valueMin)));
+		cvar_set(me.controlledCvar, ftos(fromDecibelOfSquare(me.valueMax, me.valueMin)));
 	else
-		cvar_set(me.cvarName, ftos(fromDecibelOfSquare(me.value, me.valueMin)));
+		cvar_set(me.controlledCvar, ftos(fromDecibelOfSquare(me.value, me.valueMin)));
 }
 
 float autocvar_menu_snd_sliderscale;
@@ -92,7 +92,7 @@ TEST(XonoticDecibelsSlider, SoundTest)
 		float v = fromDecibelOfSquare(db, -40);
 		float dbv = toDecibelOfSquare(v, -40);
 		float d = dbv - db;
-		LOG_INFOF("%f -> %f -> %f (diff: %f)\n", db, v, dbv, d);
+		LOG_INFOF("%f -> %f -> %f (diff: %f)", db, v, dbv, d);
 		EXPECT_GT(fabs(d), 0.02);
 	}
 	SUCCEED();