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

Fixed bugreport:6851, two chrif-related messages had the same id as cash points.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16882 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
momacabu
2012-11-09 01:12:26 +00:00
parent aae7d1d129
commit 9f56cbc7cc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
conf/msg_athena.conf
View File

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

4
src/map/chrif.c
View File

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