zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-15 20:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: layout tweaks for inventory display.

Browse source
This commit is contained in:
Christoph Oelckers 2020-09-25 22:31:16 +02:00
parent 77841b3154
commit 047c5de286
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/sw/src/sbar.cpp
View file

@ -491,7 +491,7 @@ private:
char ds[32]; char ds[32];
INVENTORY_DATAp id = &InventoryData[pp->InventoryNum]; INVENTORY_DATAp id = &InventoryData[pp->InventoryNum];
int x = InventoryBoxX + INVENTORY_PERCENT_XOFF + InventoryXoff-1; int x = InventoryBoxX + INVENTORY_PERCENT_XOFF + InventoryXoff;
int y = InventoryBoxY + INVENTORY_PERCENT_YOFF + InventoryYoff; int y = InventoryBoxY + INVENTORY_PERCENT_YOFF + InventoryYoff;
if (TEST(id->Flags, INVF_COUNT)) if (TEST(id->Flags, INVF_COUNT))
@ -539,7 +539,6 @@ private:
} }
else if (TEST(id->Flags, INVF_TIMED)) else if (TEST(id->Flags, INVF_TIMED))
{ {
sprintf(ds, "%s", pp->InventoryActive[pp->InventoryNum] ? "ON" : "OFF");
DisplayTinyString(x, y, pp->InventoryActive[pp->InventoryNum] ? "ON" : "OFF", 0); DisplayTinyString(x, y, pp->InventoryActive[pp->InventoryNum] ? "ON" : "OFF", 0);
} }
} }
@ -555,13 +554,13 @@ private:
int InventoryBoxX = INVENTORY_BOX_X; int InventoryBoxX = INVENTORY_BOX_X;
int InventoryBoxY = INVENTORY_BOX_Y; int InventoryBoxY = INVENTORY_BOX_Y;
int InventoryXoff = 0; int InventoryXoff = -1;
int InventoryYoff = 0; int InventoryYoff = 0;
// put pic // put pic
if (pp->InventoryAmount[pp->InventoryNum]) if (pp->InventoryAmount[pp->InventoryNum])
{ {
PlayerUpdateInventoryPic(pp, InventoryBoxX, InventoryBoxY, InventoryXoff, InventoryYoff); PlayerUpdateInventoryPic(pp, InventoryBoxX, InventoryBoxY, 0, InventoryYoff);
// Auto/On/Off // Auto/On/Off
PlayerUpdateInventoryState(pp, InventoryBoxX, InventoryBoxY, InventoryXoff, InventoryYoff); PlayerUpdateInventoryState(pp, InventoryBoxX, InventoryBoxY, InventoryXoff, InventoryYoff);
// Percent count/Item count // Percent count/Item count
@ -694,7 +693,7 @@ private:
int InventoryBoxX = MINI_BAR_INVENTORY_BOX_X; int InventoryBoxX = MINI_BAR_INVENTORY_BOX_X;
int InventoryBoxY = MINI_BAR_INVENTORY_BOX_Y; int InventoryBoxY = MINI_BAR_INVENTORY_BOX_Y;
int InventoryXoff = 1; int InventoryXoff = 0;
int InventoryYoff = 1; int InventoryYoff = 1;
if (pp->InventoryAmount[pp->InventoryNum]) if (pp->InventoryAmount[pp->InventoryNum])