From 38d8812da5dece3e5f17f0669258708cc74fb933 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 17 Feb 2006 03:53:39 +0000 Subject: - Fixed crash in AL_TELEPORT. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5305 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + src/map/skill.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index d30e43e25..af7edf6f7 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EVERYTHING ELSE GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS 2006/02/16 + * Fixed a crash in AL_TELEPORT. [Skotlex] * Now you can't close-confine and already confined mob. [Skotlex] * mysql/my_global.h now includes winnt.h under Windows systems... [Skotlex] * Some code cleanup of status.c [Skotlex] diff --git a/src/map/skill.c b/src/map/skill.c index 31249aa1e..04b13b82e 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -4327,7 +4327,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case AL_TELEPORT: /* テレポ?ト */ if(sd) { - if (map[sd->bl.m].flag.noteleport) { /* テレポ禁止 */ + if (map[bl->m].flag.noteleport) { /* テレポ禁止 */ clif_skill_teleportmessage(sd,0); break; } @@ -4351,7 +4351,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in pc_setpos(sd,sd->status.save_point.map, sd->status.save_point.x,sd->status.save_point.y,3); } - } else if(dstmd && !map[sd->bl.m].flag.monster_noteleport) + } else if(dstmd && !map[bl->m].flag.monster_noteleport) mob_warp(dstmd,-1,-1,-1,3); break; -- cgit v1.2.3-70-g09d2