diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-16 13:23:57 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-16 13:23:57 +0000 |
| commit | eea9a4cd5b4830f8319410a5a33055e1ee31f4a3 (patch) | |
| tree | e868f9837b9e0d462a915d6c131faf4e30dda93b | |
| parent | 7e0ffd54d0b3ba78d67d5ca09360ec3bcb47f3bb (diff) | |
| download | hercules-eea9a4cd5b4830f8319410a5a33055e1ee31f4a3.tar.gz hercules-eea9a4cd5b4830f8319410a5a33055e1ee31f4a3.tar.bz2 hercules-eea9a4cd5b4830f8319410a5a33055e1ee31f4a3.tar.xz hercules-eea9a4cd5b4830f8319410a5a33055e1ee31f4a3.zip | |
* Missing lines in npc_parse_script!
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6109 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/npc.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 9f1d1b499..3abd48fed 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -15,6 +15,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. * Experimental npc_event_doall_sub with queue and npc_id allocation when needed.
[Lance]
* Added warnings to npc_scriptcont for easier debugging. [Lance]
+ * Missing lines in npc_parse_script! [Lance]
2006/04/15
* Fixed upgrade_svn5902.sql, thanks to Koshiro for pointing it out.
diff --git a/src/map/npc.c b/src/map/npc.c index 15cf75983..486c4659c 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1842,6 +1842,9 @@ static int npc_parse_script (char *w1,char *w2,char *w3,char *w4,char *first_lin if (m == -1){
// スクリプトコピー用のダミーNPC
+ nd->class_ = -1;
+ nd->u.scr.xs = 0;
+ nd->u.scr.ys = 0;
} else if (sscanf(w4, "%d,%d,%d", &class_, &xs, &ys) == 3) {
// 接触型NPC
int i, j;
|