zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Made some adjustments to the status bar for original center alignment.

Browse source 
The 2D drawer in this old Build version did not properly center graphics with odd size due to integer math. Some graphics offsets are not correct due to this quirk unless such broken math is used to align them.
Fixes #236
This commit is contained in:
Christoph Oelckers 2020-12-13 19:38:04 +01:00
parent 3787e103d2
commit 220283d1ec
1 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
source/exhumed/src/status.cpp
View file

@ -559,7 +559,7 @@ private:
if (nFrameSize < 0) if (nFrameSize < 0)
break; break;
int flags = DI_ITEM_RELCENTER; int flags = 0;
double x = ChunkXpos[nFrameBase] + xoffset; double x = ChunkXpos[nFrameBase] + xoffset;
double y = ChunkYpos[nFrameBase] + ebx; double y = ChunkYpos[nFrameBase] + ebx;
@ -588,9 +588,21 @@ private:
short chunkFlag = ChunkFlag[nFrameBase]; short chunkFlag = ChunkFlag[nFrameBase];
if (chunkFlag & 1) if (chunkFlag & 3)
{
// This is hard to align with bad offsets, so skip that treatment for mirrored elements.
flags |= DI_ITEM_RELCENTER;
}
else
{
x -= tileWidth(tile) / 2;
y -= tileHeight(tile) / 2;
flags |= DI_ITEM_OFFSETS;
}
if (chunkFlag & 1)
flags |= DI_MIRROR; flags |= DI_MIRROR;
if (chunkFlag & 2) if (chunkFlag & 2)
flags |= DI_MIRRORY; flags |= DI_MIRRORY;
DrawGraphic(tileGetTexture(tile), x, y, flags, 1, -1, -1, 1, 1); DrawGraphic(tileGetTexture(tile), x, y, flags, 1, -1, -1, 1, 1);
@ -611,6 +623,13 @@ private:
return tileGetTexture(ChunkPict[nFrameBase]); return tileGetTexture(ChunkPict[nFrameBase]);
} }
int GetStatusSequenceTile(short nSequence, uint16_t edx)
{
edx += SeqBase[nSequence];
int nFrameBase = FrameBase[edx];
return ChunkPict[nFrameBase];
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// //
@ -621,33 +640,8 @@ private:
{ {
for (int i = nFirstAnim; i >= 0; i = StatusAnim[i].nPrevAnim) for (int i = nFirstAnim; i >= 0; i = StatusAnim[i].nPrevAnim)
{ {
double xoff = 0.5, yoff = 0;
int nSequence = nStatusSeqOffset + StatusAnim[i].s1; int nSequence = nStatusSeqOffset + StatusAnim[i].s1;
DrawStatusSequence(nSequence, StatusAnim[i].s2, 0, 0);
if (StatusAnim[i].s1 >= 37 && StatusAnim[i].s1 <= 43)
{
yoff = 0.5;
}
if (StatusAnim[i].s1 == 4 || StatusAnim[i].s1 == 166)
{
xoff = 0;
}
DrawStatusSequence(nSequence, StatusAnim[i].s2, yoff, xoff);
/*
if (StatusAnim[nAnim].s2 >= (SeqSize[nSequence] - 1))
{
if (!(StatusAnimFlags[nAnim] & 0x10))
{
StatusAnim[nAnim].nPage--;
if (StatusAnim[nAnim].nPage <= 0) {
DestroyStatusAnim(nAnim);
}
}
}
*/
} }
} }
@ -760,15 +754,19 @@ private:
DrawGraphic(img, -4, -22, DI_ITEM_RIGHT_BOTTOM, 1., -1, -1, imgScale, imgScale); DrawGraphic(img, -4, -22, DI_ITEM_RIGHT_BOTTOM, 1., -1, -1, imgScale, imgScale);
} }
// //
// Magic // Magic
// //
if (nItemSeq >= 0) if (nItemSeq >= 0)
{ {
img = GetStatusSequencePic(nItemSeq + nStatusSeqOffset, nItemFrame); int tile = GetStatusSequenceTile(nItemSeq + nStatusSeqOffset, nItemFrame);
imgScale = baseScale / img->GetDisplayHeight(); int tile2 = tile;
DrawGraphic(img, 70, -1, DI_ITEM_CENTER_BOTTOM, 1., -1, -1, imgScale, imgScale); if (tile2 > 744 && tile2 < 751) tile2 = 744;
imgScale = baseScale / tileHeight(tile2);
DrawGraphic(tileGetTexture(tile), 70, -1, DI_ITEM_CENTER_BOTTOM, 1., -1, -1, imgScale, imgScale);
format.Format("%d", pp->nMagic / 10); format.Format("%d", pp->nMagic / 10);