- 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://svn.code.sf.net/p/rathena/svn/trunk@10007 54d463be-8e91-2dee-dedb-b68131a5f0ec

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)

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)

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;
 		}
 	}