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

Fixed bugreport:1223 (Invalid Items In Shops Are Processed Incorrectly)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12650 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
toms 2008-04-25 07:47:29 +00:00
parent c68d9e2a7d
commit c79a5092eb
2 changed files with 2 additions and 1 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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/04/25 2008/04/25
* Fixed bugreport:1223 (Invalid Items In Shops Are Processed Incorrectly)
* Modified delitem/delitem2 to have the same behaviour as getitem/getitem2 (optional * Modified delitem/delitem2 to have the same behaviour as getitem/getitem2 (optional
account_id parameter) bugreport:1035 account_id parameter) bugreport:1035
* Modified doc in consequence [Toms] * Modified doc in consequence [Toms]

2
src/map/npc.c
View File

@ -1672,7 +1672,7 @@ static const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const
break; break;
} }
if( (id = itemdb_search(nameid)) == NULL ) if( (id = itemdb_exists(nameid)) == NULL )
{ {
ShowError("npc_parse_shop: Invalid sell item in file '%s', line '%d'. Ignoring the rest of the line...\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", filepath, strline(buffer,start-buffer), w1, w2, w3, w4); ShowError("npc_parse_shop: Invalid sell item in file '%s', line '%d'. Ignoring the rest of the line...\n * w1=%s\n * w2=%s\n * w3=%s\n * w4=%s\n", filepath, strline(buffer,start-buffer), w1, w2, w3, w4);
break; break;