mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-02 20:29:17 +00:00
Code Issues Releases Wiki Activity

replaced std::sort in pattern2 with manual sort to avoid spurious warning in gcc 12.1.0

Browse Source
This commit is contained in:
Zeno Rogue 2022-05-28 18:58:37 +02:00
parent 5e2a1b6424
commit 743d9bd7f0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pattern2.cpp
View File

@ -268,15 +268,15 @@ EX int fiftyval049(cell *c) {
for(int i=0; i<3; i++) for(int i=0; i<3; i++)
if(polara50(ar[i]->fiftyval) == pa && polarb50(ar[i]->fiftyval) == pb) if(polara50(ar[i]->fiftyval) == pa && polarb50(ar[i]->fiftyval) == pb)
a[qa++] = fiftyval049(ar[i]); a[qa++] = fiftyval049(ar[i]);
// 0-1-2 // somehow sort(a, a+qa) produces a warning in gcc 12.1.0, so we sort manually
sort(a, a+qa);
if(qa == 1) return 43+a[0]-1; if(qa == 1) return 43+a[0]-1;
// sort the two elements
if(a[0] > a[1]) swap(a[0], a[1]);
if(qa == 2 && a[1] == a[0]+7) return 36+a[0]-1; if(qa == 2 && a[1] == a[0]+7) return 36+a[0]-1;
if(qa == 2 && a[1] != a[0]+7) return 29+a[0]-1; if(qa == 2 && a[1] != a[0]+7) return 29+a[0]-1;
// 3: zgodnie // sort the three elements
// 1: zgodnie if(a[1] > a[2]) swap(a[1], a[2]);
// 0: przeciwnie if(a[0] > a[1]) swap(a[0], a[1]);
// 2: przeciwnie
// 168: // 168:
if(a[1] == 1 && a[2] == 7) if(a[1] == 1 && a[2] == 7)
return 15 + 6; // (polarb50(c) ? 0 : 6); return 15 + 6; // (polarb50(c) ? 0 : 6);