zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-01 00:21:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- scriptified the AltHUD's weapon drawer.

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-02 10:11:57 +01:00
parent 1406c11f8e
commit 714ca9b2ce
2 changed files with 79 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/g_shared/shared_hud.cpp
View file

@ -266,68 +266,17 @@ static int DrawAmmo(player_t *CPlayer, int x, int y)
} }
static void DrawOneWeapon(player_t * CPlayer, int x, int & y, AInventory * weapon)
{
double trans;
// Powered up weapons and inherited sister weapons are not displayed.
if (weapon->IntVar(NAME_WeaponFlags) & WIF_POWERED_UP) return;
auto SisterWeapon = weapon->PointerVar<AInventory>(NAME_SisterWeapon);
if (SisterWeapon && weapon->IsKindOf(SisterWeapon->GetClass())) return;
trans=0.4;
if (CPlayer->ReadyWeapon)
{
if (weapon==CPlayer->ReadyWeapon || SisterWeapon == CPlayer->ReadyWeapon) trans = 0.85;
}
FTextureID picnum = GetInventoryIcon(weapon, DI_ALTICONFIRST);
if (picnum.isValid())
{
FTexture * tex = TexMan[picnum];
int w = tex->GetWidth();
int h = tex->GetHeight();
int rh;
if (w>h) rh=8;
else rh=16,y-=8; // don't draw tall sprites too small!
DrawImageToBox(tex, x-24, y, 20, rh, trans);
y-=10;
}
}
static void DrawWeapons(player_t *CPlayer, int x, int y) static void DrawWeapons(player_t *CPlayer, int x, int y)
{ {
int k,j; IFVM(AltHud, DrawWeapons)
AInventory *inv;
// First draw all weapons in the inventory that are not assigned to a weapon slot
for(inv = CPlayer->mo->Inventory; inv; inv = inv->Inventory)
{ {
if (inv->IsKindOf(NAME_Weapon) && VMValue params[] = { althud, CPlayer, x, y };
!CPlayer->weapons.LocateWeapon(inv->GetClass(), NULL, NULL)) VMCall(func, params, countof(params), nullptr, 0);
{
DrawOneWeapon(CPlayer, x, y, inv);
}
}
// And now everything in the weapon slots back to front
for (k = NUM_WEAPON_SLOTS - 1; k >= 0; k--) for(j = CPlayer->weapons.SlotSize(k) - 1; j >= 0; j--)
{
PClassActor *weap = CPlayer->weapons.GetWeapon(k, j);
if (weap)
{
inv=CPlayer->mo->FindInventory(weap);
if (inv)
{
DrawOneWeapon(CPlayer, x, y, inv);
}
}
} }
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// Draw the Inventory // Draw the Inventory

77
wadsrc/static/zscript/statusbar/alt_hud.txt
View file

@ -40,7 +40,7 @@ static FTexture * invgems[2]; // Inventory arrows
DVector2 AM_GetPosition(); DVector2 AM_GetPosition();
*/ */
class AltHud class AltHud ui
{ {
TextureID healthPic, berserkPic; TextureID healthPic, berserkPic;
TextureID tnt1a0; TextureID tnt1a0;
@ -527,5 +527,78 @@ class AltHud
return y; return y;
} }
//---------------------------------------------------------------------------
//
// Drawing weapons
//
//---------------------------------------------------------------------------
void DrawOneWeapon(PlayerInfo CPlayer, int x, in out int y, Weapon weapon)
{
double trans;
// Powered up weapons and inherited sister weapons are not displayed.
if (weapon.bPOWERED_UP) return;
let SisterWeapon = weapon.SisterWeapon;
if (SisterWeapon && (weapon is SisterWeapon.GetClass())) return;
trans=0.4;
let ReadyWeapon = CPlayer.ReadyWeapon;
if (ReadyWeapon)
{
if (weapon == CPlayer.ReadyWeapon || SisterWeapon == CPlayer.ReadyWeapon) trans = 0.85;
}
TextureID picnum = StatusBar.GetInventoryIcon(weapon, StatusBar.DI_ALTICONFIRST);
if (picnum.isValid())
{
// don't draw tall sprites too small.
int w, h;
[w, h] = TexMan.GetSize(picnum);
int rh;
if (w > h) rh = 8;
else
{
rh = 16;
y -= 8;
}
DrawImageToBox(picnum, x-24, y, 20, rh, trans);
y-=10;
}
}
void DrawWeapons(PlayerInfo CPlayer, int x, int y)
{
int k,j;
Inventory inv;
// First draw all weapons in the inventory that are not assigned to a weapon slot
for(inv = CPlayer.mo.Inv; inv; inv = inv.Inv)
{
let weap = Weapon(inv);
if (weap &&
!CPlayer.weapons.LocateWeapon(weap.GetClass()))
{
DrawOneWeapon(CPlayer, x, y, weap);
}
}
// And now everything in the weapon slots back to front
for (k = PlayerPawn.NUM_WEAPON_SLOTS - 1; k >= 0; k--) for(j = CPlayer.weapons.SlotSize(k) - 1; j >= 0; j--)
{
let weap = CPlayer.weapons.GetWeapon(k, j);
if (weap)
{
let weapitem = Weapon(CPlayer.mo.FindInventory(weap));
if (weapitem)
{
DrawOneWeapon(CPlayer, x, y, weapitem);
}
}
}
}
} }