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

Fixed: "X time counter(s)" for suspend keyword, caused by not adding number hints for non-numeric things;

Browse Source 
No longer request thumbnails of missing images

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@714 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-09-20 17:54:10 +00:00
parent 916f48a48d
commit e4f9bf1eac
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/value/choice.cpp
+1 -1
View File
@@ -203,7 +203,7 @@ void DropDownChoiceListBase::generateThumbnailImages() {
ScriptableImage& img = s.choice_images[name]; ScriptableImage& img = s.choice_images[name];
if (!img.update(ctx) && status == THUMB_CHANGED) { if (!img.update(ctx) && status == THUMB_CHANGED) {
status = THUMB_OK; // no need to rebuild status = THUMB_OK; // no need to rebuild
} else { } else if (img.isReady()) {
// request this thumbnail // request this thumbnail
thumbnail_thread.request( new_intrusive4<ChoiceThumbnailRequest>( thumbnail_thread.request( new_intrusive4<ChoiceThumbnailRequest>(
&cve, i, status == THUMB_NOT_MADE && !img.local(), img.threadSafe() &cve, i, status == THUMB_NOT_MADE && !img.local(), img.threadSafe()
src/script/functions/english.cpp
+2 -1
View File
@@ -122,13 +122,14 @@ String do_english_num(String input, String(*fun)(int)) {
} }
} }
} }
return _("<hint-2>") + input;
} else { } else {
long i = 0; long i = 0;
if (input.ToLong(&i)) { if (input.ToLong(&i)) {
return fun(i); return fun(i);
} }
return input;
} }
return input;
} }
SCRIPT_FUNCTION(english_number) { SCRIPT_FUNCTION(english_number) {