summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-29 17:45:52 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-29 17:45:52 +0300
commit2d32dc27210d16102f9200de115f2c3f79a5cb22 (patch)
tree5aa84ebe6c5c1d708b14bee2bf0ce95df714fc1d /src/resources
parent7bdb50605562e47f1d6ae134881c09bd42293be5 (diff)
downloadmv-2d32dc27210d16102f9200de115f2c3f79a5cb22.tar.gz
mv-2d32dc27210d16102f9200de115f2c3f79a5cb22.tar.bz2
mv-2d32dc27210d16102f9200de115f2c3f79a5cb22.tar.xz
mv-2d32dc27210d16102f9200de115f2c3f79a5cb22.zip
Use BeingTypeId in Being for subtypeid.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/iteminfo.cpp5
-rw-r--r--src/resources/iteminfo.h5
-rw-r--r--src/resources/questeffect.h6
3 files changed, 11 insertions, 5 deletions
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index c68762728..0cdbed04d 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -87,7 +87,7 @@ ItemInfo::~ItemInfo()
}
const std::string &ItemInfo::getSprite(const Gender::Type gender,
- const int race) const
+ const BeingTypeId race) const
{
if (mView)
{
@@ -98,7 +98,8 @@ const std::string &ItemInfo::getSprite(const Gender::Type gender,
{
static const std::string empty;
std::map<int, std::string>::const_iterator i =
- mAnimationFiles.find(static_cast<int>(gender) + race * 4);
+ mAnimationFiles.find(static_cast<int>(gender) +
+ toInt(race, int) * 4);
if (i != mAnimationFiles.end())
return i->second;
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 55e35ea22..3331d7882 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -25,6 +25,8 @@
#include "enums/being/gender.h"
+#include "enums/simpletypes/beingtypeid.h"
+
#include "resources/cursor.h"
#include "resources/itemtype.h"
#include "resources/soundinfo.h"
@@ -125,7 +127,8 @@ class ItemInfo final
const Gender::Type gender, const int race);
const std::string &getSprite(const Gender::Type gender,
- const int race) const A_WARN_UNUSED;
+ const BeingTypeId race)
+ const A_WARN_UNUSED;
void setAttackAction(const std::string &attackAction);
diff --git a/src/resources/questeffect.h b/src/resources/questeffect.h
index c152ce0e8..c4cb13e3e 100644
--- a/src/resources/questeffect.h
+++ b/src/resources/questeffect.h
@@ -21,6 +21,8 @@
#ifndef RESOURCES_QUESTEFFECT_H
#define RESOURCES_QUESTEFFECT_H
+#include "enums/simpletypes/beingtypeid.h"
+
#include <set>
#include <string>
@@ -31,7 +33,7 @@ struct QuestEffect final
QuestEffect() :
map(),
var(0),
- id(0),
+ id(BeingTypeId_zero),
effectId(0),
values()
{
@@ -39,7 +41,7 @@ struct QuestEffect final
std::string map;
int var;
- int id;
+ BeingTypeId id;
int effectId;
std::set<int> values;
};