summaryrefslogtreecommitdiffstats
path: root/src/CBot/CBotIf.cpp
diff options
context:
space:
mode:
authorPiotr Dziwiński <piotrdz@gmail.com>2012-08-13 08:46:03 -0700
committerPiotr Dziwiński <piotrdz@gmail.com>2012-08-13 08:46:03 -0700
commitdc3cadd309a1ac1eb4921de69fed6037881b0b91 (patch)
treeb82608ec58ff73c9043f17f4b8bc1c42313388dd /src/CBot/CBotIf.cpp
parent146ad47e4afbf1fe82763c94c2cd2209285f869f (diff)
parente154e654f1e046a4d60e09d3ef87d1cf9c3ae6ae (diff)
downloadcolobot-dc3cadd309a1ac1eb4921de69fed6037881b0b91.tar.gz
colobot-dc3cadd309a1ac1eb4921de69fed6037881b0b91.tar.bz2
colobot-dc3cadd309a1ac1eb4921de69fed6037881b0b91.zip
Merge pull request #37 from konopackim/dev
Fixes and console interpreter
Diffstat (limited to 'src/CBot/CBotIf.cpp')
-rw-r--r--src/CBot/CBotIf.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/CBot/CBotIf.cpp b/src/CBot/CBotIf.cpp
index 84dbd6a..a5d2693 100644
--- a/src/CBot/CBotIf.cpp
+++ b/src/CBot/CBotIf.cpp
@@ -95,7 +95,7 @@ bool CBotIf :: Execute(CBotStack* &pj)
if ( pile->IfStep() ) return false;
// according to recovery, it may be in one of two states
- if( pile->GivState() == 0 )
+ if( pile->GetState() == 0 )
{
// evaluates the condition
if ( !m_Condition->Execute(pile) ) return false; // interrupted here?
@@ -113,7 +113,7 @@ bool CBotIf :: Execute(CBotStack* &pj)
// second state, evaluates the associated instructions
// the result of the condition is on the stack
- if ( pile->GivVal() == true ) // condition was true?
+ if ( pile->GetVal() == true ) // condition was true?
{
if ( m_Block != NULL && // block may be absent
!m_Block->Execute(pile) ) return false; // interrupted here?
@@ -137,7 +137,7 @@ void CBotIf :: RestoreState(CBotStack* &pj, bool bMain)
if ( pile == NULL ) return;
// according to recovery, it may be in one of two states
- if( pile->GivState() == 0 )
+ if( pile->GetState() == 0 )
{
// evaluates the condition
m_Condition->RestoreState(pile, bMain); // interrupted here!
@@ -147,7 +147,7 @@ void CBotIf :: RestoreState(CBotStack* &pj, bool bMain)
// second state, evaluates the associated instructions
// the result of the condition is on the stack
- if ( pile->GivVal() == true ) // condition was true?
+ if ( pile->GetVal() == true ) // condition was true?
{
if ( m_Block != NULL ) // block may be absent
m_Block->RestoreState(pile, bMain); // interrupted here!