OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into scripting

Browse source 
Conflicts:
	src/actor.h
	src/g_hexen/a_clericstaff.cpp
	src/p_enemy.cpp
	src/p_interaction.cpp
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
This commit is contained in:
Christoph Oelckers 2016-01-17 20:57:55 +01:00
commit bf747075e8
179 changed files with 10280 additions and 4787 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/g_shared/a_specialspot.cpp
View file

@ -158,7 +158,7 @@ struct FSpotList
while (true)
{
distance = P_AproxDistance(Spots[i]->x - x, Spots[i]->y - y);
distance = Spots[i]->AproxDistance(x, y);
if ((distance >= mindist) && ((maxdist == 0) || (distance <= maxdist))) break;