* Removed @aw/@away which duplicates and collides with client's /am (away message) (bugreport:1235, topic:163083, since r4351).

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

6 files changed, 2 insertions, 52 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 51e294de6..4181a6bfc 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
 Date	Added
 
 2011/01/29
+	* Removed @aw/@away which duplicates and collides with client's /am (away message) (bugreport:1235, topic:163083, since r4351). [Ai4rei]
 	* Fixed a map-server crash when invalid items are deleted (option 'item_check') from a logging-in character (bugreport:2604). [Ai4rei]
 	- This removes the pc_checkitem call from pc_authok, as the check is done in clif_parse_LoadEndAck as well, after first status calc has taken place.
 	- Inventory list is now sent before pc_checkitem in clif_parse_LoadEndAck, so that deleted items do not show up as 'unknown item'.
diff --git a/conf/atcommand_athena.conf b/conf/atcommand_athena.conf
index b34ce4fcc..6bbedeb8c 100644
--- a/conf/atcommand_athena.conf
+++ b/conf/atcommand_athena.conf
@@ -124,10 +124,6 @@ accept: 1,1
 reject: 1,1
 leave: 1,1
 
-// Away messsage
-away: 1,1
-aw: 1,1
-
 // Main chat
 main: 1,1
 
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index ef9fda3da..1c9b994c0 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -453,13 +453,7 @@
 //541: %.0s%.0sSomeone got %s
 542: '%s' stole %s's %s (chance: %0.02f%%)
 //542: %.0s%.0sSomeone stole %s
-// @Away message bits
-543: (Automessage has been sent)
-544: Away [AT] - "%s"
-545: Away - "%s"
-546: Away automessage has been activated.
-547: Away automessage has been disabled.
-548: Usage: @away,@aw <message>. Enter empty message for disable it.
+// 543~548 are not used (previously @away messages)
 // @Autotrade
 549: You should be vending to use @autotrade.
 
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index dce7441df..cebd881ce 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -8021,30 +8021,6 @@ ACMD_FUNC(cash)
 	return 0;
 }
 
-/*===================================
- * Away message (@away, @aw) [LuzZza]
- *-----------------------------------*/
-ACMD_FUNC(away)
-{
-	if(strlen(message) > 0) {
-		if(strlen(message) > 128)
-			return -1;
-		strcpy(sd->away_message, message);
-		//"Away automessage has been activated."
-		clif_displaymessage(fd, msg_txt(546));
-	} else {
-		if(strlen(sd->away_message) > 0) {
-			sd->away_message[0] = 0;
-			//"Away automessage has been disabled."
-			clif_displaymessage(fd, msg_txt(547));
-			return 0;
-		}
-		//"Usage: @away,@aw <message>. Enter empty message for disable it."
-		clif_displaymessage(fd, msg_txt(548));
-	}
-	return 0;
-}
-
 // @clone/@slaveclone/@evilclone <playername> [Valaris]
 ACMD_FUNC(clone)
 {
@@ -8878,8 +8854,6 @@ AtCommandInfo atcommand_info[] = {
 	{ "leave",              1,1,      atcommand_leave },
 	{ "accept",             1,1,      atcommand_accept },
 	{ "reject",             1,1,      atcommand_reject },
-	{ "away",               1,1,      atcommand_away },
-	{ "aw",                 1,1,      atcommand_away },
 	{ "main",               1,1,      atcommand_main },
 	{ "clone",             50,50,     atcommand_clone },
 	{ "slaveclone",        50,50,     atcommand_clone },
diff --git a/src/map/clif.c b/src/map/clif.c
index 9831ef4c2..b724ddbab 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9283,19 +9283,6 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
 	// notify sender of success
 	clif_wis_end(fd, 0); // 0: success to send wisper
 
-	// if player has an auto-away message
-	if(dstsd->away_message[0] != '\0')
-	{
-		char output[256];
-		sprintf(output, "%s %s", message, msg_txt(543)); // "(Automessage has been sent)"
-		clif_wis_message(dstsd->fd, sd->status.name, output, strlen(output) + 1);
-		if(dstsd->state.autotrade)
-			sprintf(output, msg_txt(544), dstsd->away_message); // "Away [AT] - "%s""
-		else
-			sprintf(output, msg_txt(545), dstsd->away_message); // "Away - "%s""
-		clif_wis_message(fd, dstsd->status.name, output, strlen(output) + 1);
-		return;
-	}
 	// Normal message
 	clif_wis_message(dstsd->fd, sd->status.name, message, messagelen);
 	return;
diff --git a/src/map/pc.h b/src/map/pc.h
index 24d52a466..c48defbf5 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -384,8 +384,6 @@ struct map_session_data {
 
 	int killerrid, killedrid;
 
-	char away_message[128]; // [LuzZza]
-
 	int cashPoints, kafraPoints;
 	int rental_timer;