Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14686 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2011-01-29 11:30:24 +00:00
parent 342f5db18c
commit 884cb80892
6 changed files with 2 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -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'.

4
conf/atcommand_athena.conf
View File

@ -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

8
conf/msg_athena.conf
View File

@ -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.

26
src/map/atcommand.c
View File

@ -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 },

13
src/map/clif.c
View File

@ -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;

2
src/map/pc.h
View File

@ -384,8 +384,6 @@ struct map_session_data {
int killerrid, killedrid;
char away_message[128]; // [LuzZza]
int cashPoints, kafraPoints;
int rental_timer;