amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 13:37:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed length function to work correctly for ScriptObjects, in particular for TextValues.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1010 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-06-28 15:13:04 +00:00
parent 737dc6f15e
commit c0669fb658
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/to_value.hpp
+8 -2
View File
@@ -266,11 +266,17 @@ class ScriptObject : public ScriptValue {
} }
virtual ScriptValueP makeIterator(const ScriptValueP& thisP) const { virtual ScriptValueP makeIterator(const ScriptValueP& thisP) const {
ScriptValueP it = make_iterator(*value); ScriptValueP it = make_iterator(*value);
return it ? it : ScriptValue::makeIterator(thisP); if (it) return it;
ScriptValueP d = getDefault();
if (d) return d->makeIterator(d);
return ScriptValue::makeIterator(thisP);
} }
virtual int itemCount() const { virtual int itemCount() const {
int i = item_count(*value); int i = item_count(*value);
return i >= 0 ? i : ScriptValue::itemCount(); if (i >= 0) return i;
ScriptValueP d = getDefault();
if (d) return d->itemCount();
return ScriptValue::itemCount();
} }
/// Objects can be compared by comparing pointers /// Objects can be compared by comparing pointers
virtual CompareWhat compareAs(String& compare_str, void const*& compare_ptr) const { virtual CompareWhat compareAs(String& compare_str, void const*& compare_ptr) const {