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

Implemented nicer string collation, with support for composed characters and accents;

Browse Source 
Fixed symbol filter bug, green was not made transparent;
Slightly nicer error messages when forgeting 'type' keys.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@544 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-07-10 16:19:36 +00:00
parent a90b3dd904
commit 55a897e392
4 changed files with 133 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/render/symbol/filter.cpp
+7 -3
View File
@@ -52,7 +52,7 @@ void filter_symbol(Image& symbol, const SymbolFilter& filter) {
// Determine set
// green -> border or outside
// green+red=white -> border
if (data[1] != data[2]) {
if (data[0] != data[2]) {
// yellow/blue = editing hint, leave alone
} else {
SymbolSet point = data[1] ? (data[0] ? SYMBOL_BORDER : SYMBOL_OUTSIDE) : SYMBOL_INSIDE;
@@ -97,8 +97,12 @@ intrusive_ptr<SymbolFilter> read_new<SymbolFilter>(Reader& reader) {
if (fill_type == _("solid")) return new_intrusive<SolidFillSymbolFilter>();
else if (fill_type == _("linear gradient")) return new_intrusive<LinearGradientSymbolFilter>();
else if (fill_type == _("radial gradient")) return new_intrusive<RadialGradientSymbolFilter>();
else {
throw ParseError(_ERROR_1_("unsupported fill type", fill_type));
else if (fill_type.empty()) {
reader.warning(_ERROR_1_("expected key", _("fill type")));
throw ParseError(_ERROR_("aborting parsing"));
} else {
reader.warning(_ERROR_1_("unsupported fill type", fill_type));
throw ParseError(_ERROR_("aborting parsing"));
}
}