From 509650b5b1c3c5137b50e4b82dbc1f2a6ed3b141 Mon Sep 17 00:00:00 2001 From: skotlex Date: Sat, 25 Mar 2006 03:19:47 +0000 Subject: - Incremented the number of iterations to find a random stop to 100 as 50 seems to no be enough for certain maps. - Fixed iteminfo only displaying first result when there were many. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5744 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/atcommand.c | 7 ++----- src/map/map.c | 2 +- src/map/unit.c | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 8db4597cd..92ec003e5 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -9429,7 +9429,7 @@ int atcommand_iteminfo( clif_displaymessage(fd, atcmd_output); count = MAX_SEARCH; } - for (i = 0; i < MAX_SEARCH; i++) { + for (i = 0; i < count; i++) { item_data = item_array[i]; sprintf(atcmd_output, "Item: '%s'/'%s'[%d] (%d) Type: %s | Extra Effect: %s", item_data->name,item_data->jname,item_data->slot,item_id, @@ -9449,11 +9449,8 @@ int atcommand_iteminfo( strcpy(atcmd_output, " - Monsters don't drop this item"); clif_displaymessage(fd, atcmd_output); - return 0; } - - clif_displaymessage(fd, "Item not found."); - return -1; + return 0; } /*========================================== diff --git a/src/map/map.c b/src/map/map.c index 030ea4d02..7a37f6c43 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1407,7 +1407,7 @@ int map_search_freecell(struct block_list *src, int m, int *x,int *y, int rx, in tries = rx2*ry2; if (tries > 50) tries = 50; } else - tries = 50; + tries = 100; while(tries--) { *x = (rx >= 0)?(rand()%rx2-rx+bx):(rand()%(map[m].xs-2)+1); diff --git a/src/map/unit.c b/src/map/unit.c index ad76f5145..fc6c5c578 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -420,7 +420,6 @@ int unit_warp(struct block_list *bl,int m,int x,int y,int type) if (x<0 || y<0) { //Random map position. - if (!map_search_freecell(NULL, m, &x, &y, -1, -1, 1)) { if(battle_config.error_log) ShowWarning("unit_warp failed. Unit Id:%d/Type:%d, target position map %d (%s) at [%d,%d]\n", bl->id, bl->type, m, map[m].name, x, y); -- cgit v1.2.3-70-g09d2