diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-08-07 19:16:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-08-07 19:16:09 +0300 |
| commit | ac8a0111677c27779b2e7effe8ffe42ea013eb57 (patch) | |
| tree | ade8601cace894f6ce9d6c0833fb6fe6c700b576 /src/resources/map/map.cpp | |
| parent | b1753d59caa299c668b9c269e87f96c46e0ab33a (diff) | |
| download | plus-ac8a0111677c27779b2e7effe8ffe42ea013eb57.tar.gz plus-ac8a0111677c27779b2e7effe8ffe42ea013eb57.tar.bz2 plus-ac8a0111677c27779b2e7effe8ffe42ea013eb57.tar.xz plus-ac8a0111677c27779b2e7effe8ffe42ea013eb57.zip | |
Add monster wall collision type.
Diffstat (limited to 'src/resources/map/map.cpp')
| -rw-r--r-- | src/resources/map/map.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index 073adb2ed..f8780fbf6 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -592,6 +592,7 @@ void Map::drawCollision(Graphics *restrict const graphics, fillCollision(BlockMask::WATER, WATER_COLLISION_HIGHLIGHT); fillCollision(BlockMask::GROUNDTOP, GROUNDTOP_COLLISION_HIGHLIGHT); fillCollision(BlockMask::PLAYERWALL, COLLISION_HIGHLIGHT); + fillCollision(BlockMask::MONSTERWALL, MONSTER_COLLISION_HIGHLIGHT); } } } @@ -713,6 +714,9 @@ void Map::addBlockMask(const int x, const int y, case BlockType::PLAYERWALL: mMetaTiles[tileNum].blockmask |= BlockMask::PLAYERWALL; break; + case BlockType::MONSTERWALL: + mMetaTiles[tileNum].blockmask |= BlockMask::MONSTERWALL; + break; default: case BlockType::NONE: case BlockType::NB_BLOCKTYPES: @@ -749,6 +753,9 @@ void Map::setBlockMask(const int x, const int y, case BlockType::PLAYERWALL: mMetaTiles[tileNum].blockmask = BlockMask::PLAYERWALL; break; + case BlockType::MONSTERWALL: + mMetaTiles[tileNum].blockmask = BlockMask::MONSTERWALL; + break; default: case BlockType::NONE: case BlockType::NB_BLOCKTYPES: |