From 9f56cbc7cc9256a65331d33264276dbc6f2ef986 Mon Sep 17 00:00:00 2001 From: momacabu Date: Fri, 9 Nov 2012 01:12:26 +0000 Subject: [PATCH] Fixed bugreport:6851, two chrif-related messages had the same id as cash points. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16882 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/msg_athena.conf | 7 ++++--- src/map/chrif.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf index 274bbefbc5..d625472ba6 100644 --- a/conf/msg_athena.conf +++ b/conf/msg_athena.conf @@ -414,10 +414,11 @@ 404: War of Emperium SE is currently in progress. 405: War of Emperium SE has been ended. 406: War of Emperium SE is currently not in progress. - +//407 free //chrif related -410: Need disconnection to perform change-sex request... -411: Your sex has been changed (need disconnection by the server)... +408: Need disconnection to perform change-sex request... +409: Your sex has been changed (need disconnection by the server)... +//410-411 free 412: Your account has 'Unregistered'. 413: Your account has an 'Incorrect Password'... 414: Your account has expired. diff --git a/src/map/chrif.c b/src/map/chrif.c index e073138554..1575e11f4d 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -810,7 +810,7 @@ int chrif_changesex(struct map_session_data *sd) { WFIFOW(char_fd,30) = 5; WFIFOSET(char_fd,44); - clif_displaymessage(sd->fd, msg_txt(410)); //"Need disconnection to perform change-sex request..." + clif_displaymessage(sd->fd, msg_txt(408)); //"Need disconnection to perform change-sex request..." if (sd->fd) clif_authfail_fd(sd->fd, 15); @@ -906,7 +906,7 @@ int chrif_changedsex(int fd) { // save character sd->login_id1++; // change identify, because if player come back in char within the 5 seconds, he can change its characters // do same modify in login-server for the account, but no in char-server (it ask again login_id1 to login, and don't remember it) - clif_displaymessage(sd->fd, msg_txt(411)); //"Your sex has been changed (need disconnection by the server)..." + clif_displaymessage(sd->fd, msg_txt(409)); //"Your sex has been changed (need disconnection by the server)..." set_eof(sd->fd); // forced to disconnect for the change map_quit(sd); // Remove leftovers (e.g. autotrading) [Paradox924X] }