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

Added new_card function;

Browse Source 
Added parameter to ScriptValue::next to recieve the key of the item.
Finished Add Multiple Cards behaviour.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1147 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-08-11 20:52:33 +00:00
parent ca63496ade
commit f1fe40b4ef
11 changed files with 139 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/to_value.hpp
+6 -3
View File
@@ -92,7 +92,7 @@ struct ScriptIterator : public ScriptValue {
virtual CompareWhat compareAs(String&, void const*&) const; // { return COMPARE_NO; }
/// Return the next item for this iterator, or ScriptValueP() if there is no such item
virtual ScriptValueP next() = 0;
virtual ScriptValueP next(ScriptValueP* key_out = nullptr) = 0;
};
// make an iterator over a range
@@ -100,6 +100,8 @@ ScriptValueP rangeIterator(int start, int end);
// ----------------------------------------------------------------------------- : Collections
ScriptValueP to_script(int);
class ScriptCollectionBase : public ScriptValue {
public:
virtual ScriptType type() const { return SCRIPT_COLLECTION; }
@@ -111,8 +113,9 @@ template <typename Collection>
class ScriptCollectionIterator : public ScriptIterator {
public:
ScriptCollectionIterator(const Collection* col) : pos(0), col(col) {}
virtual ScriptValueP next() {
virtual ScriptValueP next(ScriptValueP* key_out) {
if (pos < col->size()) {
if (key_out) *key_out = to_script((int)pos);
return to_script(col->at(pos++));
} else {
return ScriptValueP();
@@ -213,7 +216,7 @@ class ScriptCustomCollection : public ScriptCollectionBase {
return COMPARE_AS_POINTER;
}
/// The collection as a list (contains all values)
/// The collection as a list (contains only the values that don't have a key)
vector<ScriptValueP> value;
/// The collection as a map (contains only the values that have a key)
map<String,ScriptValueP> key_value;