mirror of
https://github.com/ZDoom/Raze.git
synced 2025-01-31 12:30:40 +00:00
- got rid of tileHeight and tileWidth.
This commit is contained in:
parent
2f2021f5d2
commit
a2b2e2ec87
3 changed files with 3 additions and 20 deletions
|
@ -24,23 +24,6 @@ inline void spritetypebase::setspritetexture(FTextureID tex)
|
|||
picnum = legacyTileNum(tex);
|
||||
}
|
||||
|
||||
//[[deprecated]]
|
||||
inline int tileWidth(int num)
|
||||
{
|
||||
auto texid = tileGetTextureID(num);
|
||||
if (!texid.isValid()) return 1;
|
||||
else return (int)TexMan.GetGameTexture(texid)->GetDisplayWidth();
|
||||
}
|
||||
|
||||
//[[deprecated]]
|
||||
inline int tileHeight(int num)
|
||||
{
|
||||
auto texid = tileGetTextureID(num);
|
||||
if (!texid.isValid()) return 1;
|
||||
else return (int)TexMan.GetGameTexture(texid)->GetDisplayHeight();
|
||||
}
|
||||
|
||||
|
||||
//[[deprecated]]
|
||||
inline FGameTexture* tileGetTexture(int tile, bool animate = false)
|
||||
{
|
||||
|
|
|
@ -239,7 +239,7 @@ void DrawClock()
|
|||
int v2 = nVal & 0xF;
|
||||
auto texid = tileGetTextureID(v2 + kClockSymbol1);
|
||||
auto tex = TexMan.GetGameTexture(texid);
|
||||
int yPos = 32 - tileHeight(v2 + kClockSymbol1) / 2;
|
||||
int yPos = 32 - tex->GetTexelHeight() / 2;
|
||||
|
||||
CopyTileToBitmap(texid, tileGetTextureID(kTile3603), ebp - tex->GetTexelWidth() / 2, yPos);
|
||||
|
||||
|
|
|
@ -373,7 +373,7 @@ void seq_DrawPilotLightSeq(double xPos, double yPos, double nAngle)
|
|||
const double x = xPos + frameChunk.xpos;
|
||||
const double y = yPos + frameChunk.ypos;
|
||||
|
||||
hud_drawsprite(x, y, 65536, nAngle, legacyTileNum(frameChunk.tex), 0, 0, 1);
|
||||
hud_drawsprite(x, y, 1, nAngle, frameChunk.tex, 0, 0, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -395,7 +395,7 @@ void seq_DrawGunSequence(const SeqFrame& seqFrame, double xPos, double yPos, int
|
|||
const double y = yPos + frameChunk.ypos;
|
||||
const int frameStat = nStat | (RS_XFLIPHUD * !!(frameChunk.flags & 1)) | (RS_YFLIPHUD * !!(frameChunk.flags & 2));
|
||||
|
||||
hud_drawsprite(x, y, 65536, nAngle.Degrees(), legacyTileNum(frameChunk.tex), nShade, nPal, frameStat, nAlpha);
|
||||
hud_drawsprite(x, y, 1, nAngle.Degrees(), frameChunk.tex, nShade, nPal, frameStat, nAlpha);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue