From af99be9bd11d716e0b8ef8eab4a36c9b9925e4c8 Mon Sep 17 00:00:00 2001 From: ultramage Date: Sun, 27 Apr 2008 11:06:55 +0000 Subject: Cleaning up the itemdb reload mess (see r12635, r12643, r12650, r12661, r12662, r12663) * the player data inventory-itemdb index is now refreshed using pc_setinventorydata() * mobdb will no longer initialize with nonexistent items, and mobs will no longer drop them in case of a reload * the clif_buylist() function once again hides invalid npc shop items * it is no longer possible to purchase nonexistent items from a npc shop * npc shop loading will not abort if there is a nonexistent item entry, it will just skip over it git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12665 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/atcommand.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'src/map/atcommand.c') diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 628666df3..691035c61 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -4049,25 +4049,12 @@ int atcommand_partyrecall(const int fd, struct map_session_data* sd, const char* int atcommand_reloaditemdb(const int fd, struct map_session_data* sd, const char* command, const char* message) { nullpo_retr(-1, sd); - itemdb_reload(0); + itemdb_reload(); clif_displaymessage(fd, msg_txt(97)); // Item database reloaded. return 0; } -/*========================================== - * - *------------------------------------------*/ -int atcommand_reloaditemdb2(const int fd, struct map_session_data* sd, const char* command, const char* message) -{ - nullpo_retr(-1, sd); - itemdb_reload(1); - clif_displaymessage(fd, msg_txt(97)); // Item database reloaded. - - return 0; -} - - /*========================================== * *------------------------------------------*/ @@ -8386,7 +8373,6 @@ AtCommandInfo atcommand_info[] = { { "localbroadcast", 40, atcommand_localbroadcast }, // + /lb and /nlb { "recallall", 80, atcommand_recallall }, { "reloaditemdb", 99, atcommand_reloaditemdb }, - { "reloaditemdb2", 99, atcommand_reloaditemdb2 }, { "reloadmobdb", 99, atcommand_reloadmobdb }, { "reloadskilldb", 99, atcommand_reloadskilldb }, { "reloadscript", 99, atcommand_reloadscript }, -- cgit v1.2.3-60-g2f50