zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-19 16:11:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added 'TeleportSpecial' as an alias for 'Teleport' in ZScript to deconflict from the Actor.Teleport function.

Browse source
This commit is contained in:
Christoph Oelckers 2018-02-27 12:44:00 +01:00
parent d873ae75ab
commit aaaf9aa108
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/namedef.h
View file

@ -377,6 +377,8 @@ xx(MomZ)
xx(Threshold) xx(Threshold)
xx(DefThreshold) xx(DefThreshold)
xx(Abs) xx(Abs)
xx(TeleportSpecial)
xx(Teleport)
xx(ACS_NamedExecuteWithResult) xx(ACS_NamedExecuteWithResult)
xx(CallACS) xx(CallACS)
xx(Sqrt) xx(Sqrt)

2
src/scripting/backend/codegen.cpp
View file

@ -7758,6 +7758,8 @@ FxExpression *FxFunctionCall::Resolve(FCompileContext& ctx)
} }
else else
{ {
// This alias is needed because Actor has a Teleport function.
if (MethodName == NAME_TeleportSpecial) MethodName = NAME_Teleport;
special = P_FindLineSpecial(MethodName.GetChars(), &min, &max); special = P_FindLineSpecial(MethodName.GetChars(), &min, &max);
} }
if (special != 0 && min >= 0) if (special != 0 && min >= 0)