The DECLARE_TYPEOF(()) calls don't work in MSVC, I changed it to use a COMMA macro instead of ,

If this doesn't work in GCC, the COMMA definition could be made only for MSVC, then GCC sees DECLARE_TYPEOF(map<int COMMA string>). GCC doesn't need DECLARE_TYPEOF anyway.

Keyword expansion now works, still todo:
 - marking parameters, e.g. "Cycling 2W" -> "Cycling <param-mana>2W</param-mana>"
 - user interface for toggling reminder text
 - user interface for keywords

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@210 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-03-17 23:58:16 +00:00
parent 83b6aa36f8
commit 0464f5f7fc
29 changed files with 560 additions and 161 deletions
+14 -5
View File
@@ -260,8 +260,11 @@ error:
unable to store file: Error while saving, unable to store file
# Script stuff
collection has no member: Collection has no member '%s'
object has no member: Object has no member '%s'
has no member: %s has no member '%s'
can't convert: Can't convert from %s to %s
has no member value: String "%s" has no member '%s'
can't convert value: Can't convert "%s" from %s to %s
unsupported format: Invalid string format: '%s'
# Image stuff
coordinates for blending overlap: Coordinates for blending overlap
@@ -287,9 +290,15 @@ error:
############################################################## Types used in scripts
type:
real: Real number
integer: Integer number
string: String
function: function
collection: collection
object: object
real: real number
integer: integer number
string: string
boolean: boolean
color: color
nil: nothing
############################################################## Magic
game: