[colobot] 47/145: Fix initializing static array in class definition
Didier Raboud
odyx at moszumanska.debian.org
Mon Jul 11 12:56:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 61440392d22816d87d57311a705981e5d0095458
Author: melex750 <melex750 at users.noreply.github.com>
Date: Tue Apr 5 14:00:15 2016 -0400
Fix initializing static array in class definition
issue #32
---
src/CBot/CBotClass.cpp | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/CBot/CBotClass.cpp b/src/CBot/CBotClass.cpp
index 27794d7..1995dd9 100644
--- a/src/CBot/CBotClass.cpp
+++ b/src/CBot/CBotClass.cpp
@@ -739,8 +739,15 @@ bool CBotClass::CompileDefItem(CBotToken* &p, CBotCStack* pStack, bool bSecond)
if ( pv->IsStatic() && pv->m_InitExpr != nullptr )
{
CBotStack* pile = CBotStack::AllocateStack(); // independent stack
- while(pile->IsOk() && !pv->m_InitExpr->Execute(pile)); // evaluates the expression without timer
- pv->SetVal( pile->GetVar() ) ;
+ if ( type2.Eq(CBotTypArrayPointer) )
+ {
+ while(pile->IsOk() && !pv->m_InitExpr->Execute(pile, pv));
+ }
+ else
+ {
+ while(pile->IsOk() && !pv->m_InitExpr->Execute(pile)); // evaluates the expression without timer
+ pv->SetVal( pile->GetVar() ) ;
+ }
pile->Delete();
}
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list