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

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
+6 -2
View File
@@ -73,8 +73,12 @@ intrusive_ptr<Field> read_new<Field>(Reader& reader) {
else if (type == _("symbol")) return new_intrusive<SymbolField>();
else if (type == _("color")) return new_intrusive<ColorField>();
else if (type == _("info")) return new_intrusive<InfoField>();
else {
throw ParseError(_("Unsupported field type: '") + type + _("'"));
else if (type.empty()) {
reader.warning(_ERROR_1_("expected key", _("type")));
throw ParseError(_ERROR_("aborting parsing"));
} else {
reader.warning(_ERROR_1_("Unsupported field type", type));
throw ParseError(_ERROR_("aborting parsing"));
}
}