OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'codesanity' of https://github.com/ZzZombo/zdoom

Browse source 
Conflicts:
	src/info.h
This commit is contained in:
Christoph Oelckers 2015-02-08 11:47:49 +01:00
commit 45117b2603
18 changed files with 58 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_enemy.cpp
View file

@ -2544,8 +2544,6 @@ static bool P_CheckForResurrection(AActor *self, bool usevilestates)
// use the current actor's radius instead of the Arch Vile's default.
fixed_t maxdist = corpsehit->GetDefault()->radius + self->radius;
maxdist = corpsehit->GetDefault()->radius + self->radius;
if (abs(corpsehit->x - viletryx) > maxdist ||
abs(corpsehit->y - viletryy) > maxdist)
continue; // not actually touching