OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved CheckRealHeight from wi_stuff.cpp to texture code.

Browse source
This commit is contained in:
Christoph Oelckers 2017-03-17 23:08:22 +01:00
commit d423ad0d18
5 changed files with 40 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/wi_stuff.cpp
View file

@ -778,42 +778,6 @@ public:
//====================================================================
//
// CheckRealHeight
//
// Checks the posts in a texture and returns the lowest row (plus one)
// of the texture that is actually used.
//
//====================================================================
int CheckRealHeight(FTexture *tex)
{
const FTexture::Span *span;
int maxy = 0, miny = tex->GetHeight();
for (int i = 0; i < tex->GetWidth(); ++i)
{
tex->GetColumn(i, &span);
while (span->Length != 0)
{
if (span->TopOffset < miny)
{
miny = span->TopOffset;
}
if (span->TopOffset + span->Length > maxy)
{
maxy = span->TopOffset + span->Length;
}
span++;
}
}
// Scale maxy before returning it
maxy = int((maxy *2) / tex->Scale.Y);
maxy = (maxy >> 1) + (maxy & 1);
return maxy;
}
//====================================================================
//
// Draws a single character with a shadow
@ -847,7 +811,7 @@ public:
if (h > 50)
{ // Fix for Deus Vult II and similar wads that decide to make these hugely tall
// patches with vast amounts of empty space at the bottom.
h = CheckRealHeight(tex);
h = tex->CheckRealHeight();
}
return y + (h + BigFont->GetHeight()/4) * CleanYfac;
}