diff --git a/src/g_shared/sbarinfo.cpp b/src/g_shared/sbarinfo.cpp index f31fb4912..ee29a3b5d 100644 --- a/src/g_shared/sbarinfo.cpp +++ b/src/g_shared/sbarinfo.cpp @@ -1153,8 +1153,8 @@ public: if((offsetflags & SBarInfoCommand::CENTER) == SBarInfoCommand::CENTER) { - dx -= (texture->GetScaledWidthDouble()/2.0)-texture->LeftOffset; - dy -= (texture->GetScaledHeightDouble()/2.0)-texture->TopOffset; + dx -= (texture->GetScaledWidthDouble()/2.0)-texture->GetScaledLeftOffsetDouble(); + dy -= (texture->GetScaledHeightDouble()/2.0)-texture->GetScaledTopOffsetDouble(); } dx += xOffset; diff --git a/src/g_shared/sbarinfo_commands.cpp b/src/g_shared/sbarinfo_commands.cpp index 3b612368d..fcc5a6e1e 100644 --- a/src/g_shared/sbarinfo_commands.cpp +++ b/src/g_shared/sbarinfo_commands.cpp @@ -2730,7 +2730,7 @@ class CommandDrawGem : public SBarInfoCommand SBarInfoCoordinate drawY = y; if(wiggle && drawValue != goalValue) // Should only wiggle when the value doesn't equal what is being drawn. drawY += chainWiggle; - int chainWidth = chainImg->GetWidth(); + int chainWidth = chainImg->GetScaledWidth(); int offset = (int) (((double) (chainWidth-leftPadding-rightPadding)/100)*drawValue); statusBar->DrawGraphic(chainImg, x+(offset%chainSize), drawY, block->XOffset(), block->YOffset(), block->Alpha(), block->FullScreenOffsets()); if(gemImg != NULL) diff --git a/src/keysections.cpp b/src/keysections.cpp index 60afce21b..6ef0538f6 100644 --- a/src/keysections.cpp +++ b/src/keysections.cpp @@ -48,7 +48,7 @@ static void LoadKeys (const char *modname, bool dbl) { char section[64]; - mysnprintf (section, countof(section), "%s.%s%sBindings", gameinfo.ConfigName, modname, + mysnprintf (section, countof(section), "%s.%s%sBindings", gameinfo.ConfigName.GetChars(), modname, dbl ? ".Double" : "."); FKeyBindings *bindings = dbl? &DoubleBindings : &Bindings; diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 1a681fd65..6fc29665c 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -511,7 +511,7 @@ int I_PickIWad_Gtk (WadStuff *wads, int numwads, bool showwin, int defaultiwad) gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, 0, filepart, - 1, wads[i].Name, + 1, wads[i].Name.GetChars(), 2, i, -1); if (i == defaultiwad) @@ -625,7 +625,7 @@ int I_PickIWad (WadStuff *wads, int numwads, bool showwin, int defaultiwad) filepart = wads[i].Path; else filepart++; - printf ("%d. %s (%s)\n", i+1, wads[i].Name, filepart); + printf ("%d. %s (%s)\n", i+1, wads[i].Name.GetChars(), filepart); } printf ("Which one? "); scanf ("%d", &i);