summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-25 07:47:29 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-25 07:47:29 +0000
commitb01bae71eb625ca94aaf3f8c60fa155a08cd471f (patch)
tree64dbb62fd9a3c07272b2dd26fc16e63376e36d61
parentb775271bebd5b251e0abbaa97d030e2aeea354a9 (diff)
downloadhercules-b01bae71eb625ca94aaf3f8c60fa155a08cd471f.tar.gz
hercules-b01bae71eb625ca94aaf3f8c60fa155a08cd471f.tar.bz2
hercules-b01bae71eb625ca94aaf3f8c60fa155a08cd471f.tar.xz
hercules-b01bae71eb625ca94aaf3f8c60fa155a08cd471f.zip
Fixed bugreport:1223 (Invalid Items In Shops Are Processed Incorrectly)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12650 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/npc.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index d18763598..b92f054e3 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.
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
account_id parameter) bugreport:1035
* Modified doc in consequence [Toms]
diff --git a/src/map/npc.c b/src/map/npc.c
index 92f61564c..98dd2d609 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1672,7 +1672,7 @@ static const char* npc_parse_shop(char* w1, char* w2, char* w3, char* w4, const
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);
break;