diff options
| author | panikon <panikon@zoho.com> | 2014-02-19 17:54:20 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-02-19 17:54:20 -0300 |
| commit | e6b107b80355201fa958a74860d59a5034bb839d (patch) | |
| tree | 3733e209b68dfcc148053aef38f2f69c4f63a35b /src/map/map.c | |
| parent | c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2 (diff) | |
| download | hercules-e6b107b80355201fa958a74860d59a5034bb839d.tar.gz hercules-e6b107b80355201fa958a74860d59a5034bb839d.tar.bz2 hercules-e6b107b80355201fa958a74860d59a5034bb839d.tar.xz hercules-e6b107b80355201fa958a74860d59a5034bb839d.zip | |
Revert "Merge branch 'master' of https://github.com/HerculesWS/Hercules"
This reverts commit c4a9dd3f2804b75c1d49b5ab58a3ba80ea4303c2, reversing
changes made to 58544d7f610261a903b3e843a795efd7571b2d56.
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/map.c b/src/map/map.c index 4bc272035..96595caae 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -2563,6 +2563,8 @@ 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); @@ -2623,6 +2625,7 @@ 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); |