From 6c93f50fb63d97059355e18865d4da54e14b9ca1 Mon Sep 17 00:00:00 2001 From: skotlex Date: Wed, 14 Mar 2007 19:31:43 +0000 Subject: - 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 --- src/map/battle.c | 2 +- src/map/party.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map') 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; } } -- cgit v1.2.3-70-g09d2