aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen/character.h
diff options
context:
space:
mode:
authorPaul Gilbert2016-08-28 15:46:10 -0400
committerPaul Gilbert2016-08-28 15:46:10 -0400
commitef6253fb19822b9a2e9a1ba00418f1d33afff65f (patch)
tree367e064d6a1e2d7f233f624e8fe2e975d20722ff /engines/xeen/character.h
parent0c199f079bc1ed62e6c13f292d569fc52eac546c (diff)
downloadscummvm-rg350-ef6253fb19822b9a2e9a1ba00418f1d33afff65f.tar.gz
scummvm-rg350-ef6253fb19822b9a2e9a1ba00418f1d33afff65f.tar.bz2
scummvm-rg350-ef6253fb19822b9a2e9a1ba00418f1d33afff65f.zip
XEEN: gcc compilation fixes
Diffstat (limited to 'engines/xeen/character.h')
-rw-r--r--engines/xeen/character.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/xeen/character.h b/engines/xeen/character.h
index f1243f1568..83198a1d8d 100644
--- a/engines/xeen/character.h
+++ b/engines/xeen/character.h
@@ -50,8 +50,7 @@ enum Race { HUMAN = 0, ELF = 1, DWARF = 2, GNOME = 3, HALF_ORC = 4 };
enum CharacterClass {
CLASS_KNIGHT = 0, CLASS_PALADIN = 1, CLASS_ARCHER = 2, CLASS_CLERIC = 3,
CLASS_SORCERER = 4, CLASS_ROBBER = 5, CLASS_NINJA = 6, CLASS_BARBARIAN = 7,
- CLASS_DRUID = 8, CLASS_RANGER = 9, TOTAL_CLASSES = 10,
- CLASS_12 = 12, CLASS_15 = 15, CLASS_16 = 16
+ CLASS_DRUID = 8, CLASS_RANGER = 9, TOTAL_CLASSES = 10, CLASS_12 = 12, CLASS_15 = 15, CLASS_16 = 16
};
enum Attribute {
@@ -114,13 +113,14 @@ protected:
ItemCategory _category;
const char *const *_names;
- XeenEngine *vm();
+ XeenEngine *getVm();
void equipError(int itemIndex1, ItemCategory category1, int itemIndex2,
ItemCategory category2);
virtual Common::String getAttributes(XeenItem &item, const Common::String &classes) = 0;
public:
InventoryItems(Character *character, ItemCategory category);
+ virtual ~InventoryItems() {}
void clear();
@@ -150,6 +150,7 @@ protected:
virtual Common::String getAttributes(XeenItem &item, const Common::String &classes);
public:
WeaponItems(Character *character) : InventoryItems(character, CATEGORY_WEAPON) {}
+ virtual ~WeaponItems() {}
virtual void equipItem(int itemIndex);
@@ -163,6 +164,7 @@ protected:
virtual Common::String getAttributes(XeenItem &item, const Common::String &classes);
public:
ArmorItems(Character *character) : InventoryItems(character, CATEGORY_ARMOR) {}
+ virtual ~ArmorItems() {}
virtual void equipItem(int itemIndex);
@@ -187,6 +189,7 @@ protected:
virtual Common::String getAttributes(XeenItem &item, const Common::String &classes);
public:
MiscItems(Character *character) : InventoryItems(character, CATEGORY_MISC) {}
+ virtual ~MiscItems() {}
virtual Common::String getFullDescription(int itemIndex, int displayNum);
};