Skip to content
Permalink
Browse files

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

  • Loading branch information...
coelckers committed Aug 23, 2019
2 parents 66db894 + 9456eeb commit 45f6ed4cd1bd90a29446cef7b0f1c5517dfbb3da
Showing with 21 additions and 9 deletions.
  1. +2 −2 src/posix/cocoa/i_main.mm
  2. +2 −2 src/posix/sdl/i_main.cpp
  3. +17 −5 wadsrc/static/zscript/ui/statusbar/hexen_sbar.zs
@@ -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

@@ -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)
{
@@ -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);

0 comments on commit 45f6ed4

Please sign in to comment.
You can’t perform that action at this time.