summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/enums/resources/map/blockmask.h2
-rw-r--r--src/enums/resources/map/blocktype.h2
-rw-r--r--src/resources/beinginfo.cpp4
-rw-r--r--src/resources/db/homunculusdb.cpp2
-rw-r--r--src/resources/db/mercenarydb.cpp2
-rw-r--r--src/resources/db/monsterdb.cpp2
-rw-r--r--src/resources/map/map.cpp6
7 files changed, 4 insertions, 16 deletions
diff --git a/src/enums/resources/map/blockmask.h b/src/enums/resources/map/blockmask.h
index dda859abf..fa64f4566 100644
--- a/src/enums/resources/map/blockmask.h
+++ b/src/enums/resources/map/blockmask.h
@@ -28,8 +28,6 @@ namespace BlockMask
enum BlockMask
{
WALL = 0x80, // 1000 0000
- CHARACTER = 0x01, // 0000 0001
- MONSTER = 0x02, // 0000 0010
AIR = 0x04, // 0000 0100
WATER = 0x08, // 0000 1000
GROUND = 0x10, // 0001 0000
diff --git a/src/enums/resources/map/blocktype.h b/src/enums/resources/map/blocktype.h
index 0b5ee9179..af8acdb79 100644
--- a/src/enums/resources/map/blocktype.h
+++ b/src/enums/resources/map/blocktype.h
@@ -29,8 +29,6 @@ enumStart(BlockType)
{
NONE = -1,
WALL,
- CHARACTER,
- MONSTER,
AIR,
WATER,
GROUND,
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index 5a36892d9..79969e71e 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -54,11 +54,9 @@ BeingInfo::BeingInfo() :
mAttacks(),
mMenu(),
mBlockWalkMask(BlockMask::WALL
- | BlockMask::CHARACTER
- | BlockMask::MONSTER
| BlockMask::AIR
| BlockMask::WATER),
- mBlockType(BlockType::CHARACTER),
+ mBlockType(BlockType::NONE),
mColors(nullptr),
mTargetOffsetX(0),
mTargetOffsetY(0),
diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp
index 4cf2671b4..67be7502d 100644
--- a/src/resources/db/homunculusdb.cpp
+++ b/src/resources/db/homunculusdb.cpp
@@ -92,7 +92,7 @@ void HomunculusDB::loadXmlFile(const std::string &fileName)
if (!currentInfo)
currentInfo = new BeingInfo;
- currentInfo->setBlockType(BlockType::MONSTER);
+ currentInfo->setBlockType(BlockType::NONE);
BeingCommon::readBasicAttributes(currentInfo,
homunculusNode, "attack");
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp
index 1d8d21173..59165f29c 100644
--- a/src/resources/db/mercenarydb.cpp
+++ b/src/resources/db/mercenarydb.cpp
@@ -92,7 +92,7 @@ void MercenaryDB::loadXmlFile(const std::string &fileName)
if (!currentInfo)
currentInfo = new BeingInfo;
- currentInfo->setBlockType(BlockType::MONSTER);
+ currentInfo->setBlockType(BlockType::NONE);
BeingCommon::readBasicAttributes(currentInfo, mercenaryNode, "attack");
currentInfo->setMaxHP(XML::getProperty(mercenaryNode, "maxHP", 0));
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index 813497b2a..47af5b557 100644
--- a/src/resources/db/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -95,7 +95,7 @@ void MonsterDB::loadXmlFile(const std::string &fileName)
if (!currentInfo)
currentInfo = new BeingInfo;
- currentInfo->setBlockType(BlockType::MONSTER);
+ currentInfo->setBlockType(BlockType::NONE);
currentInfo->setName(XML::langProperty(
// TRANSLATORS: unknown info name
monsterNode, "name", _("unnamed")));
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index bf32d9e0c..8ad0c5977 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -692,12 +692,6 @@ void Map::blockTile(const int x, const int y,
case BlockType::WALL:
mMetaTiles[tileNum].blockmask |= BlockMask::WALL;
break;
- case BlockType::CHARACTER:
- mMetaTiles[tileNum].blockmask |= BlockMask::CHARACTER;
- break;
- case BlockType::MONSTER:
- mMetaTiles[tileNum].blockmask |= BlockMask::MONSTER;
- break;
case BlockType::AIR:
mMetaTiles[tileNum].blockmask |= BlockMask::AIR;
break;