From 81e0783a5d2bdf36d584ae6f0b499868e9782a72 Mon Sep 17 00:00:00 2001 From: driAn Date: Sat, 3 May 2008 19:40:50 +0000 Subject: [PATCH] sort scores in team modes too git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1845 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/entities.cpp | 4 ++-- source/src/scoreboard.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 338d70e4..b01f774c 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -159,12 +159,12 @@ void checkitems(playerent *d) if(!e.spawned) continue; if(OUTBORD(e.x, e.y)) continue; - if(e.type==CTF_FLAG) + if(e.type==CTF_FLAG) // 3d collision for ctf flags { vec v(e.x, e.y, e.z); if(objcollide(d, v, 2.5f, 4.0f)) trypickup(i, d); } - else + else // simple 2d collision { vec v(e.x, e.y, S(e.x, e.y)->floor+eyeheight); if(d->o.dist(v)<2.5f) trypickup(i, d); diff --git a/source/src/scoreboard.cpp b/source/src/scoreboard.cpp index 81e145d0..cb852d45 100644 --- a/source/src/scoreboard.cpp +++ b/source/src/scoreboard.cpp @@ -143,7 +143,8 @@ void renderscores(void *menu, bool init) teamscores[team_int(players[i]->team)].addscore(players[i]); } teamscores[team_int(player1->team)].addscore(player1); - + loopi(2) teamscores[i].teammembers.sort(scorecmp); + int sort = teamscorecmp(&teamscores[TEAM_CLA], &teamscores[TEAM_RVSF]); loopi(2) renderteamscore(menu, &teamscores[sort < 0 ? i : (i+1)&1]); }