diff options
| author | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-09 01:12:26 +0000 |
|---|---|---|
| committer | momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-09 01:12:26 +0000 |
| commit | d5661e0737749878990799d920b5c8b8cf382948 (patch) | |
| tree | 55d3a87d2d437726a6ebb4dde7ad1af5fe10e2ef | |
| parent | bfb15e68b763800587fa57727fc4baaa0e5e2800 (diff) | |
| download | hercules-d5661e0737749878990799d920b5c8b8cf382948.tar.gz hercules-d5661e0737749878990799d920b5c8b8cf382948.tar.bz2 hercules-d5661e0737749878990799d920b5c8b8cf382948.tar.xz hercules-d5661e0737749878990799d920b5c8b8cf382948.zip | |
Fixed bugreport:6851, two chrif-related messages had the same id as cash points.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16882 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | conf/msg_athena.conf | 7 | ||||
| -rw-r--r-- | 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 274bbefbc..d625472ba 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 e07313855..1575e11f4 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] } |