diff options
| author | Haru <haru@dotalux.com> | 2013-09-26 02:34:45 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2013-09-26 02:34:45 +0200 |
| commit | 3e5bca5a3df07320ff5c41edbb282df041c36f66 (patch) | |
| tree | c593fcf36c9113cd750013fff084052110cf56ce /src/map/path.c | |
| parent | afcad494411995396b906f214d1c4ffcf485cc0a (diff) | |
| download | hercules-3e5bca5a3df07320ff5c41edbb282df041c36f66.tar.gz hercules-3e5bca5a3df07320ff5c41edbb282df041c36f66.tar.bz2 hercules-3e5bca5a3df07320ff5c41edbb282df041c36f66.tar.xz hercules-3e5bca5a3df07320ff5c41edbb282df041c36f66.zip | |
Renamed variables that would conflict with a rename of iMap to map
Note to plugin developers: if you were importing the "map", you'll need
to change it to "maplist"
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/path.c')
| -rw-r--r-- | src/map/path.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/map/path.c b/src/map/path.c index 2de3eab00..79e004601 100644 --- a/src/map/path.c +++ b/src/map/path.c @@ -68,9 +68,9 @@ int path_blownpos(int16 m,int16 x0,int16 y0,int16 dx,int16 dy,int count) { struct map_data *md; - if( !map[m].cell ) + if( !maplist[m].cell ) return -1; - md = &map[m]; + md = &maplist[m]; if( count>25 ){ //Cap to prevent too much processing...? ShowWarning("path_blownpos: count too many %d !\n",count); @@ -121,9 +121,9 @@ bool path_search_long(struct shootpath_data *spd,int16 m,int16 x0,int16 y0,int16 if( spd == NULL ) spd = &s_spd; // use dummy output variable - if (!map[m].cell) + if (!maplist[m].cell) return false; - md = &map[m]; + md = &maplist[m]; dx = (x1 - x0); if (dx < 0) { @@ -255,9 +255,9 @@ bool path_search(struct walkpath_data *wpd, int16 m, int16 x0, int16 y0, int16 x if (wpd == NULL) wpd = &s_wpd; // use dummy output variable - if (!map[m].cell) + if (!maplist[m].cell) return false; - md = &map[m]; + md = &maplist[m]; #ifdef CELL_NOSTACK //Do not check starting cell as that would get you stuck. |