zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 07:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Crash in Linux due to passing FStrings as character arrays.

Browse source 
- Fixed: More places where SBarInfo used the unscaled information from graphics.

SVN r2948 (trunk)
This commit is contained in:
Braden Obrzut 2010-10-16 17:04:18 +00:00
parent 650da24364
commit 9e2e9262a4
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/g_shared/sbarinfo.cpp
View file

@ -1153,8 +1153,8 @@ public:
if((offsetflags & SBarInfoCommand::CENTER) == SBarInfoCommand::CENTER) if((offsetflags & SBarInfoCommand::CENTER) == SBarInfoCommand::CENTER)
{ {
dx -= (texture->GetScaledWidthDouble()/2.0)-texture->LeftOffset; dx -= (texture->GetScaledWidthDouble()/2.0)-texture->GetScaledLeftOffsetDouble();
dy -= (texture->GetScaledHeightDouble()/2.0)-texture->TopOffset; dy -= (texture->GetScaledHeightDouble()/2.0)-texture->GetScaledTopOffsetDouble();
} }
dx += xOffset; dx += xOffset;

2
src/g_shared/sbarinfo_commands.cpp
View file

@ -2730,7 +2730,7 @@ class CommandDrawGem : public SBarInfoCommand
SBarInfoCoordinate drawY = y; SBarInfoCoordinate drawY = y;
if(wiggle && drawValue != goalValue) // Should only wiggle when the value doesn't equal what is being drawn. if(wiggle && drawValue != goalValue) // Should only wiggle when the value doesn't equal what is being drawn.
drawY += chainWiggle; drawY += chainWiggle;
int chainWidth = chainImg->GetWidth(); int chainWidth = chainImg->GetScaledWidth();
int offset = (int) (((double) (chainWidth-leftPadding-rightPadding)/100)*drawValue); int offset = (int) (((double) (chainWidth-leftPadding-rightPadding)/100)*drawValue);
statusBar->DrawGraphic(chainImg, x+(offset%chainSize), drawY, block->XOffset(), block->YOffset(), block->Alpha(), block->FullScreenOffsets()); statusBar->DrawGraphic(chainImg, x+(offset%chainSize), drawY, block->XOffset(), block->YOffset(), block->Alpha(), block->FullScreenOffsets());
if(gemImg != NULL) if(gemImg != NULL)

2
src/keysections.cpp
View file

@ -48,7 +48,7 @@ static void LoadKeys (const char *modname, bool dbl)
{ {
char section[64]; 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" : "."); dbl ? ".Double" : ".");
FKeyBindings *bindings = dbl? &DoubleBindings : &Bindings; FKeyBindings *bindings = dbl? &DoubleBindings : &Bindings;

4
src/sdl/i_system.cpp
View file

@ -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_append (store, &iter);
gtk_list_store_set (store, &iter, gtk_list_store_set (store, &iter,
0, filepart, 0, filepart,
1, wads[i].Name, 1, wads[i].Name.GetChars(),
2, i, 2, i,
-1); -1);
if (i == defaultiwad) if (i == defaultiwad)
@ -625,7 +625,7 @@ int I_PickIWad (WadStuff *wads, int numwads, bool showwin, int defaultiwad)
filepart = wads[i].Path; filepart = wads[i].Path;
else else
filepart++; 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? "); printf ("Which one? ");
scanf ("%d", &i); scanf ("%d", &i);