Merge branch 'master' of github.com:Rolisteam/DiceParser

4 files changed, 12 insertions, 3 deletions

diff --git a/HelpMe.md b/HelpMe.md
index 87638ef..d6b0eb0 100644
--- a/HelpMe.md
+++ b/HelpMe.md
@@ -1,6 +1,15 @@
 [![Logo](http://www.rolisteam.org/sites/default/files/pixture_reloaded_logo.png)](http://www.rolisteam.org)
 # Documentation:
 
+## Build
+> git clone git@github.com:Rolisteam/DiceParser.git
+> cd DiceParser
+> mkdir build
+> cd build
+> cmake ../
+> make
+> make install
+
 ## Irc and Chat
 
 Please, remember it is important to preffix all you command by `!`. This will allow the system to identify your command. To clarify the documentation, the `!` is not repeated before all commands.
diff --git a/node/paintnode.cpp b/node/paintnode.cpp
index ad13c52..02a9358 100644
--- a/node/paintnode.cpp
+++ b/node/paintnode.cpp
@@ -97,7 +97,7 @@ void PainterNode::run(ExecutionNode* previous)
 }
 Result* PainterNode::getResult()
 {
-    m_previousNode->getResult();
+    return m_previousNode->getResult();
 }
 
 QString PainterNode::toString(bool wl) const
diff --git a/node/sortresult.cpp b/node/sortresult.cpp
index 0bf531c..f72d884 100644
--- a/node/sortresult.cpp
+++ b/node/sortresult.cpp
@@ -96,7 +96,7 @@ void SortResultNode::run(ExecutionNode* node)
     }
     else
     {
-        m_result = node->getResult();
+        //m_result = node->getResult();
         //m_errors.append(DIE_RESULT_EXPECTED);
     }
 
diff --git a/result/diceresult.cpp b/result/diceresult.cpp
index 462c989..9f9fbf8 100644
--- a/result/diceresult.cpp
+++ b/result/diceresult.cpp
@@ -51,7 +51,7 @@ void DiceResult::setResultList(QList<Die*> list)
 }
 DiceResult::~DiceResult()
 {
-	qDeleteAll(m_diceValues.begin(), m_diceValues.end());
+    qDeleteAll(m_diceValues.begin(), m_diceValues.end());
 	m_diceValues.clear();
 }
 QVariant DiceResult::getResult(RESULT_TYPE type)