diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-25 03:19:47 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-25 03:19:47 +0000 |
| commit | 509650b5b1c3c5137b50e4b82dbc1f2a6ed3b141 (patch) | |
| tree | 727bda6147c7a7ebd8762abb750b961b98689fd9 | |
| parent | 71402dcc1b56c68896a043a66faec201826ac289 (diff) | |
| download | hercules-509650b5b1c3c5137b50e4b82dbc1f2a6ed3b141.tar.gz hercules-509650b5b1c3c5137b50e4b82dbc1f2a6ed3b141.tar.bz2 hercules-509650b5b1c3c5137b50e4b82dbc1f2a6ed3b141.tar.xz hercules-509650b5b1c3c5137b50e4b82dbc1f2a6ed3b141.zip | |
- 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
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/atcommand.c | 7 | ||||
| -rw-r--r-- | src/map/map.c | 2 | ||||
| -rw-r--r-- | src/map/unit.c | 1 |
4 files changed, 4 insertions, 7 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index c218fe85c..489cb3464 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/24
+ * Fixed iteminfo only displaying first result when there were many. [Skotlex] * Fixed pet hatching. [Skotlex] * Small change that SHOULD fix the pet duplication issue. [Skotlex] * Fixed Warp Portal. [Skotlex] 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);
|