diff options
Diffstat (limited to 'world/map/npc/items')
| -rw-r--r-- | world/map/npc/items/check_wand.txt | 6 | ||||
| -rw-r--r-- | world/map/npc/items/unequipcb.txt | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/world/map/npc/items/check_wand.txt b/world/map/npc/items/check_wand.txt index 43190a85..5a339049 100644 --- a/world/map/npc/items/check_wand.txt +++ b/world/map/npc/items/check_wand.txt @@ -48,8 +48,7 @@ L_Loop: L_SetWand: set @Wand, $@WandsPwr[@wand_loop]; set @WandID, $@WandsAnim[@wand_loop]; - callfunc "MorganState"; - if (@morgan == 2) + if (QL_MORGAN == 2) goto L_SetCastOnce; goto L_Return; @@ -60,8 +59,7 @@ L_LoopAgain: goto L_Loop; L_SetCastOnce: - set @morgan_tmp, 3; - callfunc "SetMorganMask"; + set QL_MORGAN, 3; goto L_Return; L_Return: diff --git a/world/map/npc/items/unequipcb.txt b/world/map/npc/items/unequipcb.txt index 1d269d3a..70480acb 100644 --- a/world/map/npc/items/unequipcb.txt +++ b/world/map/npc/items/unequipcb.txt @@ -2,7 +2,7 @@ // on any map because of the -1 at the end. // Note: the client (I think) has a display bug if this is called // during the intial connection's equip hook -017-9,0,0,0|script|UnequipCB|-1 +017-9,0,0,0|script|UnequipCB|32767 { end; |