mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-10 14:51:51 +00:00
- fixed: IDBEHOLD altered the item counter.
SVN r2247 (trunk)
This commit is contained in:
parent
0529ffa043
commit
7f2ab00abe
4 changed files with 13 additions and 20 deletions
|
@ -537,7 +537,6 @@ PalEntry APowerStrength::GetBlend ()
|
|||
// Invisibility Powerup ------------------------------------------------------
|
||||
|
||||
IMPLEMENT_CLASS (APowerInvisibility)
|
||||
IMPLEMENT_CLASS (APowerShadow)
|
||||
|
||||
// Invisibility flag combos
|
||||
#define INVISIBILITY_FLAGS1 (MF_SHADOW)
|
||||
|
|
|
@ -81,12 +81,6 @@ protected:
|
|||
// fixed_t OwnersNormalAlpha;
|
||||
};
|
||||
|
||||
// Needed only for m_cheat.cpp now
|
||||
class APowerShadow : public APowerInvisibility
|
||||
{
|
||||
DECLARE_CLASS (APowerShadow, APowerInvisibility)
|
||||
};
|
||||
|
||||
class APowerIronFeet : public APowerup
|
||||
{
|
||||
DECLARE_CLASS (APowerIronFeet, APowerup)
|
||||
|
|
|
@ -52,17 +52,17 @@
|
|||
|
||||
void cht_DoCheat (player_t *player, int cheat)
|
||||
{
|
||||
static const PClass * const BeholdPowers[9] =
|
||||
static const char * BeholdPowers[9] =
|
||||
{
|
||||
RUNTIME_CLASS(APowerInvulnerable),
|
||||
RUNTIME_CLASS(APowerStrength),
|
||||
RUNTIME_CLASS(APowerInvisibility),
|
||||
RUNTIME_CLASS(APowerIronFeet),
|
||||
NULL, // MapRevealer
|
||||
RUNTIME_CLASS(APowerLightAmp),
|
||||
RUNTIME_CLASS(APowerShadow),
|
||||
RUNTIME_CLASS(APowerMask),
|
||||
RUNTIME_CLASS(APowerTargeter)
|
||||
{ "PowerInvulnerable" },
|
||||
{ "PowerStrength" },
|
||||
{ "PowerInvisibility" },
|
||||
{ "PowerIronFeet" },
|
||||
{ "MapRevealer" },
|
||||
{ "PowerLightAmp" },
|
||||
{ "PowerShadow" },
|
||||
{ "PowerMask" },
|
||||
{ "PowerTargeter" },
|
||||
};
|
||||
const PClass *type;
|
||||
AInventory *item;
|
||||
|
@ -253,7 +253,7 @@ void cht_DoCheat (player_t *player, int cheat)
|
|||
{
|
||||
if (i != 0)
|
||||
{
|
||||
player->mo->GiveInventoryType (BeholdPowers[i]);
|
||||
cht_Give(player, BeholdPowers[i]);
|
||||
if (cheat == CHT_BEHOLDS)
|
||||
{
|
||||
P_GiveBody (player->mo, -100);
|
||||
|
@ -262,7 +262,7 @@ void cht_DoCheat (player_t *player, int cheat)
|
|||
else
|
||||
{
|
||||
// Let's give the item here so that the power doesn't need colormap information.
|
||||
player->mo->GiveInventoryType(PClass::FindClass("InvulnerabilitySphere"));
|
||||
cht_Give(player, "InvulnerabilitySphere");
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -184,7 +184,7 @@ ACTOR PowerGhost : PowerInvisibility
|
|||
Powerup.Mode "None"
|
||||
}
|
||||
|
||||
ACTOR PowerShadow : PowerInvisibility native
|
||||
ACTOR PowerShadow : PowerInvisibility
|
||||
{
|
||||
+INVENTORY.HUBPOWER
|
||||
Powerup.Duration -55
|
||||
|
|
Loading…
Reference in a new issue