zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into scripting 

Conflicts:
	src/thingdef/thingdef_codeptr.cpp
This commit is contained in:
Christoph Oelckers 2015-04-30 12:32:50 +02:00
parent 5f1c4d157c 50a3f8a3d2
commit d96edb5c68
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/thingdef/thingdef_codeptr.cpp
View File

@ -4685,7 +4685,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Teleport)
P_SpawnTeleportFog(ref, ref->x, ref->y, ref->z, false, true);
else
{
fog2 = Spawn(fog_type, prevX, prevY, prevZ, ALLOW_REPLACE);
fog2 = Spawn(fog_type, ref->x, ref->y, ref->z, ALLOW_REPLACE);
if (fog2 != NULL)
fog2->target = ref;
}