summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-28 15:03:33 +0000
committerKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-28 15:03:33 +0000
commit99530f7a98c91047873d65c6e071af9e861d2bfc (patch)
tree1ad0da474452fc2808ed535394850101d8fb4b0b
parentf4f66f5c07b22bd68274e21aee2b32cb69cea637 (diff)
downloadhercules-99530f7a98c91047873d65c6e071af9e861d2bfc.tar.gz
hercules-99530f7a98c91047873d65c6e071af9e861d2bfc.tar.bz2
hercules-99530f7a98c91047873d65c6e071af9e861d2bfc.tar.xz
hercules-99530f7a98c91047873d65c6e071af9e861d2bfc.zip
Cleaned up char server set online/offline/char select functions. (bugreport:1359)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12670 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/char_sql/char.c15
2 files changed, 12 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2dfd49ea9..ee8e18c24 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2008/04/28
+ * Cleaned up char server set online/offline/char select functions. (r12670) [Kevin]
2008/04/26
* Added script function hasquest. [Kevin]
* Fixed OnGuildBreak. [Kevin]
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index ad0487346..a7fdd2082 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -245,23 +245,27 @@ void set_char_online(int map_id, int char_id, int account_id)
struct online_char_data* character;
struct mmo_charstatus *cp;
- if ( char_id != 99 ) {
- if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `online`='1' WHERE `char_id`='%d'", char_db, char_id) )
- Sql_ShowDebug(sql_handle);
- }
+ //Update DB
+ if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `online`='1' WHERE `char_id`='%d'", char_db, char_id) )
+ Sql_ShowDebug(sql_handle);
+ //Check to see for online conflicts
character = (struct online_char_data*)idb_ensure(online_char_db, account_id, create_online_char_data);
if (online_check && character->char_id != -1 && character->server > -1 && character->server != map_id)
{
- //char == 99 Won't happen anymore, call set_char_charselect to set user "on char server"
ShowNotice("set_char_online: Character %d:%d marked in map server %d, but map server %d claims to have (%d:%d) online!\n",
character->account_id, character->char_id, character->server, map_id, account_id, char_id);
mapif_disconnectplayer(server[character->server].fd, character->account_id, character->char_id, 2);
}
+ //Update state data
+ character->char_id = char_id;
+ character->server = map_id;
+
if( character->server > -1 )
server[character->server].users++;
+ //Get rid of disconnect timer
if(character->waiting_disconnect != -1) {
delete_timer(character->waiting_disconnect, chardb_waiting_disconnect);
character->waiting_disconnect = -1;
@@ -271,6 +275,7 @@ void set_char_online(int map_id, int char_id, int account_id)
cp = (struct mmo_charstatus*)idb_get(char_db_,char_id);
inter_guild_CharOnline(char_id, cp?cp->guild_id:-1);
+ //Notify login server
if (login_fd > 0 && !session[login_fd]->flag.eof)
{
WFIFOHEAD(login_fd,6);