diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-14 19:31:43 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-14 19:31:43 +0000 |
| commit | 6c93f50fb63d97059355e18865d4da54e14b9ca1 (patch) | |
| tree | 33c184b396688388486d83a0af19174823554aef | |
| parent | 2432219232bc5152745e13930f9a82b75e234c95 (diff) | |
| download | hercules-6c93f50fb63d97059355e18865d4da54e14b9ca1.tar.gz hercules-6c93f50fb63d97059355e18865d4da54e14b9ca1.tar.bz2 hercules-6c93f50fb63d97059355e18865d4da54e14b9ca1.tar.xz hercules-6c93f50fb63d97059355e18865d4da54e14b9ca1.zip | |
- Corrected party item share settings not being properly updated on logon.
- Corrected battle_attr_none setting applying to elemental attacks instead of neutral ones.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10007 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/map/battle.c | 2 | ||||
| -rw-r--r-- | src/map/party.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 92a9ed67a..0ded9a6db 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,10 @@ 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/03/15 + * Corrected party item share settings not being properly updated on logon. + * Corrected battle_attr_none setting applying to elemental attacks instead + of neutral ones. [Skotlex] 2007/03/14 * Finished polishing the new mapcache system [DracoRPG] - common/grfio.* now empty except zipping functions (to read mapcache) diff --git a/src/map/battle.c b/src/map/battle.c index 9919867e4..c0b50b444 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -987,7 +987,7 @@ static struct Damage battle_calc_weapon_attack( if (skill_num == GS_GROUNDDRIFT) s_ele = s_ele_ = wflag; //element comes in flag. - if (s_ele != ELE_NEUTRAL && (battle_config.attack_attr_none&src->type)) + if (s_ele == ELE_NEUTRAL && (battle_config.attack_attr_none&src->type)) nk|=NK_NO_ELEFIX; if(!skill_num) diff --git a/src/map/party.c b/src/map/party.c index 777a2ab3b..eae29138a 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -525,9 +525,9 @@ void party_send_movemap(struct map_session_data *sd) if(!sd->state.party_sent) { party_check_member(&p->party); if(sd->status.party_id==p->party.party_id){ - clif_party_member_info(p,sd); clif_party_option(p,sd,0x100); clif_party_info(p,sd); + clif_party_member_info(p,sd); sd->state.party_sent=1; } } |