OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: Thing_SetTranslation still used a 16-bit word to hold the translation.

Browse source 
- Bumped the maximum resolution up to 2560x1600.
- Fixed: DCanvas::DrawTexture() only expanded virtual screen sizes for widescreen
  resolutions but left 5:4 modes alone. This fix neccessitated the addition of
  DTA_Bottom320x200 for the status bar to use so that it could be flush with the
  bottom of the screen rather than sitting slightly above it.
- Fixed: FConfigFile::ReadConfig()'s definition of whitespace was too broad.
- Fixed: Defining custom translation ranges in descending order and/or with gaps
  made for crashes.


SVN r676 (trunk)
This commit is contained in:
Randy Heit 2008-01-08 01:08:27 +00:00
commit 016ac67376
17 changed files with 130 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/g_shared/shared_sbar.cpp
View file

@ -202,7 +202,15 @@ void FBaseStatusBar::SetScaled (bool scale)
{
ST_X = 0;
ST_Y = 200 - RelTop;
::ST_Y = Scale (ST_Y, SCREENHEIGHT, 200);
if (CheckRatio(SCREENWIDTH, SCREENHEIGHT) != 4)
{ // Normal resolution
::ST_Y = Scale (ST_Y, SCREENHEIGHT, 200);
}
else
{ // 5:4 resolution
::ST_Y = Scale(ST_Y - 100, SCREENHEIGHT*3, BaseRatioSizes[4][1]) + SCREENHEIGHT/2
+ (SCREENHEIGHT - SCREENHEIGHT * BaseRatioSizes[4][3] / 48) / 2;
}
// If this is odd, add one to make it even and close the gap between the
// status bar and the rest of the screen
::ST_Y += (::ST_Y & 1);
@ -427,7 +435,7 @@ void FBaseStatusBar::DrawImage (FTexture *img,
{
screen->DrawTexture (img, x + ST_X, y + ST_Y,
DTA_Translation, translation,
DTA_320x200, Scaled,
DTA_Bottom320x200, Scaled,
TAG_DONE);
}
}
@ -448,7 +456,7 @@ void FBaseStatusBar::DrawDimImage (FTexture *img,
{
screen->DrawTexture (img, x + ST_X, y + ST_Y,
DTA_ColorOverlay, dimmed ? DIM_OVERLAY : 0,
DTA_320x200, Scaled,
DTA_Bottom320x200, Scaled,
TAG_DONE);
}
}
@ -469,7 +477,7 @@ void FBaseStatusBar::DrawFadedImage (FTexture *img,
{
screen->DrawTexture (img, x + ST_X, y + ST_Y,
DTA_Alpha, shade,
DTA_320x200, Scaled,
DTA_Bottom320x200, Scaled,
TAG_DONE);
}
}
@ -491,7 +499,7 @@ void FBaseStatusBar::DrawPartialImage (FTexture *img, int wx, int ww) const
screen->DrawTexture (img, ST_X, ST_Y,
DTA_WindowLeft, wx,
DTA_WindowRight, wx + ww,
DTA_320x200, Scaled,
DTA_Bottom320x200, Scaled,
TAG_DONE);
}
}