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

Use LocalFileName class for file names inside a package.

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-04-29 23:57:36 +02:00
parent f92c09e87a
commit a1d54f36fc
19 changed files with 143 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/functions/image.cpp
+2 -2
View File
@@ -148,13 +148,13 @@ SCRIPT_FUNCTION(symbol_variation) {
SCRIPT_PARAM(ScriptValueP, symbol); // TODO: change to input?
ScriptObject<ValueP>* valueO = dynamic_cast<ScriptObject<ValueP>*>(symbol.get());
SymbolValue* value = valueO ? dynamic_cast<SymbolValue*>(valueO->getValue().get()) : nullptr;
String filename;
LocalFileName filename;
if (value) {
filename = value->filename;
} else if (valueO) {
throw ScriptErrorConversion(valueO->typeName(), _TYPE_("symbol" ));
} else {
filename = from_script<String>(symbol);
filename = LocalFileName::fromReadString(symbol->toString());
}
// known variation?
SCRIPT_OPTIONAL_PARAM_(String, variation)