MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

inventory items rendering cleanup (#1938)

Browse source
This commit is contained in:
qndel 2021-05-14 12:46:16 +02:00 • committed by GitHub
commit 89c40eaa7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Source/inv.cpp
View file

@ -230,11 +230,7 @@ void DrawInv(const CelOutputBuffer &out)
CelBlitOutlineTo(out, GetOutlineColor(plr[myplr].InvBody[slot], true), RIGHT_PANEL_X + screen_x, screen_y, cel, celFrame, false);
}
if (plr[myplr].InvBody[slot]._iStatFlag) {
CelClippedDrawTo(out, RIGHT_PANEL_X + screen_x, screen_y, cel, celFrame);
} else {
CelDrawLightRedTo(out, RIGHT_PANEL_X + screen_x, screen_y, cel, celFrame, 1);
}
CelDrawItem(plr[myplr].InvBody[slot]._iStatFlag, out, RIGHT_PANEL_X + screen_x, screen_y, cel, celFrame);
if (slot == INVLOC_HAND_LEFT) {
if (plr[myplr].InvBody[slot]._iLoc == ILOC_TWOHAND) {
@ -284,19 +280,12 @@ void DrawInv(const CelOutputBuffer &out)
cel, celFrame, false);
}
if (plr[myplr].InvList[ii]._iStatFlag) {
CelClippedDrawTo(
out,
InvRect[j + SLOTXY_INV_FIRST].X + RIGHT_PANEL_X,
InvRect[j + SLOTXY_INV_FIRST].Y - 1,
cel, celFrame);
} else {
CelDrawLightRedTo(
out,
InvRect[j + SLOTXY_INV_FIRST].X + RIGHT_PANEL_X,
InvRect[j + SLOTXY_INV_FIRST].Y - 1,
cel, celFrame, 1);
}
CelDrawItem(
plr[myplr].InvList[ii]._iStatFlag,
out,
InvRect[j + SLOTXY_INV_FIRST].X + RIGHT_PANEL_X,
InvRect[j + SLOTXY_INV_FIRST].Y - 1,
cel, celFrame);
}
}
}
@ -326,11 +315,7 @@ void DrawInvBelt(const CelOutputBuffer &out)
}
}
if (plr[myplr].SpdList[i]._iStatFlag) {
CelClippedDrawTo(out, InvRect[i + SLOTXY_BELT_FIRST].X + PANEL_X, InvRect[i + SLOTXY_BELT_FIRST].Y + PANEL_Y - 1, cel, celFrame);
} else {
CelDrawLightRedTo(out, InvRect[i + SLOTXY_BELT_FIRST].X + PANEL_X, InvRect[i + SLOTXY_BELT_FIRST].Y + PANEL_Y - 1, cel, celFrame, 1);
}
CelDrawItem(plr[myplr].SpdList[i]._iStatFlag, out, InvRect[i + SLOTXY_BELT_FIRST].X + PANEL_X, InvRect[i + SLOTXY_BELT_FIRST].Y + PANEL_Y - 1, cel, celFrame);
if (AllItemsList[plr[myplr].SpdList[i].IDidx].iUsable
&& plr[myplr].SpdList[i]._iStatFlag