diff options
author | Eugene Sandulenko | 2016-08-05 07:47:21 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2016-08-05 07:49:00 +0200 |
commit | b60c5d927e6d4a86660937f8426cf557e7e90f7e (patch) | |
tree | 50191cf04f570db6b4dd27506f42de70e61800d0 /engines/director/lingo/lingo.cpp | |
parent | 8a6b82a91978bd3b35a8e5dbfd842710b65f2a59 (diff) | |
download | scummvm-rg350-b60c5d927e6d4a86660937f8426cf557e7e90f7e.tar.gz scummvm-rg350-b60c5d927e6d4a86660937f8426cf557e7e90f7e.tar.bz2 scummvm-rg350-b60c5d927e6d4a86660937f8426cf557e7e90f7e.zip |
DIRECTOR: Lingo: Revert adding prefix 'v' to all Symbol types.
Diffstat (limited to 'engines/director/lingo/lingo.cpp')
-rw-r--r-- | engines/director/lingo/lingo.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp index e5fa09ceb9..0bb43092f3 100644 --- a/engines/director/lingo/lingo.cpp +++ b/engines/director/lingo/lingo.cpp @@ -69,7 +69,7 @@ struct EventHandlerType { Symbol::Symbol() { name = NULL; - type = vVOID; + type = VOID; u.s = NULL; nargs = 0; global = false; @@ -224,10 +224,10 @@ void Lingo::processEvent(LEvent event, int entityId) { } int Lingo::alignTypes(Datum &d1, Datum &d2) { - int opType = vINT; + int opType = INT; - if (d1.type == vFLOAT || d2.type == vFLOAT) { - opType = vFLOAT; + if (d1.type == FLOAT || d2.type == FLOAT) { + opType = FLOAT; d1.toFloat(); d2.toFloat(); } @@ -237,12 +237,12 @@ int Lingo::alignTypes(Datum &d1, Datum &d2) { int Datum::toInt() { switch (type) { - case vINT: + case INT: // no-op break; - case vFLOAT: + case FLOAT: u.i = (int)u.f; - type = vINT; + type = INT; break; default: warning("Incorrect operation toInt() for type: %s", type2str()); @@ -253,11 +253,11 @@ int Datum::toInt() { double Datum::toFloat() { switch (type) { - case vINT: + case INT: u.f = (double)u.i; - type = vFLOAT; + type = FLOAT; break; - case vFLOAT: + case FLOAT: // no-op break; default: @@ -270,13 +270,13 @@ double Datum::toFloat() { Common::String *Datum::toString() { Common::String *s = new Common::String; switch (type) { - case vINT: + case INT: s->format("%d", u.i); break; - case vFLOAT: + case FLOAT: s->format(g_lingo->_floatPrecisionFormat.c_str(), u.f); break; - case vSTRING: + case STRING: delete s; s = u.s; break; @@ -285,7 +285,7 @@ Common::String *Datum::toString() { } u.s = s; - type = vSTRING; + type = STRING; return u.s; } @@ -294,20 +294,20 @@ const char *Datum::type2str(bool isk) { static char res[20]; switch (isk ? u.i : type) { - case vINT: - return isk ? "#integer" : "vINT"; - case vFLOAT: - return isk ? "#float" : "vFLOAT"; - case vSTRING: - return isk ? "#string" : "vSTRING"; - case vCASTREF: - return "vCASTREF"; - case vVOID: - return isk ? "#void" : "vVOID"; - case vPOINT: - return isk ? "#point" : "vPOINT"; - case vSYMBOL: - return isk ? "#symbol" : "vSYMBOL"; + case INT: + return isk ? "#integer" : "INT"; + case FLOAT: + return isk ? "#float" : "FLOAT"; + case STRING: + return isk ? "#string" : "STRING"; + case CASTREF: + return "CASTREF"; + case VOID: + return isk ? "#void" : "VOID"; + case POINT: + return isk ? "#point" : "POINT"; + case SYMBOL: + return isk ? "#symbol" : "SYMBOL"; default: snprintf(res, 20, "-- (%d) --", type); return res; |