diff options
| -rw-r--r-- | die.cpp | 1 | ||||
| -rw-r--r-- | node/countexecutenode.h | 2 | ||||
| -rw-r--r-- | node/dicerollernode.cpp | 2 | ||||
| -rw-r--r-- | node/dicerollernode.h | 2 | ||||
| -rw-r--r-- | node/rerolldicenode.h | 2 |
5 files changed, 5 insertions, 4 deletions
@@ -43,6 +43,7 @@ Die::Die(const Die& die) m_faces = die.m_faces; m_highlighted = die.m_highlighted; m_base = die.m_base; + m_color = die.getColor(); } void Die::setValue(qint64 r) diff --git a/node/countexecutenode.h b/node/countexecutenode.h index 167ee82..15b2509 100644 --- a/node/countexecutenode.h +++ b/node/countexecutenode.h @@ -38,8 +38,8 @@ public: virtual qint64 getPriority() const; private: - Validator* m_validator; ScalarResult* m_scalarResult; + Validator* m_validator; }; #endif // COUNTEXECUTENODE_H diff --git a/node/dicerollernode.cpp b/node/dicerollernode.cpp index d8fe49c..e6f2950 100644 --- a/node/dicerollernode.cpp +++ b/node/dicerollernode.cpp @@ -46,7 +46,7 @@ void DiceRollerNode::run(ExecutionNode* previous) } } -quint64 DiceRollerNode::getFaces() +quint64 DiceRollerNode::getFaces() const { return m_faces; } diff --git a/node/dicerollernode.h b/node/dicerollernode.h index 808676f..2de1cfe 100644 --- a/node/dicerollernode.h +++ b/node/dicerollernode.h @@ -27,7 +27,7 @@ public: * @brief getFaces accessor * @return the face count */ - quint64 getFaces(); + quint64 getFaces() const; /** * @brief toString diff --git a/node/rerolldicenode.h b/node/rerolldicenode.h index f456bb3..2a98b4a 100644 --- a/node/rerolldicenode.h +++ b/node/rerolldicenode.h @@ -53,9 +53,9 @@ public: virtual qint64 getPriority() const; private: - Validator* m_validator; DiceResult* m_myDiceResult; bool m_adding; + Validator* m_validator; }; #endif // REROLLDICENODE_H |