diff options
| author | codemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-21 21:03:50 +0000 |
|---|---|---|
| committer | codemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-21 21:03:50 +0000 |
| commit | 6187e0b109ca6947fb247245a2290b8339011fcd (patch) | |
| tree | be480ff39bde8890d36f726f1ac44ba5d5fd4241 | |
| parent | 39e8b5c44689ba92303be9b36a30d0ad08ddde45 (diff) | |
| download | hercules-6187e0b109ca6947fb247245a2290b8339011fcd.tar.gz hercules-6187e0b109ca6947fb247245a2290b8339011fcd.tar.bz2 hercules-6187e0b109ca6947fb247245a2290b8339011fcd.tar.xz hercules-6187e0b109ca6947fb247245a2290b8339011fcd.zip | |
* Allowed the NPCs without proper curly brackets to still load, but give an error still [Codemaster]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@709 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog.txt | 1 | ||||
| -rw-r--r-- | src/map/npc.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Changelog.txt b/Changelog.txt index 6dc3c65b3..f29f57655 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,6 @@ Date Added 12/21 + * Allowed the NPCs without proper curly brackets to still load, but give an error still [Codemaster] * Added variable 'current_file' which tells the filename of the script while loading npcs [MC Cameri] -the variable its set in do_init_npc() or something like that, so you can only access it after the use of do_init_npc(). diff --git a/src/map/npc.c b/src/map/npc.c index 45e698676..5e40cf6cb 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1675,11 +1675,11 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line } if(curly_count > 0) { printf("\n"); - snprintf(tmp_output,sizeof(tmp_output),"Script skipped. Missing rig" + snprintf(tmp_output,sizeof(tmp_output),"Missing rig" "ht curly brace at line '"CL_WHITE"%d"CL_RESET"' of file \n\t'" CL_WHITE"%s"CL_RESET"'.\n",*lines,current_file); ShowWarning(tmp_output); - script=NULL; + //script=NULL; // Let's load it anyway I guess :p //exit(1); //Wtf? We do we exit? } else { // printf("Ok line %d\n",*lines); @@ -2370,8 +2370,8 @@ int do_init_npc(void) } else if (strcmpi(w2,"script")==0 && count > 3) { if( strcmpi(w1,"function")==0 ){ npc_parse_function(w1,w2,w3,w4,line+w4pos,fp,&lines); - }else{ - npc_parse_script(w1,w2,w3,w4,line+w4pos,fp,&lines); + } else { + npc_parse_script(w1,w2,w3,w4,line+w4pos,fp,&lines); } } else if ( (i=0,sscanf(w2,"duplicate%n",&i), (i>0 && w2[i]=='(')) && count > 3) { npc_parse_script(w1,w2,w3,w4,line+w4pos,fp,&lines); |