diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-27 19:55:18 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-27 19:55:18 -0700 |
| commit | 8b41b24415d56a008530a549e7df31b730d5d96c (patch) | |
| tree | cba40613dbac49d597864932a55f619204bb5029 /src/map/npc.cpp | |
| parent | 204bfb1822cadd6ff0bc20820e02f36af98f9c64 (diff) | |
| download | tmwa-8b41b24415d56a008530a549e7df31b730d5d96c.tar.gz tmwa-8b41b24415d56a008530a549e7df31b730d5d96c.tar.bz2 tmwa-8b41b24415d56a008530a549e7df31b730d5d96c.tar.xz tmwa-8b41b24415d56a008530a549e7df31b730d5d96c.zip | |
Make callfunc/callsub in an if an error
Also make all errors fatal and clean up messages a bit.
Diffstat (limited to 'src/map/npc.cpp')
| -rw-r--r-- | src/map/npc.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp index 37f3f62..68b5ad7 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -1800,5 +1800,11 @@ int do_init_npc(void) PRINTF("\rNPCs Loaded: %d [Warps:%d Shops:%d Scripts:%d Mobs:%d] %20s\n", npc_id - START_NPC_NUM, npc_warp, npc_shop, npc_script, npc_mob, ""); + if (script_errors) + { + PRINTF("Cowardly refusing to continue after %d errors\n", script_errors); + abort(); + } + return 0; } |