diff options
author | panikon <panikon@zoho.com> | 2014-02-19 17:10:57 -0300 |
---|---|---|
committer | panikon <panikon@zoho.com> | 2014-02-19 17:10:57 -0300 |
commit | c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2 (patch) | |
tree | 53b779650a2821dc8bf2a9deb00d5a03890449fe /src/map/map.c | |
parent | 58544d7f610261a903b3e843a795efd7571b2d56 (diff) | |
parent | d0b9510cf0d7a47e53aa341462a1175326dfc09d (diff) | |
download | hercules-c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2.tar.gz hercules-c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2.tar.bz2 hercules-c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2.tar.xz hercules-c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/map.c')
-rw-r--r-- | src/map/map.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/map/map.c b/src/map/map.c index 96595caae..4bc272035 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2563,8 +2563,6 @@ int map_getcellp(struct map_data* m,int16 x,int16 y,cell_chk cellchk) { return (cell.novending); case CELL_CHKNOCHAT: return (cell.nochat); - case CELL_CHKMAELSTROM: - return (cell.maelstrom); case CELL_CHKICEWALL: return (cell.icewall); @@ -2625,7 +2623,6 @@ void map_setcell(int16 m, int16 x, int16 y, cell_t cell, bool flag) { case CELL_LANDPROTECTOR: map->list[m].cell[j].landprotector = flag; break; case CELL_NOVENDING: map->list[m].cell[j].novending = flag; break; case CELL_NOCHAT: map->list[m].cell[j].nochat = flag; break; - case CELL_MAELSTROM: map->list[m].cell[j].maelstrom = flag; break; case CELL_ICEWALL: map->list[m].cell[j].icewall = flag; break; default: ShowWarning("map_setcell: invalid cell type '%d'\n", (int)cell); |