diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-25 21:44:34 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-25 21:44:34 +0000 |
| commit | 7cfdfb860e25f24181846d0928d1b8dffc0cb868 (patch) | |
| tree | 4f45e750445a13f41b2934e0f11d75e67a73a388 | |
| parent | ac3ccd33491e6e49d2e8f5da1d2fc657ed00ac1e (diff) | |
| download | hercules-7cfdfb860e25f24181846d0928d1b8dffc0cb868.tar.gz hercules-7cfdfb860e25f24181846d0928d1b8dffc0cb868.tar.bz2 hercules-7cfdfb860e25f24181846d0928d1b8dffc0cb868.tar.xz hercules-7cfdfb860e25f24181846d0928d1b8dffc0cb868.zip | |
Giant Fly Wings are now blocked on noteleport maps and duels.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11804 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 183799325..f9167eaa7 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2007/11/25 + * Rev. 11804 Giant Fly Wings are now blocked on noteleport maps and duels. [L0ne_W0lf] 2007/11/24 * Fixed a crash when Slim Pitcher is cast * Fixed a crash when a taekwon hits a wall while Sprinting (bugreport:483) diff --git a/src/map/pc.c b/src/map/pc.c index 1dcf97fda..bde2c5270 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3012,13 +3012,13 @@ int pc_isUseitem(struct map_session_data *sd,int n) //Anodyne (can't use Anodyne's Endure at GVG) if(nameid == 605 && map_flag_gvg(sd->bl.m)) return 0; - //Fly Wing (can't use at GVG and when noteleport flag is on) - if(nameid == 601 && (map[sd->bl.m].flag.noteleport || map_flag_gvg(sd->bl.m))) { + //Fly Wing/Giant Fly Wing (can't use at GVG and when noteleport flag is on) + if((nameid == 601 || nameid == 12212) && (map[sd->bl.m].flag.noteleport || map_flag_gvg(sd->bl.m))) { clif_skill_teleportmessage(sd,0); return 0; } - //Fly Wing/Butterfly Wing (can't use when you in duel) [LuzZza] - if((nameid == 601 || nameid == 602) && (!battle_config.duel_allow_teleport && sd->duel_group)) { + //Fly Wing/Butterfly Wing/Giant Fly Wing (can't use when you in duel) [LuzZza] + if((nameid == 601 || nameid == 602 || nameid == 12212) && (!battle_config.duel_allow_teleport && sd->duel_group)) { clif_displaymessage(sd->fd, "Duel: Can't use this item in duel."); return 0; } |