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

- Incremented the number of iterations to find a random stop to 100 as 50 seems to no be enough for certain maps.

Browse Source 
- Fixed iteminfo only displaying first result when there were many.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5744 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-03-25 03:19:47 +00:00
parent 3c082b1744
commit 13e8924fa0
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -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 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/24 2006/03/24
* Fixed iteminfo only displaying first result when there were many. [Skotlex]
* Fixed pet hatching. [Skotlex] * Fixed pet hatching. [Skotlex]
* Small change that SHOULD fix the pet duplication issue. [Skotlex] * Small change that SHOULD fix the pet duplication issue. [Skotlex]
* Fixed Warp Portal. [Skotlex] * Fixed Warp Portal. [Skotlex]

7
src/map/atcommand.c
View File

@ -9429,7 +9429,7 @@ int atcommand_iteminfo(
clif_displaymessage(fd, atcmd_output); clif_displaymessage(fd, atcmd_output);
count = MAX_SEARCH; count = MAX_SEARCH;
} }
for (i = 0; i < MAX_SEARCH; i++) { for (i = 0; i < count; i++) {
item_data = item_array[i]; item_data = item_array[i];
sprintf(atcmd_output, "Item: '%s'/'%s'[%d] (%d) Type: %s | Extra Effect: %s", sprintf(atcmd_output, "Item: '%s'/'%s'[%d] (%d) Type: %s | Extra Effect: %s",
item_data->name,item_data->jname,item_data->slot,item_id, 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"); strcpy(atcmd_output, " - Monsters don't drop this item");
clif_displaymessage(fd, atcmd_output); clif_displaymessage(fd, atcmd_output);
return 0;
} }
return 0;
clif_displaymessage(fd, "Item not found.");
return -1;
} }
/*========================================== /*==========================================

2
src/map/map.c
View File

@ -1407,7 +1407,7 @@ int map_search_freecell(struct block_list *src, int m, int *x,int *y, int rx, in
tries = rx2*ry2; tries = rx2*ry2;
if (tries > 50) tries = 50; if (tries > 50) tries = 50;
} else } else
tries = 50; tries = 100;
while(tries--) { while(tries--) {
*x = (rx >= 0)?(rand()%rx2-rx+bx):(rand()%(map[m].xs-2)+1); *x = (rx >= 0)?(rand()%rx2-rx+bx):(rand()%(map[m].xs-2)+1);

1
src/map/unit.c
View File

@ -420,7 +420,6 @@ int unit_warp(struct block_list *bl,int m,int x,int y,int type)
if (x<0 || y<0) if (x<0 || y<0)
{ //Random map position. { //Random map position.
if (!map_search_freecell(NULL, m, &x, &y, -1, -1, 1)) { if (!map_search_freecell(NULL, m, &x, &y, -1, -1, 1)) {
if(battle_config.error_log) 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); 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);