Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Subtypes "getValuesById" now returns a reference

Browse Source 
- Minor cleanup of Transformer per one of my comments a few days ago.
This commit is contained in:
wagic.the.homebrew
2011-05-16 23:19:08 +00:00
parent 39420a911f
commit 480875d57a
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/Subtypes.h
+1 -1
View File
@@ -46,7 +46,7 @@ public:
bool isType(unsigned int type); bool isType(unsigned int type);
bool isSubType(unsigned int type); bool isSubType(unsigned int type);
int add(string value, unsigned int parentType); int add(string value, unsigned int parentType);
const vector<string> getValuesById(); const vector<string>& getValuesById();
}; };
#endif #endif
projects/mtg/src/AllAbilities.cpp
+4 -7
View File
@@ -2427,9 +2427,9 @@ ATransformer::ATransformer(int id, MTGCardInstance * source, MTGCardInstance * t
if (stypes.find("allsubtypes") != string::npos || stypes.find("removecreaturesubtypes") != string::npos) if (stypes.find("allsubtypes") != string::npos || stypes.find("removecreaturesubtypes") != string::npos)
{ {
const vector<string> values = Subtypes::subtypesList->getValuesById(); const vector<string> values = Subtypes::subtypesList->getValuesById();
for (size_t i = 0; i <values.size(); ++i) for (size_t i = 0; i <values.size(); ++i)
{ {
if (!Subtypes::subtypesList->isSubtypeOfType(i,Subtypes::TYPE_CREATURE)) if (!Subtypes::subtypesList->isSubtypeOfType(i,Subtypes::TYPE_CREATURE))
continue; continue;
types.push_back(i); types.push_back(i);
@@ -2684,10 +2684,7 @@ int ATransformer::destroy()
} }
//in the case that we removed or added types to a card, so that it retains its original name when the effect is removed. //in the case that we removed or added types to a card, so that it retains its original name when the effect is removed.
if(_target->model->data->name.size())//tokens don't have a model name. if(_target->model->data->name.size())//tokens don't have a model name.
{ _target->setName(_target->model->data->name.c_str());
_target->name.clear();
_target->setName(_target->model->data->name.c_str());
}
} }
return 1; return 1;
} }
projects/mtg/src/Subtypes.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ bool Subtypes::isSubType(unsigned int type)
return (!isSuperType(type) && !isType(type)); return (!isSuperType(type) && !isType(type));
} }
const vector<string> Subtypes::getValuesById() const vector<string>& Subtypes::getValuesById()
{ {
return valuesById; return valuesById;
} }