diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-01 09:48:17 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-01 09:48:17 +0000 |
| commit | 6be44ef7080eee65c7f57cd038d213532d619a46 (patch) | |
| tree | 0516cc7ffe43a77edc91f8a45cee8ab4f4051f88 /src | |
| parent | 63c85fa677acf77a4288a3e7d92e24469b8f80f0 (diff) | |
| download | hercules-6be44ef7080eee65c7f57cd038d213532d619a46.tar.gz hercules-6be44ef7080eee65c7f57cd038d213532d619a46.tar.bz2 hercules-6be44ef7080eee65c7f57cd038d213532d619a46.tar.xz hercules-6be44ef7080eee65c7f57cd038d213532d619a46.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/npc.c | 2 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
2 files changed, 2 insertions, 2 deletions
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);
|