diff options
| author | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-05 12:01:55 +0000 |
|---|---|---|
| committer | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-05 12:01:55 +0000 |
| commit | 513c159bc5bf0ceb8634a13682d1b97cada95e3d (patch) | |
| tree | fcb151d0fec2f534aabe1adaa254262fb6647527 | |
| parent | 4ec2f2eafa9781bce9afc69974aea78ce5d03b69 (diff) | |
| download | hercules-513c159bc5bf0ceb8634a13682d1b97cada95e3d.tar.gz hercules-513c159bc5bf0ceb8634a13682d1b97cada95e3d.tar.bz2 hercules-513c159bc5bf0ceb8634a13682d1b97cada95e3d.tar.xz hercules-513c159bc5bf0ceb8634a13682d1b97cada95e3d.zip | |
Fixed Red Pouch overriding nobranch mapflag
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10464 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/pc.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index e3c61666f..3efea78cd 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. 2007/05/06 + * Fixed Red Pouch overriding nobranch mapflag [Playtester] * Attempt to fix Kyrie Eleison not castable on enemy players [Playtester] - please test, I can't double client to test it in pvp - don't forget to recompile before testing diff --git a/src/map/pc.c b/src/map/pc.c index caf1a8944..ae2914b6f 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2966,8 +2966,8 @@ int pc_isUseitem(struct map_session_data *sd,int n) //Butterfly Wing (can't use noreturn flag is on) if(nameid == 602 && map[sd->bl.m].flag.noreturn) return 0; - //Dead Branch & Bloody Branch & Porings Box (can't use at GVG and when nobranch flag is on) - if((nameid == 604 || nameid == 12103 || nameid == 12109) && (map[sd->bl.m].flag.nobranch || map_flag_gvg(sd->bl.m))) + //Dead Branch & Red Pouch & Bloody Branch & Porings Box (can't use at GVG and when nobranch flag is on) + if((nameid == 604 || nameid == 12024 || nameid == 12103 || nameid == 12109) && (map[sd->bl.m].flag.nobranch || map_flag_gvg(sd->bl.m))) return 0; //Anodyne/Aleovera not usable while sitting. |