diff options
| author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-08 02:26:40 +0000 |
|---|---|---|
| committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-08 02:26:40 +0000 |
| commit | 19d5fb82ab20b827cda6df012070e92cd1f1a96d (patch) | |
| tree | 9fe8ea32cc124ac9c17b5ee245ad288a939a5705 | |
| parent | 41ca5bd82328576e84d19923b5cfda6d7b218e9f (diff) | |
| download | hercules-19d5fb82ab20b827cda6df012070e92cd1f1a96d.tar.gz hercules-19d5fb82ab20b827cda6df012070e92cd1f1a96d.tar.bz2 hercules-19d5fb82ab20b827cda6df012070e92cd1f1a96d.tar.xz hercules-19d5fb82ab20b827cda6df012070e92cd1f1a96d.zip | |
Reverted a jA change in event loading
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1209 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-SVN.txt | 3 | ||||
| -rw-r--r-- | src/map/npc.c | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt index 081c0b8cb..ca73c81e6 100644 --- a/Changelog-SVN.txt +++ b/Changelog-SVN.txt @@ -1,5 +1,8 @@ Date Added +03/08 + * Reverted a jA change in event loading [celest] + 03/07 * Added uptime logging support whenever the server closes, to enable change the 0 to 1 in core.c [celest] diff --git a/src/map/npc.c b/src/map/npc.c index 7634c0d0b..21d863baf 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1882,15 +1882,15 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line printf("npc_parse_script: label name error !\n"); exit(1); }else{ - struct event_data *ev2; + //struct event_data *ev2; ev->nd=nd; ev->pos=pos; sprintf(buf,"%s::%s",nd->exname,lname); - ev2 = strdb_search(ev_db,buf); - if(ev2 != NULL) { - printf("npc_parse_script : duplicate event %s\n",buf); - aFree(ev2); - } + //ev2 = strdb_search(ev_db,buf); + //if(ev2 != NULL) { + // printf("npc_parse_script : duplicate event %s\n",buf); + // aFree(ev2); + //} strdb_insert(ev_db,buf,ev); } } |