games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +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

5
Data/s/std.verm
View File

@@ -37,7 +37,4 @@ VERM
[* n [factorial [- n 1]]]
]
]
![print [factorial 8]]
; example 7 --- ERM integration
![if [> 3 2] !!IF:M^Hello world^]
![print [factorial 8]]

14
Data/s/testy.erm Normal file
View File

@@ -0,0 +1,14 @@
ZVSE
!?PI;
!!VRv2777:S4;
!!DO1/0/5/1&v2777<>1:P0;
!?FU1;
!!VRv2778:Sx16%2;
!!IF&x16>3:M^Hello world number %X16! To duza liczba^;
!!IF&v2778==0&x16<=3:M^Hello world number %X16! To mala parzysta liczba^;
!!IF&v2778==1&x16<=3:M^Hello world number %X16! To mala nieparzysta liczba^;
!?PI;
!!VRz10:S^Composed hello ^;
!!IF:M^%Z10%%world%%, v2777=%V2777, v2778=%V2778!^;

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())
{