diff options
| author | panikon <panikon@zoho.com> | 2014-02-19 20:24:56 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-02-19 20:24:56 -0300 |
| commit | d6cd24a757c7254914ef048f71aa7e9d4f493fda (patch) | |
| tree | 53b779650a2821dc8bf2a9deb00d5a03890449fe /src/map/map.h | |
| parent | e6b107b80355201fa958a74860d59a5034bb839d (diff) | |
| download | hercules-d6cd24a757c7254914ef048f71aa7e9d4f493fda.tar.gz hercules-d6cd24a757c7254914ef048f71aa7e9d4f493fda.tar.bz2 hercules-d6cd24a757c7254914ef048f71aa7e9d4f493fda.tar.xz hercules-d6cd24a757c7254914ef048f71aa7e9d4f493fda.zip | |
Readding last merge as last revert was unintended. Sorry for the trouble.
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/map/map.h b/src/map/map.h index a4e9499b3..438027917 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -443,7 +443,6 @@ typedef enum { CELL_LANDPROTECTOR, CELL_NOVENDING, CELL_NOCHAT, - CELL_MAELSTROM, CELL_ICEWALL, } cell_t; @@ -467,7 +466,6 @@ typedef enum { CELL_CHKLANDPROTECTOR, CELL_CHKNOVENDING, CELL_CHKNOCHAT, - CELL_CHKMAELSTROM, CELL_CHKICEWALL, } cell_chk; @@ -486,7 +484,6 @@ struct mapcell { landprotector : 1, novending : 1, nochat : 1, - maelstrom : 1, icewall : 1; #ifdef CELL_NOSTACK |