From c8f2dea0bd0068aac6f59a5053d4f0576f21bb23 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Mon, 16 Sep 2013 11:04:07 -0700 Subject: Refactor all broken returns into goto L_Return --- world/map/npc/027-1/monsters.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'world/map/npc/027-1/monsters.txt') diff --git a/world/map/npc/027-1/monsters.txt b/world/map/npc/027-1/monsters.txt index 8daed98c..4b6fdfba 100644 --- a/world/map/npc/027-1/monsters.txt +++ b/world/map/npc/027-1/monsters.txt @@ -28,12 +28,12 @@ _MOBCOUNT_ZOMBIES: set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT); if (@state != 1) - return; + goto L_Return; set @ring, @ring + 1; if (@ring < 10) - return; + goto L_Return; if (rand(8) != 0) - return; + goto L_Return; message strcharinfo(0), "You found a ring hidden in the zombie's rotten rags. Maybe this is what Aldred was looking for..."; set @state, 2; callsub S_Update_Mask; @@ -47,17 +47,20 @@ _MOBCOUNT_FALLENS: set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT); if (@state != 1) - return; + goto L_Return; set @ring, @ring + 1; if (@ring < 10) - return; + goto L_Return; if (rand(8) != 0) - return; + goto L_Return; message strcharinfo(0), "You found a ring inside the fallen's broken helmet. Maybe this is what Aldred was looking for..."; set @state, 2; callsub S_Update_Mask; return; +L_Return: + return; + S_Update_Mask: set QUEST_Graveyard_Inn, (QUEST_Graveyard_Inn & ~(@Graveyard_Inn_MASK)) -- cgit v1.2.3-60-g2f50