openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Strictify item ability enum

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-12 15:18:43 -05:00
parent 1d7342edc2
commit 1200ff47d4
16 changed files with 373 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osx/classes/item.cpp
View File

@@ -114,7 +114,7 @@ cItemRec::cItemRec(){
type = eWeapType::NOT_MELEE;
magic_use_type = 0;
graphic_num = 0;
ability = ITEM_NO_ABILITY;
ability = eItemAbil::NONE;
ability_strength = 0;
type_flag = 0;
is_special = 0;
@@ -133,7 +133,7 @@ cItemRec::cItemRec(){
}
cItemRec::cItemRec(long preset){
ability = ITEM_NO_ABILITY;
ability = eItemAbil::NONE;
ability_strength = 0;
type_flag = 0;
is_special = 0;
@@ -440,6 +440,7 @@ std::istream& operator >> (std::istream& in, eItemType& e){
return in;
}
// TODO: Perhaps this should understand symbolic names as well?
std::istream& operator >> (std::istream& in, eItemAbil& e){
int i;
in >> i;
@@ -447,6 +448,6 @@ std::istream& operator >> (std::istream& in, eItemAbil& e){
(i > 69 && i < 95) || (i > 109 && i < 136) ||
(i > 149 && i < 162) || (i > 169 && i < 177))
e = (eItemAbil) i;
else e = ITEM_NO_ABILITY;
else e = eItemAbil::NONE;
return in;
}