Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Should not exit when you can't find an NPC file..

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5845 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lance 2006-04-01 09:48:17 +00:00
parent 63eb37dc33
commit 85843bfe0f
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -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]

2
npc/scripts_custom.conf
View File

@ -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
// --------------------------------------------------------------
// --------------------------------------------------------------

2
src/map/npc.c
View File

@ -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;

2
src/map/script.c
View File

@ -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);