From 743c2576cca728f2313aa20d7f9a2d2b97257ecc Mon Sep 17 00:00:00 2001 From: Lance Date: Thu, 1 Jun 2006 00:50:22 +0000 Subject: [Fixed]: - Restoration and saving of sd->npc_id must be done every time. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6904 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 4 ++++ src/map/script.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index e269fd188..31b1f4851 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/05/31 + * [Fixed]: + - Restoration and saving of sd->npc_id must be done every time. [Lance] * Added back the Freeze/Petrify adjustments of -50%def and +25%mdef (when where these lost?). Thanks to Buuyo for pointing it out. [Skotlex] * Corrected the mob_ai&2 setting triggering rude-attacked due to can't walk @@ -23,6 +25,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. [Skotlex] * Cleaned up and corrected the calculation of hit/flee/cri/lucky dodge in status_calc_bl. [Skotlex] + * [Fixed]: + - Incorrect SQL syntax in login.c (missing collumn) [Lance] * [Improved]: - SQL upgrade file for the new loginlog. Thanks to ultramage. [Lance] * [Fixed]: diff --git a/src/map/script.c b/src/map/script.c index 95b97ac9f..932252cde 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11475,8 +11475,8 @@ int run_script(struct script_code *rootscript,int pos,int rid,int oid) bck_scriptstate = sd->npc_scriptstate; bck_stack = sd->stack; sd->stack = NULL; - bck_npcid = sd->npc_id; } + bck_npcid = sd->npc_id; sd->npc_id = oid; } } -- cgit v1.2.3-70-g09d2