- Added code submissions for non-piercing railguns and new skill options.
SVN r1706 (trunk)
This commit is contained in:
parent
3786ced96e
commit
635d71e660
25 changed files with 155 additions and 50 deletions
|
|
@ -393,12 +393,12 @@ int P_Thing_Damage (int tid, AActor *whofor0, int amount, FName type)
|
|||
{
|
||||
P_DamageMobj (actor, NULL, whofor0, amount, type);
|
||||
}
|
||||
else if (actor->health < actor->GetDefault()->health)
|
||||
else if (actor->health < actor->SpawnHealth())
|
||||
{
|
||||
actor->health -= amount;
|
||||
if (actor->health > actor->GetDefault()->health)
|
||||
if (actor->health > actor->SpawnHealth())
|
||||
{
|
||||
actor->health = actor->GetDefault()->health;
|
||||
actor->health = actor->SpawnHealth();
|
||||
}
|
||||
if (actor->player != NULL)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue