diff options
author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-29 11:30:24 +0000 |
---|---|---|
committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-29 11:30:24 +0000 |
commit | dbb6b02733e07c315435d29e46b21e7a072ce3b0 (patch) | |
tree | 482a051c904acfb146d18ed78f743bb0e3c61175 /src/map | |
parent | 9acb21fa52f80cc6ad6a03f09f019821dce3d23c (diff) | |
download | hercules-dbb6b02733e07c315435d29e46b21e7a072ce3b0.tar.gz hercules-dbb6b02733e07c315435d29e46b21e7a072ce3b0.tar.bz2 hercules-dbb6b02733e07c315435d29e46b21e7a072ce3b0.tar.xz hercules-dbb6b02733e07c315435d29e46b21e7a072ce3b0.zip |
* 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
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/atcommand.c | 26 | ||||
-rw-r--r-- | src/map/clif.c | 13 | ||||
-rw-r--r-- | src/map/pc.h | 2 |
3 files changed, 0 insertions, 41 deletions
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; |