zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Christoph Oelckers 2013-08-10 10:19:20 +02:00
commit 3bcc4078b1
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_shared/a_artifacts.cpp
View file

@ -1697,7 +1697,7 @@ void APowerRegeneration::DoEffect()
{ {
if (Owner != NULL && Owner->health > 0 && (level.time & 31) == 0) if (Owner != NULL && Owner->health > 0 && (level.time & 31) == 0)
{ {
if (P_GiveBody(Owner, 5)) if (P_GiveBody(Owner, Strength))
{ {
S_Sound(Owner, CHAN_ITEM, "*regenerate", 1, ATTN_NORM ); S_Sound(Owner, CHAN_ITEM, "*regenerate", 1, ATTN_NORM );
} }

1
wadsrc/static/actors/shared/inventory.txt
View file

@ -300,6 +300,7 @@ ACTOR PowerDrain : Powerup native
ACTOR PowerRegeneration : Powerup native ACTOR PowerRegeneration : Powerup native
{ {
Powerup.Duration -120 Powerup.Duration -120
Powerup.Strength 5
} }
ACTOR PowerHighJump : Powerup native {} ACTOR PowerHighJump : Powerup native {}