diff options
| author | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-12 21:35:01 +0000 |
|---|---|---|
| committer | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-02-12 21:35:01 +0000 |
| commit | 0cb73592c2a06fbeba4ab637221d8bb582d172b3 (patch) | |
| tree | aba6444888bd592bb57143b8c52bc1c30978c579 /src/map | |
| parent | e0ea24e48640bc4bfc8ab1931420971f316beabf (diff) | |
| download | hercules-0cb73592c2a06fbeba4ab637221d8bb582d172b3.tar.gz hercules-0cb73592c2a06fbeba4ab637221d8bb582d172b3.tar.bz2 hercules-0cb73592c2a06fbeba4ab637221d8bb582d172b3.tar.xz hercules-0cb73592c2a06fbeba4ab637221d8bb582d172b3.zip | |
fixing Epirata's warnings and errors [Shinomori]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1095 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/map.c | 8 | ||||
| -rw-r--r-- | src/map/map.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/map/map.c b/src/map/map.c index ac480cbab..b666a66b1 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1043,8 +1043,8 @@ if you want to keep this that way then check and swap x0,y0 with x1,y1 // check if block xy is on the line if( (bl->x-x0)*(y1-y0) == (bl->y-y0)*(x1-x0) ) // and if it is within start and end point - if( ((x0<=x1)&&(x0<=bl->x)&&(bl->x<=x1) || (x0>=x1)&&(x0>=bl->x)&&(bl->x>=x1)) && - ((y0<=y1)&&(y0<=bl->y)&&(bl->y<=y1) || (y0>=y1)&&(y0>=bl->y)&&(bl->y>=y1)) ) + if( (((x0<=x1)&&(x0<=bl->x)&&(bl->x<=x1)) || ((x0>=x1)&&(x0>=bl->x)&&(bl->x>=x1))) && + (((y0<=y1)&&(y0<=bl->y)&&(bl->y<=y1)) || ((y0>=y1)&&(y0>=bl->y)&&(bl->y>=y1))) ) bl_list[bl_list_count++]=bl; } }//end for elements @@ -1057,8 +1057,8 @@ if you want to keep this that way then check and swap x0,y0 with x1,y1 // check if mob xy is on the line if( (bl->x-x0)*(y1-y0) == (bl->y-y0)*(x1-x0) ) // and if it is within start and end point - if( ((x0<=x1)&&(x0<=bl->x)&&(bl->x<=x1) || (x0>=x1)&&(x0>=bl->x)&&(bl->x>=x1)) && - ((y0<=y1)&&(y0<=bl->y)&&(bl->y<=y1) || (y0>=y1)&&(y0>=bl->y)&&(bl->y>=y1)) ) + if( (((x0<=x1)&&(x0<=bl->x)&&(bl->x<=x1)) || ((x0>=x1)&&(x0>=bl->x)&&(bl->x>=x1))) && + (((y0<=y1)&&(y0<=bl->y)&&(bl->y<=y1)) || ((y0>=y1)&&(y0>=bl->y)&&(bl->y>=y1))) ) bl_list[bl_list_count++]=bl; } }//end for mobs diff --git a/src/map/map.h b/src/map/map.h index 926d115d0..71dc63925 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -689,7 +689,7 @@ void map_foreachinarea(int (*)(struct block_list*,va_list),int,int,int,int,int,i // -- moonsoul (added map_foreachincell) void map_foreachincell(int (*)(struct block_list*,va_list),int,int,int,int,...); void map_foreachinmovearea(int (*)(struct block_list*,va_list),int,int,int,int,int,int,int,int,...); -void map_foreachinpath(int (*)(struct block_list*,va_list),int,int,int,int,int,int,...); // Celest +void map_foreachinpath(int (*func)(struct block_list*,va_list),int m,int x0,int y0,int x1,int y1,int range,int length,int type,...); // Celest int map_countnearpc(int,int,int); //block関連に追加 int map_count_oncell(int m,int x,int y); |