equal
deleted
inserted
replaced
316 |
316 |
317 if(valid_entry) |
317 if(valid_entry) |
318 { |
318 { |
319 unsigned int pr=10000; |
319 unsigned int pr=10000; |
320 bool prevmult=false; |
320 bool prevmult=false; |
321 unsigned int prev_change; |
321 unsigned int prev_change=pr; |
322 unsigned int prev_br=10000; |
322 unsigned int prev_br=pr; |
323 int counter=0; |
323 int counter=0; |
324 std::string comm_nobr=""; |
324 std::string comm_nobr=""; |
325 std::vector<unsigned int> p; |
325 std::vector<unsigned int> p; |
326 p.resize(counter+1); |
326 p.resize(counter+1); |
327 |
327 |
390 return ""; |
390 return ""; |
391 } |
391 } |
392 |
392 |
393 NewMapWin::tree_node * NewMapWin::weightedString2Tree(std::string to_tree, std::vector<unsigned int> & p, int offset) |
393 NewMapWin::tree_node * NewMapWin::weightedString2Tree(std::string to_tree, std::vector<unsigned int> & p, int offset) |
394 { |
394 { |
395 int min=p[offset]; |
395 unsigned int min=p[offset]; |
396 int minplace=0; |
396 int minplace=0; |
397 for(int i=0;i<(int)to_tree.size();i++) |
397 for(int i=0;i<(int)to_tree.size();i++) |
398 { |
398 { |
399 if(min>p[offset+i]) |
399 if(min>p[offset+i]) |
400 { |
400 { |