summaryrefslogtreecommitdiff
path: root/src/char_sql
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-17 14:09:54 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-17 14:09:54 +0000
commitb719a7594246a5716926dd0b7df6ab8adb97424d (patch)
treebe0e26e7aca1e7e4a8ea0ef3669cdf2b9b4bc457 /src/char_sql
parentc7b72fc94094e863763ecb3c4d8e818953925a2b (diff)
downloadhercules-b719a7594246a5716926dd0b7df6ab8adb97424d.tar.gz
hercules-b719a7594246a5716926dd0b7df6ab8adb97424d.tar.bz2
hercules-b719a7594246a5716926dd0b7df6ab8adb97424d.tar.xz
hercules-b719a7594246a5716926dd0b7df6ab8adb97424d.zip
- Fixed handling of the char_gm_read config for packet 0x2af7 (reloadgmdb)
- Added battle_config debuff_on_logout which removes Asura's SP regen delay and Strip-Equip effects on logout when set to yes (default). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5644 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char_sql')
-rw-r--r--src/char_sql/char.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 058ab1f2b..33a6c8f6a 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -2254,19 +2254,17 @@ int parse_frommap(int fd) {
// map-server alive packet
case 0x2718:
- if (RFIFOREST(fd) < 2)
- return 0;
RFIFOSKIP(fd,2);
break;
case 0x2af7:
- if(char_gm_read)
- {
- RFIFOSKIP(fd,2);
- if (login_fd > 0) { // don't send request if no login-server
- WFIFOW(login_fd,0) = 0x2709;
- WFIFOSET(login_fd, 2);
- }
+ RFIFOSKIP(fd,2);
+ if(char_gm_read) //Re-read gm accounts.
+ read_gm_account();
+ //Send to login request to reload gm accounts.
+ else if (login_fd > 0) { // don't send request if no login-server
+ WFIFOW(login_fd,0) = 0x2709;
+ WFIFOSET(login_fd, 2);
}
break;