3 files changed, 21 insertions, 1 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index badf117ed..f44493cb3 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3769,6 +3769,7 @@ static const struct battle_data_short {
 	{ "autospell_stacking", 				&battle_config.autospell_stacking },
 	{ "override_mob_names", 				&battle_config.override_mob_names },
 	{ "min_chat_delay",						&battle_config.min_chat_delay },
+	{ "friend_auto_add",						&battle_config.friend_auto_add },
 	{ "homunculus_show_growth",					&battle_config.homunculus_show_growth },	//[orn]
 	{ "homunculus_friendly_rate",				&battle_config.homunculus_friendly_rate },
 };
@@ -4208,6 +4209,7 @@ void battle_set_defaults() {
 	battle_config.autospell_stacking = 0;
 	battle_config.override_mob_names = 0;
 	battle_config.min_chat_delay = 0;
+	battle_config.friend_auto_add = 0;
 	battle_config.hvan_explosion_intimate = 45000;	//[orn]
 	battle_config.homunculus_show_growth = 0;	//[orn]
 	battle_config.homunculus_friendly_rate = 100;
diff --git a/src/map/battle.h b/src/map/battle.h
index 2d851176a..130ec2d4d 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -439,6 +439,7 @@ extern struct Battle_Config {
 	unsigned short autospell_stacking; //Enables autospell cards to stack. [Skotlex]

 	unsigned short override_mob_names; //Enables overriding spawn mob names with the mob_db names. [Skotlex]

 	unsigned short min_chat_delay; //Minimum time between client messages. [Skotlex]

+	unsigned short friend_auto_add; //When accepting friends, both get friended. [Skotlex]

 	unsigned int hvan_explosion_intimate ;	// fix [albator]

 	unsigned short homunculus_show_growth ;	//[orn]

 	unsigned short homunculus_friendly_rate;

diff --git a/src/map/clif.c b/src/map/clif.c
index ac76dd9f2..366da63df 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11281,7 +11281,24 @@ void clif_parse_FriendsListReply(int fd, struct map_session_data *sd) {
 		memcpy(f_sd->status.friends[i].name, sd->status.name, NAME_LENGTH);

 		clif_friendslist_reqack(f_sd, sd, 0);

 

-//		clif_friendslist_send(sd); //This is not needed anymore.

+		if (battle_config.friend_auto_add) {

+			// Also add f_sd to sd's friendlist.

+			for (i = 0; i < MAX_FRIENDS; i++) {

+				if (sd->status.friends[i].char_id == f_sd->status.char_id)

+					return; //No need to add anything.

+				if (sd->status.friends[i].char_id == 0)

+					break;

+			}

+			if (i == MAX_FRIENDS) {

+				clif_friendslist_reqack(sd, f_sd, 2);

+				return;

+			}

+

+			sd->status.friends[i].account_id = f_sd->status.account_id;

+			sd->status.friends[i].char_id = f_sd->status.char_id;

+			memcpy(sd->status.friends[i].name, f_sd->status.name, NAME_LENGTH);

+			clif_friendslist_reqack(sd, f_sd, 0);

+		}

 	}

 

 	return;