- Modified the "guardian" spawn script command, it no longer receives a "amount" argument (since that only leads to trouble), if the class is negative, it'll pick a random class the same way the monster spawn script command does, and if you pass a spawn position with coordinates equal or less to 0, a random spot in the map will be taken. However you can't use "this" as a map name anymore since these script commands do not need an attached player.

- Guardian spawning will now fail if you attempt to spawn a guardian that already exists on the same position.
- Collapsed clif_party_main_info and clif_party_join_info into a single function: clif_party_member_info
- Collapsed config settings "sg_miracle_skill_min_duration" and "sg_miracle_skill_max_duration" into "sg_miracle_skill_duration", which defaults to an hour.
- Miracle of the Sun, Moon and Stars can now retrigger to lenghten it's effect, and it is cancelled on warp/map-change.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9871 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 4 insertions, 4 deletions

diff --git a/src/map/party.c b/src/map/party.c
index dfa8c0e9e..5b9e19497 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -242,7 +242,7 @@ int party_recv_info(struct party *sp)
 		sd = p->data[i].sd;
 		if(!sd || sd->state.party_sent)
 			continue;
-		clif_party_main_info(p,-1);
+		clif_party_member_info(p,sd);
 		clif_party_option(p,sd,0x100);
 		clif_party_info(p,NULL);
 		sd->state.party_sent=1;
@@ -339,7 +339,7 @@ int party_member_added(int party_id,int account_id,int char_id, int flag)
 		sd->state.party_sent=0;
 		sd->status.party_id=party_id;
 		party_check_conflict(sd);
-		clif_party_join_info(&p->party,sd);
+		clif_party_member_info(p,sd);
 		clif_party_hp(sd);
 		clif_party_xy(sd);
 		clif_charnameupdate(sd); //Update char name's display [Skotlex]
@@ -472,7 +472,7 @@ int party_optionchanged(int party_id,int account_id,int exp,int item,int flag)
 	}
 	if(!(flag&0x10) && p->party.item != item) {
 		p->party.item=item;
-		clif_party_main_info(p,-1);
+		clif_party_member_info(p,sd);
 	}
 	if(flag&0x01) //Send denied message
 		clif_party_option(p,sd,flag);
@@ -538,7 +538,7 @@ void party_send_movemap(struct map_session_data *sd)
 	if(p){
 		party_check_member(&p->party);
 		if(sd->status.party_id==p->party.party_id){
-			clif_party_main_info(p,sd->fd);
+			clif_party_member_info(p,sd);
 			clif_party_option(p,sd,0x100);
 			clif_party_info(p,sd);
 			sd->state.party_sent=1;