Permalink
Browse files

Clear ETs correctly on "leave survival" command.

- ET's GotoOriginal should return without teleporting the ET if the ET
has no poCaster or poMaster.
- Changed Battler.RemoveEvilTwin() to ClearEvilTwin() as the ET itself
is not removed or deleted by this message, only the property cleared.
- Performance improvements in SurvivalRoom due to continuing high CPU
usage.
  • Loading branch information...
skittles1 committed Dec 27, 2015
1 parent ee713e8 commit f2fc00a6b2e0d7389f775fb041e9304b383cad61
@@ -1676,7 +1676,8 @@ messages:
return FALSE;
}
- RemoveEvilTwin()
+ ClearEvilTwin()
+ "Clears the poEvilTwin property, called when ET is deleted."
{
if poEvilTwin <> $
{
@@ -1690,12 +1691,7 @@ messages:
HasEvilTwin()
{
- if poEvilTwin <> $
- {
- return TRUE;
- }
-
- return FALSE;
+ return poEvilTwin <> $;
}
EvilTwinsCreated(what=$)
@@ -156,7 +156,7 @@ messages:
if poOriginal <> $
{
% Clear the original's chasing evil twin property.
- Send(poOriginal,@RemoveEvilTwin);
+ Send(poOriginal,@ClearEvilTwin);
}
if poCaster <> $
@@ -333,7 +333,9 @@ messages:
{
local oRoom;
- if (poOriginal = $)
+ if (poOriginal = $
+ OR poMaster = $
+ OR poCaster = $)
{
return;
}
Oops, something went wrong.

0 comments on commit f2fc00a

Please sign in to comment.