summaryrefslogtreecommitdiff
path: root/src/resources/map/map.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-08-07 18:23:39 +0300
committerAndrei Karas <akaras@inbox.ru>2016-08-07 18:23:39 +0300
commitb1753d59caa299c668b9c269e87f96c46e0ab33a (patch)
treed333a7de5b6e9ddde85540d5b5a87eabd747fac1 /src/resources/map/map.cpp
parent1740b281aa32ba2c30a2a6203f7748af6a21fd39 (diff)
downloadmv-b1753d59caa299c668b9c269e87f96c46e0ab33a.tar.gz
mv-b1753d59caa299c668b9c269e87f96c46e0ab33a.tar.bz2
mv-b1753d59caa299c668b9c269e87f96c46e0ab33a.tar.xz
mv-b1753d59caa299c668b9c269e87f96c46e0ab33a.zip
Add player wall collision type (5).
Diffstat (limited to 'src/resources/map/map.cpp')
-rw-r--r--src/resources/map/map.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index e86c0c2a4..073adb2ed 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -591,6 +591,7 @@ void Map::drawCollision(Graphics *restrict const graphics,
fillCollision(BlockMask::AIR, AIR_COLLISION_HIGHLIGHT);
fillCollision(BlockMask::WATER, WATER_COLLISION_HIGHLIGHT);
fillCollision(BlockMask::GROUNDTOP, GROUNDTOP_COLLISION_HIGHLIGHT);
+ fillCollision(BlockMask::PLAYERWALL, COLLISION_HIGHLIGHT);
}
}
}
@@ -709,6 +710,9 @@ void Map::addBlockMask(const int x, const int y,
case BlockType::GROUNDTOP:
mMetaTiles[tileNum].blockmask |= BlockMask::GROUNDTOP;
break;
+ case BlockType::PLAYERWALL:
+ mMetaTiles[tileNum].blockmask |= BlockMask::PLAYERWALL;
+ break;
default:
case BlockType::NONE:
case BlockType::NB_BLOCKTYPES:
@@ -742,6 +746,9 @@ void Map::setBlockMask(const int x, const int y,
case BlockType::GROUNDTOP:
mMetaTiles[tileNum].blockmask = BlockMask::GROUNDTOP;
break;
+ case BlockType::PLAYERWALL:
+ mMetaTiles[tileNum].blockmask = BlockMask::PLAYERWALL;
+ break;
default:
case BlockType::NONE:
case BlockType::NB_BLOCKTYPES: