diff --git a/data/gui/Game.layout b/data/gui/Game.layout index 78fc6007..9e16c40c 100644 --- a/data/gui/Game.layout +++ b/data/gui/Game.layout @@ -2074,7 +2074,7 @@ - + @@ -2107,7 +2107,7 @@ - + diff --git a/src/game/Collections.cpp b/src/game/Collections.cpp index 3255c22a..77ca295d 100644 --- a/src/game/Collections.cpp +++ b/src/game/Collections.cpp @@ -95,8 +95,15 @@ void CGui::FillCollectList(std::vector vIds) liCollect->setSubItemNameAt(3,l, gcom->clrsDiff[col.diff]+ TR("#{Diff"+toStr(col.diff)+"}")); // liCollect->setSubItemNameAt(4,l, col.cars.GetStr(data->cars)); - // collected cnt / all - liCollect->setSubItemNameAt(4,l, toStr(pc.gems.size()) +" #50A0F0/ #60A0D0"+ toStr(col.collects.size()) ); + // collected cur / all + int cur = pc.gems.size(), all = col.collects.size(); + if (cur > all) + liCollect->setSubItemNameAt(4,l, "#C0A0FF" + toStr(cur) +" / "+ toStr(all)); + else if (cur >= all) + liCollect->setSubItemNameAt(4,l, "#80C0FF" + toStr(cur) );//? +" / "+ toStr(all)); + else + liCollect->setSubItemNameAt(4,l, "#FFFF60" + toStr(cur) +" #50A0F0/ #40F0FF"+ toStr(all) ); + liCollect->setSubItemNameAt(5,l, pc.bestTime > 10000.f ? "-" : gcom->clrsDiff[std::min(8,int(pc.bestTime/3.f/60.f))]+ StrTime2(pc.bestTime));