summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-22 19:30:27 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-22 19:30:27 +0000
commit016bca1491bb5f685bf8ccb2dff81b48dbdc70e4 (patch)
treebc6a9406ea216f5d70f6e244bd35690f013d0fd0
parent2a6a5511cfbbc007f8704eb6835e62c75253bbe8 (diff)
downloadhercules-016bca1491bb5f685bf8ccb2dff81b48dbdc70e4.tar.gz
hercules-016bca1491bb5f685bf8ccb2dff81b48dbdc70e4.tar.bz2
hercules-016bca1491bb5f685bf8ccb2dff81b48dbdc70e4.tar.xz
hercules-016bca1491bb5f685bf8ccb2dff81b48dbdc70e4.zip
- Fixed SC_NEN according to Mpeg
- Added a ShowStatus("Terminating...\n") on login-server_sql git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8441 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/login_sql/login.c1
-rw-r--r--src/map/status.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 6e84bd142..0e561cee9 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/22
+ * Fixed SC_NEN according to Mpeg [Toms]
+ * Added a ShowStatus("Terminating...\n") on login-server_sql [Toms]
* Some corrections to make Tatami Gaeshi work correctly. [Skotlex]
* Fixed SBR44 doing 100% more damage than it should. [Skotlex]
* Some more work on the splash skill code. Now splash-damaged enemies
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index 246e64f41..6adfa48f3 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -2300,6 +2300,7 @@ void sql_config_read(const char *cfgName){ /* Kalaspuff, to get login_db */
void do_final(void) {
//sync account when terminating.
//but no need when you using DBMS (mysql)
+ ShowStatus("Terminating...\n");
mmo_db_close();
online_db->destroy(online_db, NULL);
if (gm_account_db)
diff --git a/src/map/status.c b/src/map/status.c
index 435d7ca6e..4547df182 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6489,7 +6489,6 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
case SC_RUN:
case SC_DODGE:
case SC_AUTOBERSERK: //continues until triggered off manually. [Skotlex]
- case SC_NEN:
case SC_SIGNUMCRUCIS: /* シグナムクルシス */
sc->data[type].timer=add_timer( 1000*600+tick,status_change_timer, bl->id, data );
return 0;