diff options
| author | 2015-08-29 00:05:11 +0200 | |
|---|---|---|
| committer | 2015-08-29 00:05:11 +0200 | |
| commit | 04423fcd2848c283169f5a6719bd50cf70e14138 (patch) | |
| tree | 3157bf972a4b619d1819278ad4bfeff76ff7bd17 /node/sortresult.cpp | |
| parent | 3a8b315ab8a448a443cce277f3f26a1996403e06 (diff) | |
| parent | da1db7bc2436f94ab288d8da8d98a8209d3d2caa (diff) | |
| download | OneRoll-04423fcd2848c283169f5a6719bd50cf70e14138.tar.gz OneRoll-04423fcd2848c283169f5a6719bd50cf70e14138.zip | |
Merge branch 'master' of github.com:obiwankennedy/DiceParser
Diffstat (limited to 'node/sortresult.cpp')
| -rw-r--r-- | node/sortresult.cpp | 7 |
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); } |