games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Code Issues Releases Activity

Fixes, more tests.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2011-06-21 00:00:49 +00:00
parent a1930300be
commit 0a48e51af9
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Scripting/ERM/ERMInterpreter.cpp
View File

@ -872,6 +872,7 @@ struct StringFormatter
charsToReplace++;
replaceWithWhat << erm->ermGlobalEnv->getQuickVar(msg[percentPos+2]);
}
break;
case 'X':
replaceWithWhat << erm->getVar("x", getNum()).getInt();
break;
@ -1295,16 +1296,16 @@ struct ERMExpDispatch : boost::static_visitor<>
}
void operator()(Treceiver const& trig) const
{
HLP helper;
HLP helper;
//check condition
if(trig.condition.is_initialized())
{
if( !erm->checkCondition(trig.condition.get()) )
return;
}
if(trig.name == "VR")
{
//check condition
if(trig.condition.is_initialized())
{
if( !erm->checkCondition(trig.condition.get()) )
return;
}
//perform operations
if(trig.identifier.is_initialized())
{