Merge branch 'master' of https://github.com/coelckers/gzdoom

ZDoom · Aug 23, 2019 · 45f6ed4 · 45f6ed4
2 parents 66db894 + 9456eeb
commit 45f6ed4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/src/posix/cocoa/i_main.mm b/src/posix/cocoa/i_main.mm
@@ -200,8 +200,8 @@ int OriginalMain(int argc, char** argv)
 	// Set LC_NUMERIC environment variable in case some library decides to
 	// clear the setlocale call at least this will be correct.
 	// Note that the LANG environment variable is overridden by LC_*
-	setenv("LC_NUMERIC", "C", 1);
-	setlocale(LC_ALL, "C");
+	setenv("LC_NUMERIC", "en_US.UTF-8", 1);
+	setlocale(LC_ALL, "en_US.UTF-8");
 
 	// Set reasonable default values for video settings
 

diff --git a/src/posix/sdl/i_main.cpp b/src/posix/sdl/i_main.cpp
@@ -170,9 +170,9 @@ int main (int argc, char **argv)
 	// Set LC_NUMERIC environment variable in case some library decides to
 	// clear the setlocale call at least this will be correct.
 	// Note that the LANG environment variable is overridden by LC_*
-	setenv ("LC_NUMERIC", "C", 1);
+	setenv ("LC_NUMERIC", "en_US.UTF-8", 1);
 
-	setlocale (LC_ALL, "C");
+	setlocale (LC_ALL, "en_US.UTF-8");
 
 	if (SDL_Init (0) < 0)
 	{

diff --git a/wadsrc/static/zscript/ui/statusbar/hexen_sbar.zs b/wadsrc/static/zscript/ui/statusbar/hexen_sbar.zs
@@ -105,13 +105,25 @@ class HexenStatusBar : BaseStatusBar
 	{
 		DrawImage("H2BAR", (0, 134), DI_ITEM_OFFSETS);
 
-		String Gem;
-		if (CPlayer.mo is "ClericPlayer") Gem = "LIFEGMC2";
-		else if (CPlayer.mo is "MagePlayer") Gem = "LIFEGMM2";
-		else Gem = "LIFEGMF2";
+		String Gem, Chain;
+		if (CPlayer.mo is "ClericPlayer")
+			{
+				Gem = "LIFEGMC2";
+				Chain = "CHAIN2";
+			}
+		else if (CPlayer.mo is "MagePlayer")
+			{
+				Gem = "LIFEGMM2";
+				Chain = "CHAIN3";
+			}
+		else
+			{
+				Gem = "LIFEGMF2";
+				Chain = "CHAIN";
+			}
 
 		int inthealth =  mHealthInterpolator2.GetValue();
-		DrawGem("CHAIN", "LIFEGMF2", inthealth, CPlayer.mo.GetMaxHealth(true), (30, 193), -23, 49, 15, (multiplayer? DI_TRANSLATABLE : 0) | DI_ITEM_LEFT_TOP); 
+		DrawGem(Chain, Gem, inthealth, CPlayer.mo.GetMaxHealth(true), (30, 193), -23, 49, 15, (multiplayer? DI_TRANSLATABLE : 0) | DI_ITEM_LEFT_TOP); 
 
 		DrawImage("LFEDGE", (0, 192), DI_ITEM_OFFSETS);
 		DrawImage("RTEDGE", (277, 192), DI_ITEM_OFFSETS);