aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node/sortresult.cpp
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2015-10-11 15:49:38 +0200
committerRenaud G <renaud@rolisteam.org>2015-10-11 15:49:38 +0200
commit84691771b54365160f5b1d54033e00187dbbf043 (patch)
treedd17a1436659c48993bfdb846864dded708c411e /node/sortresult.cpp
parenta220f89b6f30716883223292b0986c0dc9d941bc (diff)
parent114cd6a7990c44f0610dbf2080f101d0edbbaa57 (diff)
downloadOneRoll-84691771b54365160f5b1d54033e00187dbbf043.tar.gz
OneRoll-84691771b54365160f5b1d54033e00187dbbf043.zip
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'node/sortresult.cpp')
-rw-r--r--node/sortresult.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/node/sortresult.cpp b/node/sortresult.cpp
index 44a25f0..421beb3 100644
--- a/node/sortresult.cpp
+++ b/node/sortresult.cpp
@@ -54,14 +54,11 @@ void SortResultNode::run(ExecutionNode* node)
bool found = false;
int start = 0;
int end = diceList2.size();
- int distance = 0;
Die* tmp2 = NULL;
while(!found)
{
- distance = end-start;
+ int distance = end-start;
j = (start+end)/2;
-
-
if(distance == 0)
{
j=end;
@@ -78,9 +75,7 @@ void SortResultNode::run(ExecutionNode* node)
{
start=j+1;
}
-
}
-
}
diceList2.insert(j,tmp1);
}