zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-12 15:44:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into scripting

Browse source 
Conflicts:
	src/thingdef/thingdef_codeptr.cpp
This commit is contained in:
Christoph Oelckers 2015-04-30 12:32:50 +02:00
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); P_SpawnTeleportFog(ref, ref->x, ref->y, ref->z, false, true);
else 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) if (fog2 != NULL)
fog2->target = ref; fog2->target = ref;
} }