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

Fixed conversion from Values to other types: Values now report being of the contained type.

Browse Source 
Added toImage function to ScriptValue.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1083 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-08-07 16:26:33 +00:00
parent 40719b7831
commit b5bdaedde2
8 changed files with 34 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/image.cpp
+1 -19
View File
@@ -19,25 +19,7 @@
// convert any script value to a GeneratedImageP
GeneratedImageP image_from_script(const ScriptValueP& value) {
ScriptType t = value->type();
if (t == SCRIPT_IMAGE) {
GeneratedImageP img = dynamic_pointer_cast<GeneratedImage>(value);
if (img) return img;
} else if (t == SCRIPT_STRING) {
return new_intrusive1<PackagedImage>(value->toString());
} else if (t == SCRIPT_NIL) {
return new_intrusive<BlankImage>();
} else if (t == SCRIPT_OBJECT) {
// maybe it's an image value?
intrusive_ptr<ScriptObject<ValueP> > v = dynamic_pointer_cast<ScriptObject<ValueP> >(value);
if (v) {
ImageValueP iv = dynamic_pointer_cast<ImageValue>(v->getValue());
if (iv) {
return new_intrusive2<ImageValueToImage>(iv->filename, iv->last_update);
}
}
}
throw ScriptError(_ERROR_2_("can't convert", value->typeName(), _TYPE_("image")));
return value->toImage(value);
}
// ----------------------------------------------------------------------------- : ScriptableImage