mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Fixed some bugs to make GCC work. I needed to change SimpleValueAction to take the function as a variable as opposed to a template parameter - GCC won't accept pointers from a base class in templates.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@231 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -245,21 +245,21 @@ class ScriptCustomCollectionIterator : public ScriptIterator {
|
||||
: pos(0), col(col), colP(colP) {}
|
||||
virtual ScriptValueP next() {
|
||||
if (pos < col->size()) {
|
||||
return to_script(col->at(pos++));
|
||||
return col->at(pos++);
|
||||
} else {
|
||||
return ScriptValueP();
|
||||
}
|
||||
}
|
||||
private:
|
||||
size_t pos;
|
||||
ScriptValueP colP; // for ownership of the collection
|
||||
const vector<ScriptValueP>* col;
|
||||
ScriptValueP colP; // for ownership of the collection
|
||||
};
|
||||
|
||||
ScriptValueP ScriptCustomCollection::getMember(const String& name) const {
|
||||
long index;
|
||||
if (name.ToLong(&index) && index >= 0 && (size_t)index < value.size()) {
|
||||
return to_script(value.at(index));
|
||||
return value.at(index);
|
||||
} else {
|
||||
return ScriptValue::getMember(name);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user