diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
| commit | 803b7fd5e4224276e5db57e8fa3d351d6529e80f (patch) | |
| tree | 67dff994f7673c7ed2efaef9d496631268668b2f /world/map/npc/009-4/torches.txt | |
| parent | 36c6803069bfe3be37d482e682a3167b8bf0363d (diff) | |
| parent | b3fc5b76efb0031277ad039d3f332b7c2b874d1c (diff) | |
| download | serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.gz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.bz2 serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.xz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/009-4/torches.txt')
| -rw-r--r-- | world/map/npc/009-4/torches.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt index 03acc6b0..79fb6ca1 100644 --- a/world/map/npc/009-4/torches.txt +++ b/world/map/npc/009-4/torches.txt @@ -268,7 +268,7 @@ L_Failed: } // First Torch -009-4.gat,68,21,0|script|Torch|400, +009-4.gat,68,21,0|script|Torch#1|400, { callfunc "InRangeTorch1"; callfunc "DoneWithTorches"; @@ -279,7 +279,7 @@ L_Failed: } // Second Torch -009-4.gat,67,42,0|script|Torch|400, +009-4.gat,67,42,0|script|Torch#2|400, { callfunc "InRangeTorch2"; callfunc "DoneWithTorches"; @@ -290,7 +290,7 @@ L_Failed: } // Third Torch -009-4.gat,33,86,0|script|Torch|400, +009-4.gat,33,86,0|script|Torch#3|400, { callfunc "InRangeTorch3"; callfunc "DoneWithTorches"; |