mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fixed tag transformation with Lua expressions (%), issue #637

Browse source 
Originally committed to SVN as r1769.
This commit is contained in:
Rodrigo Braz Monteiro 2008-01-18 22:27:42 +00:00
parent e5439a03fe
commit 53e7f60fe0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
aegisub/ass_override.cpp
View file

@ -659,10 +659,13 @@ end_tokenizing:
} }
if (isDefault == false) { if (isDefault == false) {
wxChar firstChar = curtok[0];
bool notAuto4 = firstChar != _T('!') && firstChar != _T('$') && firstChar != _T('%');
// Determine parameter type and set value // Determine parameter type and set value
switch (curproto->type) { switch (curproto->type) {
case VARDATA_INT: { case VARDATA_INT: {
if (!(curtok.StartsWith(_T("!")) || curtok.StartsWith(_T("$")))) { if (notAuto4) {
long temp = 0; long temp = 0;
curtok.ToLong(&temp); curtok.ToLong(&temp);
newparam->SetInt(temp); newparam->SetInt(temp);
@ -671,7 +674,7 @@ end_tokenizing:
break; break;
} }
case VARDATA_FLOAT: { case VARDATA_FLOAT: {
if (!(curtok.StartsWith(_T("!")) || curtok.StartsWith(_T("$")))) { if (notAuto4) {
double temp = 0.0; double temp = 0.0;
curtok.ToDouble(&temp); curtok.ToDouble(&temp);
newparam->SetFloat(temp); newparam->SetFloat(temp);
@ -684,7 +687,7 @@ end_tokenizing:
break; break;
} }
case VARDATA_BOOL: { case VARDATA_BOOL: {
if (!(curtok.StartsWith(_T("!")) || curtok.StartsWith(_T("$")))) { if (notAuto4) {
long temp = false; long temp = false;
curtok.ToLong(&temp); curtok.ToLong(&temp);
newparam->SetBool(temp != 0); newparam->SetBool(temp != 0);