aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorobiwankennedy <renaud@rolisteam.org>2014-01-14 18:38:27 +0100
committerobiwankennedy <renaud@rolisteam.org>2014-01-14 18:38:27 +0100
commit9eae688153744959516ad2ce728ec55a4ed75ca1 (patch)
treed3465a0ba67cc68591d44f50212aab64ccaeb772
parentff2a28dca68119790329b56682aadab9ab825a93 (diff)
downloadOneRoll-9eae688153744959516ad2ce728ec55a4ed75ca1.tar.gz
OneRoll-9eae688153744959516ad2ce728ec55a4ed75ca1.zip
Update scalaroperatornode.cpp
adding previous result API
-rw-r--r--node/scalaroperatornode.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp
index c1a037a..dfbfcc1 100644
--- a/node/scalaroperatornode.cpp
+++ b/node/scalaroperatornode.cpp
@@ -25,6 +25,7 @@ void ScalarOperatorNode::run(ExecutionNode* previous)
if(NULL!=previous)
{
DiceResult* previousResult = static_cast<DiceResult*>(previous->getResult());
+
if(NULL!=previousResult)
{
ExecutionNode* internal = m_internalNode;
@@ -32,7 +33,10 @@ void ScalarOperatorNode::run(ExecutionNode* previous)
{
internal = internal->getNextNode();
}
+
Result* internalResult = internal->getResult();
+ m_result->setPrevious(internalResult);
+ internalResult->setPrevious(previousResult);
switch(m_myOperator)
{