summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/party.c2
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;
}
}