From 6be44ef7080eee65c7f57cd038d213532d619a46 Mon Sep 17 00:00:00 2001 From: Lance Date: Sat, 1 Apr 2006 09:48:17 +0000 Subject: * Should not exit when you can't find an NPC file.. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5845 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + npc/scripts_custom.conf | 2 +- src/map/npc.c | 2 +- src/map/script.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 3560508e3..ecabccba4 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ 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/04/01 + * Should not exit when you can't find an NPC file.. [Lance] * Dynamic shops support with script callback. (needs testing) [Lance] * Cleaned up and fixed @where command. [Skotlex] * Fixed standing up no really making you stand up. [Skotlex] diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf index 2bcecceb6..c29aff591 100644 --- a/npc/scripts_custom.conf +++ b/npc/scripts_custom.conf @@ -89,7 +89,7 @@ npc: npc/custom/adoption.txt //npc: npc/custom/Lance/FR_HallOfFame.c //npc: npc/custom/Lance/FR_WeatherController.c //npc: npc/custom/Lance/FR_MailSystem.c -//npc: npc/custom/sample/npc_dynamic_shop.txt +//npc: npc/sample/npc_dynamic_shop.txt // -------------------------------------------------------------- // -------------------------------------------------------------- diff --git a/src/map/npc.c b/src/map/npc.c index eaed2bdee..b5dd3f42a 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2436,7 +2436,7 @@ void npc_parsesrcfile (char *name) FILE *fp = fopen (name,"r"); if (fp == NULL) { ShowError ("File not found : %s\n", name); - exit(1); + return; } current_file = name; diff --git a/src/map/script.c b/src/map/script.c index 980ec5320..874a99840 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -9871,7 +9871,7 @@ int buildin_npcshopitem(struct script_state *st) } nd = (struct npc_data *)aRealloc(nd,sizeof(struct npc_data) + - sizeof(nd->u.shop_item[0]) * (n+1)); + sizeof(nd->u.shop_item[0]) * n); map_addiddb(&nd->bl); -- cgit v1.2.3-70-g09d2