diff options
| author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
| commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
| tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /npc/warps | |
| parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
| parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
| download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'npc/warps')
| -rw-r--r-- | npc/warps/dungeons/mosk_dun.txt | 2 | ||||
| -rw-r--r-- | npc/warps/other/arena.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt index f9a195d06..7543b5a9b 100644 --- a/npc/warps/dungeons/mosk_dun.txt +++ b/npc/warps/dungeons/mosk_dun.txt @@ -41,7 +41,7 @@ OnTouch: donpcevent "Soldier1#mos::OnInit"; donpcevent "Soldier2#mos::OnInit"; donpcevent "Soldier3#mos::OnInit"; - set mos_nowinter,12; + mos_nowinter = 12; warp "mosk_in",125,92; end; } diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt index 5ab756c96..fe7011fa6 100644 --- a/npc/warps/other/arena.txt +++ b/npc/warps/other/arena.txt @@ -62,7 +62,7 @@ force_1-2,33,178,0 warp force_10_09 1,1,force_1-2,59,178 // GM Control Panel //============================================================ sec_in02,79,180,3 script #arenacontrol 4_DOG01,{ - set .@i, callfunc("F_GM_NPC",1357,0); + .@i = callfunc("F_GM_NPC",1357,0); if (.@i == -1) { mes "Error!"; close; |