summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt5
-rw-r--r--src/char_sql/char.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7560bc3a6..3ff8f2186 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,10 +3,13 @@ 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/12
+ * Login will no longer set character offline when going from map
+ to character select. (r12575) [Kevin]
2008/04/11
* Reverted the `login` table changes from r12464 [ultramage]
* Finished most of the quest log code, still bits here and there
- - but it's ready for testing. (r12558) [Kevin]
+ but it's ready for testing. (r12558) [Kevin]
2008/04/10
* More quest log code. [Kevin]
* Client not marked online until map receives auth request from the client
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index b4f2671b5..ca1b74ce7 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -59,6 +59,7 @@ char hotkey_db[256] = "hotkey";
char quest_db[256] = "quest";
char quest_obj_db[256] = "quest_objective";
+//If your code editor is having problems syntax highlighting this file, uncomment this and RECOMMENT IT BEFORE COMPILING
//#undef TXT_SQL_CONVERT
#ifndef TXT_SQL_CONVERT
static DBMap* char_db_; // int char_id -> struct mmo_charstatus*
@@ -296,7 +297,7 @@ void set_char_offline(int char_id, int account_id)
}
}
- if (login_fd > 0 && !session[login_fd]->flag.eof)
+ if (login_fd > 0 && !session[login_fd]->flag.eof && (character->fd != -1 && character->char_id != -1))
{
WFIFOHEAD(login_fd,6);
WFIFOW(login_fd,0) = 0x272c;