diff options
| author |   Renaud G <renaud@rolisteam.org> | 2015-08-20 15:25:41 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2015-08-20 15:25:41 +0200 |
| commit | 31e7b5b12afb8a129188747c7d627cfe4e8ec8f1 (patch) | |
| tree | 4d2ebd4f22e9f589875eff65154eb661319527c6 | |
| parent | 497cc72d23a78d946c4e47075f233763f6d3193c (diff) | |
| parent | 4c96c3f33cbb0552275e4a87046ac0a8fa88162c (diff) | |
| download | OneRoll-31e7b5b12afb8a129188747c7d627cfe4e8ec8f1.tar.gz OneRoll-31e7b5b12afb8a129188747c7d627cfe4e8ec8f1.zip | |
Merge branch 'rangeInList' of github.com:Rolisteam/DiceParser into rangeInList
| -rw-r--r-- | node/dicerollernode.cpp | 7 | ||||
| -rw-r--r-- | node/keepdiceexecnode.cpp | 2 | ||||
| -rw-r--r-- | node/startingnode.cpp | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/node/dicerollernode.cpp b/node/dicerollernode.cpp index 213c8ec..fa73185 100644 --- a/node/dicerollernode.cpp +++ b/node/dicerollernode.cpp @@ -61,10 +61,7 @@ void DiceRollerNode::run(ExecutionNode* previous) m_nextNode->run(this); } } - } - - - + } } quint64 DiceRollerNode::getFaces() @@ -75,7 +72,7 @@ QString DiceRollerNode::toString(bool wl) const { if(wl) { - return QString("%1 [label=DiceRollerNode]").arg(m_id); + return QString("%1 [label=DiceRollerNode faces: %2]").arg(m_id).arg(m_faces); } else { diff --git a/node/keepdiceexecnode.cpp b/node/keepdiceexecnode.cpp index 492e69c..7407d30 100644 --- a/node/keepdiceexecnode.cpp +++ b/node/keepdiceexecnode.cpp @@ -66,7 +66,7 @@ QString KeepDiceExecNode::toString(bool wl) const { if(wl) { - return QString("%1 [label=\"KeepDiceExecNode %1\"]").arg(m_id).arg(m_numberOfDice); + return QString("%1 [label=\"KeepDiceExecNode %2\"]").arg(m_id).arg(m_numberOfDice); } else { diff --git a/node/startingnode.cpp b/node/startingnode.cpp index b57c630..42fba6f 100644 --- a/node/startingnode.cpp +++ b/node/startingnode.cpp @@ -17,7 +17,7 @@ QString StartingNode::toString(bool withlabel) const { if(withlabel) { - return QString("%1 [label=\"StartingNode %2\"]").arg(m_id); + return QString("%1 [label=\"StartingNode\"]").arg(m_id); } else { |