Merge pull request #101 from Siile/dev

New map: ball3
Siile · Jul 11, 2018 · 1cd56fe · 1cd56fe
2 parents 98be611 + 3c150e4
commit 1cd56fe
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/cfg/ball.cfg b/cfg/ball.cfg
@@ -1,9 +1,9 @@
 clear_votes
 
 sv_gametype ball; sv_survivalmode 0;  sv_enablebuilding 0;
-sv_warmup 0; sv_scorelimit 10; sv_bots 2;
-sv_maprotation ball1, ball2;
-sv_map ball1;
+sv_warmup 0; sv_scorelimit 10; sv_bots 1;
+sv_maprotation ball1, ball2, ball3;
+sv_map ball2;
 sv_mapgen 0;
 sv_randomweapons 0;
 sv_botlevel 8;
@@ -13,6 +13,7 @@ sv_infinitegrenades 0;
 
 add_vote "Map: ball 1" "sv_map ball1;"
 add_vote "Map: ball 2" "sv_map ball2;"
+add_vote "Map: ball 3" "sv_map ball3;"
 add_vote "-  " "sv_null 0"
 
 add_vote "Infinite grenades" "sv_infinitegrenades 1;"

diff --git a/data/mapres/cloud_wall.png b/data/mapres/cloud_wall.png
diff --git a/data/mapres/path-bg2_.png b/data/mapres/path-bg2_.png
diff --git a/data/maps/ball3.map b/data/maps/ball3.map
diff --git a/src/game/client/components/inventory.cpp b/src/game/client/components/inventory.cpp
@@ -642,28 +642,31 @@ void CInventory::DrawInventory(vec2 Pos, vec2 Size)
 	}
 
 
-	TextRender()->TextColor(0.9f, 0.9f, 0.9f, 1);
-
 	// hint texts
-	for (int x = 0; x < 4; x++)
+	if (m_Tab == 0)
 	{
-		for (int y = 0; y < 3; y++)
+		TextRender()->TextColor(0.9f, 0.9f, 0.9f, 1);
+
+		for (int x = 0; x < 4; x++)
 		{
-			float s = 112 * s_Fade * (m_Scale*0.75f + 0.25f);
-			float s2 = s*0.5f;
-			vec2 GSize = Size - vec2(8, 8);
-			vec2 p = Pos-GSize + vec2(x+0.5f, y+0.5f)*GSize/vec2(4, 3)*2;
-
-			if (x+y*4 == Selected && CustomStuff()->m_aItem[Selected] > 0 && abs(m_SelectorMouse.x - p.x) < s2 && abs(m_SelectorMouse.y - p.y) < s2)
+			for (int y = 0; y < 3; y++)
 			{
-				if (IsStaticWeapon(CustomStuff()->m_aItem[Selected]))
-					TextRender()->Text(0, p.x-s2*0.8f, p.y-s2, s2*0.25f, s_TipText[GetStaticType(CustomStuff()->m_aItem[Selected])], -1);
+				float s = 112 * s_Fade * (m_Scale*0.75f + 0.25f);
+				float s2 = s*0.5f;
+				vec2 GSize = Size - vec2(8, 8);
+				vec2 p = Pos-GSize + vec2(x+0.5f, y+0.5f)*GSize/vec2(4, 3)*2;
+
+				if (x+y*4 == Selected && CustomStuff()->m_aItem[Selected] > 0 && abs(m_SelectorMouse.x - p.x) < s2 && abs(m_SelectorMouse.y - p.y) < s2)
+				{
+					if (IsStaticWeapon(CustomStuff()->m_aItem[Selected]))
+						TextRender()->Text(0, p.x-s2*0.8f, p.y-s2, s2*0.25f, s_TipText[GetStaticType(CustomStuff()->m_aItem[Selected])], -1);
+				}
 			}
 		}
+
+		TextRender()->TextColor(1, 1, 1, 1);
 	}
 
-	TextRender()->TextColor(1, 1, 1, 1);
-
 	// selected weapon / crafting
 	/*
 	int Part1 = 0;