X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Futil.qc;h=a80b03fe1890d8dd47d4976f4cd87c5f05fd5c48;hp=0846526d0c66283fd46e94f0624414c0cec6d103;hb=21f6206d1928dfe54da1c255a7060b3ea0319713;hpb=e3507f4fdbc2b3e15b663365e57e0aa60f3cf1a6

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 0846526d0..a80b03fe1 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -665,12 +665,11 @@ float updateCompression()
 	//GAMETYPE(MAPINFO_TYPE_INVASION) \
 	/* nothing */
 
-float GameType_GetID(float cnt)
+int GameType_GetID(int cnt)
 {
-	float i;
-	i = 0;
+	int i = 0;
 
-	#define GAMETYPE(id) { if(i++ == cnt) return id; }
+	#define GAMETYPE(id) { if (i++ == cnt) return id; }
 	GAMETYPES
 	#undef GAMETYPE
 
@@ -679,10 +678,9 @@ float GameType_GetID(float cnt)
 	return 0;
 }
 
-float GameType_GetCount()
+int GameType_GetCount()
 {
-	float i;
-	i = 0;
+	int i = 0;
 
 	#define GAMETYPE(id) ++i;
 	GAMETYPES
@@ -691,9 +689,9 @@ float GameType_GetCount()
 	return i;
 }
 
-string GameType_GetName(float cnt)
+string GameType_GetName(int cnt)
 {
-	float i = GameType_GetID(cnt);
+	int i = GameType_GetID(cnt);
 
 	if(i)
 		return MapInfo_Type_ToText(i);
@@ -701,9 +699,9 @@ string GameType_GetName(float cnt)
 	return "";
 }
 
-string GameType_GetIcon(float cnt)
+string GameType_GetIcon(int cnt)
 {
-	float i = GameType_GetID(cnt);
+	int i = GameType_GetID(cnt);
 
 	if(i)
 		return strcat("gametype_", MapInfo_Type_ToString(i));
@@ -770,6 +768,15 @@ void dialog_hudpanel_common_notoggle(entity me, string panelname)
 				e.configureXonoticTextSliderValues(e);
 }
 
+float getFadedAlpha(float currentAlpha, float startAlpha, float targetAlpha)
+{
+	if(startAlpha < targetAlpha)
+		currentAlpha = min(currentAlpha + frametime * 0.5, targetAlpha);
+	else
+		currentAlpha = max(currentAlpha - frametime * 0.5, targetAlpha);
+	return currentAlpha;
+}
+
 void CheckSendCvars(entity me, string cvarnamestring)
 {
 	if(me.sendCvars)