diff options
| author |   Renaud G <renaud@rolisteam.org> | 2015-04-24 21:35:17 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2015-04-24 21:35:17 +0200 |
| commit | 8beb664172cf2c15abb4e12938b8978506471c02 (patch) | |
| tree | f033c9df5436abe8848a8b4d69353229028c02bd /node/dicerollernode.cpp | |
| parent | 67fd3b480f543f2f18bd632ea85d829ba2102a20 (diff) | |
| parent | edfcca8d1a630ca7ca79133bd0b03af14fef6363 (diff) | |
| download | OneRoll-8beb664172cf2c15abb4e12938b8978506471c02.tar.gz OneRoll-8beb664172cf2c15abb4e12938b8978506471c02.zip | |
Merge branch 'master' of github.com:obiwankennedy/DiceParser
Conflicts:
parsingtoolbox.cpp
Diffstat (limited to 'node/dicerollernode.cpp')
| -rw-r--r-- | node/dicerollernode.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/node/dicerollernode.cpp b/node/dicerollernode.cpp index 1fd1a2f..f32a033 100644 --- a/node/dicerollernode.cpp +++ b/node/dicerollernode.cpp @@ -33,11 +33,9 @@ /// \brief DiceRollerNode::DiceRollerNode ////////////////////////////////////////////////// DiceRollerNode::DiceRollerNode(quint64 faces) - : m_faces(faces),m_myDiceResult(new DiceResult()) + : m_faces(faces),m_diceResult(new DiceResult()) { - m_mutex=new QMutex(); - m_result=m_myDiceResult; - + m_result=m_diceResult; } void DiceRollerNode::run(ExecutionNode* previous) { @@ -55,7 +53,7 @@ void DiceRollerNode::run(ExecutionNode* previous) Die* die = new Die(); die->setFaces(m_faces); die->roll(); - m_myDiceResult->insertResult(die); + m_diceResult->insertResult(die); } if(NULL!=m_nextNode) { |