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

Basic text rendering working;

Browse Source 
Added Font (done) and SymbolFont (skeleton);
Added styling to set;
Added CountourMap;
Some script fixes

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@73 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2006-11-17 17:57:04 +00:00
parent ea5be88bdb
commit ce6a83e34b
45 changed files with 1595 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/context.cpp
+6 -1
View File
@@ -156,7 +156,7 @@ ScriptValueP Context::eval(const Script& script, bool useScope) {
} catch (...) {
// cleanup after an exception
if (scope) closeScope(scope); // restore scope
if (useScope) closeScope(scope); // restore scope
stack.resize(stack_size); // restore stack
throw; // rethrow
}
@@ -307,4 +307,9 @@ void instrBinary (BinaryInstructionType i, ScriptValueP& a, const ScriptValueP&
// ----------------------------------------------------------------------------- : Simple instructions : ternary
void instrTernary(TernaryInstructionType i, ScriptValueP& a, const ScriptValueP& b, const ScriptValueP& c) {
switch (i) {
case I_RGB:
a = toScript(Color((int)*a, (int)*b, (int)*c));
break;
}
}