diff options
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
2 files changed, 5 insertions, 1 deletions
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; } } |