summaryrefslogtreecommitdiff
path: root/src/being/being.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-06-19 23:04:05 +0300
committerAndrei Karas <akaras@inbox.ru>2016-06-20 01:48:03 +0300
commit9dfde677430ab0dc1c11807b2b0d9f76bab353bb (patch)
tree92907f9c9467cf798c2b6fa392df9eefaebf4898 /src/being/being.h
parent8462b9ae346a41a37b2790c3ea5f14f0e783ab71 (diff)
downloadmv-9dfde677430ab0dc1c11807b2b0d9f76bab353bb.tar.gz
mv-9dfde677430ab0dc1c11807b2b0d9f76bab353bb.tar.bz2
mv-9dfde677430ab0dc1c11807b2b0d9f76bab353bb.tar.xz
mv-9dfde677430ab0dc1c11807b2b0d9f76bab353bb.zip
Add support for stored cards with sprites in Being.
Diffstat (limited to 'src/being/being.h')
-rw-r--r--src/being/being.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/being/being.h b/src/being/being.h
index e5cc44fa0..bcb9d3106 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -23,6 +23,8 @@
#ifndef BEING_BEING_H
#define BEING_BEING_H
+#include "position.h"
+
#include "enums/being/badgeindex.h"
#include "enums/being/reachable.h"
@@ -32,7 +34,7 @@
#include "resources/beinginfo.h"
-#include "position.h"
+#include "resources/item/cardslist.h"
#include "being/actorsprite.h"
@@ -321,14 +323,14 @@ class Being notfinal : public ActorSprite,
const int id,
std::string color,
ItemColor colorId,
- const int *const cards) restrict2;
+ CardsList cards) restrict2;
void setWeaponId(const int id) restrict2;
void setTempSprite(const unsigned int slot,
const int id,
std::string color,
- const int *const cards) restrict2;
+ CardsList cards) restrict2;
void updateSprite(const unsigned int slot,
const int id,
@@ -1094,6 +1096,7 @@ class Being notfinal : public ActorSprite,
StringVect mSpriteColors;
std::vector<int> mSpriteIDs;
+ std::vector<CardsList> mSpriteCardsIds;
std::vector<ItemColor> mSpriteColorsIds;
SpriteParticleInfo mSpriteParticles;