zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-23 04:22:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The powerup icons did not blink when expiring.

Browse source
This commit is contained in:
Christoph Oelckers 2017-04-21 18:08:30 +02:00
parent 0ed3ee6267
commit 3ccd4aa0d1
4 changed files with 44 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/g_shared/shared_hud.cpp
View file

@ -1088,23 +1088,35 @@ static void DrawPowerups(player_t *CPlayer)
for (item = CPlayer->mo->Inventory; item != NULL; item = item->Inventory) for (item = CPlayer->mo->Inventory; item != NULL; item = item->Inventory)
{ {
IFVIRTUALPTR(item, AInventory, GetPowerupIcon) if (item->IsKindOf(NAME_Powerup))
{ {
VMValue param[] = { item }; IFVIRTUALPTRNAME(item, NAME_Powerup, GetPowerupIcon)
int rv;
VMReturn ret(&rv);
VMCall(func, param, 1, &ret, 1);
auto tex = FSetTextureID(rv);
if (!tex.isValid()) continue;
auto texture = TexMan(tex);
screen->DrawTexture(texture, x, y, DTA_KeepRatio, true, DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight, DTA_CenterBottomOffset, true, TAG_DONE);
x -= POWERUPICONSIZE;
if (x < -hudwidth / 2)
{ {
x = -20; VMValue param[] = { item };
y += POWERUPICONSIZE * 3 / 2; int rv;
VMReturn ret(&rv);
VMCall(func, param, 1, &ret, 1);
auto tex = FSetTextureID(rv);
if (!tex.isValid()) continue;
auto texture = TexMan(tex);
IFVIRTUALPTRNAME(item, NAME_Powerup, IsBlinking)
{
// Reuse the parameters from GetPowerupIcon
VMCall(func, param, 1, &ret, 1);
if (!rv)
{
screen->DrawTexture(texture, x, y, DTA_KeepRatio, true, DTA_VirtualWidth, hudwidth, DTA_VirtualHeight, hudheight, DTA_CenterBottomOffset, true, TAG_DONE);
x -= POWERUPICONSIZE;
if (x < -hudwidth / 2)
{
x = -20;
y += POWERUPICONSIZE * 3 / 2;
}
}
}
} }
} }
} }

15
wadsrc/static/zscript/inventory/inventory.txt
View file

@ -858,21 +858,6 @@ class Inventory : Actor native
virtual ui version("2.4") bool DrawPowerup(int x, int y) { return false; } virtual ui version("2.4") bool DrawPowerup(int x, int y) { return false; }
//===========================================================================
//
// AInventory :: GetPowerupIcon
//
// Returns the icon that should be drawn for an active powerup.
//
//===========================================================================
virtual clearscope version("2.5") TextureID GetPowerupIcon() const
{
TextureID id;
id.SetInvalid();
return id;
}
//=========================================================================== //===========================================================================
// //
// AInventory :: AbsorbDamage // AInventory :: AbsorbDamage

6
wadsrc/static/zscript/inventory/powerups.txt
View file

@ -269,11 +269,13 @@ class Powerup : Inventory
//=========================================================================== //===========================================================================
// //
// APowerup :: DrawPowerup // AInventory :: GetPowerupIcon
//
// Returns the icon that should be drawn for an active powerup.
// //
//=========================================================================== //===========================================================================
override TextureID GetPowerupIcon() virtual clearscope version("2.5") TextureID GetPowerupIcon() const
{ {
return Icon; return Icon;
} }

22
wadsrc/static/zscript/statusbar/statusbar.txt
View file

@ -813,18 +813,22 @@ class BaseStatusBar native ui
// that can obey AltHUD rules - which this cannot. // that can obey AltHUD rules - which this cannot.
Vector2 pos = (-20, POWERUPICONSIZE * 5 / 4); Vector2 pos = (-20, POWERUPICONSIZE * 5 / 4);
double maxpos = screen.GetWidth() / 2; double maxpos = screen.GetWidth() / 2;
for (let item = CPlayer.mo.Inv; item != NULL; item = item.Inv) for (let iitem = CPlayer.mo.Inv; iitem != NULL; iitem = iitem.Inv)
{ {
let icon = item.GetPowerupIcon(); let item = Powerup(iitem);
if (icon.IsValid()) if (item != null)
{ {
// Each icon gets a 32x32 block. let icon = item.GetPowerupIcon();
DrawTexture(icon, pos, DI_SCREEN_RIGHT_TOP, 1.0, (POWERUPICONSIZE, POWERUPICONSIZE)); if (icon.IsValid() && !item.IsBlinking())
pos.x -= POWERUPICONSIZE;
if (pos.x < -maxpos)
{ {
pos.x = -20; // Each icon gets a 32x32 block.
pos.y += POWERUPICONSIZE * 3 / 2; DrawTexture(icon, pos, DI_SCREEN_RIGHT_TOP, 1.0, (POWERUPICONSIZE, POWERUPICONSIZE));
pos.x -= POWERUPICONSIZE;
if (pos.x < -maxpos)
{
pos.x = -20;
pos.y += POWERUPICONSIZE * 3 / 2;
}
} }
} }
} }