From 3837246ea8cfc64ef862edfbaeaf19d2a915c66e Mon Sep 17 00:00:00 2001 From: "Alejandro V. Garcia" Date: Sat, 4 Sep 2010 10:37:38 +0000 Subject: [PATCH] apply displacement offset to other radarents git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5683 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/renderhud.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index e97f6120..6ffb1a7a 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -452,7 +452,7 @@ void drawradar(playerent *p, int w, int h) if(!pl || pl==p) continue; if(!isteam(p->team, pl->team)) continue; vec rtmp = vec(pl->o).sub(mdd).mul(coordtrans).add(cod); - drawradarent(rtmp.x, rtmp.y, pl->yaw, pl->state==CS_ALIVE ? (isattacking(pl) ? 2 : 0) : 1, team_base(pl->team), iconsize, isattacking(pl), "%s", colorname(pl)); + drawradarent(rtmp.x+displace, rtmp.y+displace, pl->yaw, pl->state==CS_ALIVE ? (isattacking(pl) ? 2 : 0) : 1, team_base(pl->team), iconsize, isattacking(pl), "%s", colorname(pl)); } if(m_flags) { @@ -466,10 +466,10 @@ void drawradar(playerent *p, int w, int h) if(e->x == -1 && e-> y == -1) continue; // flagdummies vec pos = vec(e->x, e->y, 0).sub(mdd).mul(coordtrans).add(cod); vec cpos(pos.x + 16.0f, pos.y - 16.0f, 0); - drawradarent(pos.x, pos.y, camera1->yaw, m_ktf ? 2 : f.team, 3, iconsize, false); // draw bases + drawradarent(pos.x+displace, pos.y+displace, camera1->yaw, m_ktf ? 2 : f.team, 3, iconsize, false); // draw bases if(f.state!=CTFF_STOLEN && !(m_ktf && f.state == CTFF_IDLE)) { - drawradarent(cpos.x, cpos.y, 0, 3, m_ktf ? 2 : f.team, iconsize, false); // draw on entitiy pos + drawradarent(cpos.x+displace, cpos.y+displace, 0, 3, m_ktf ? 2 : f.team, iconsize, false); // draw on entitiy pos } if(m_ktf && f.state == CTFF_IDLE) continue; if(f.state==CTFF_STOLEN) @@ -484,7 +484,7 @@ void drawradar(playerent *p, int w, int h) if(tm) { apos.sub(mdd).mul(coordtrans).add(cod); - drawradarent(apos.x, apos.y, 0, 3, m_ktf ? 2 : f.team, iconsize, true); // draw near flag thief + drawradarent(apos.x+displace, apos.y+displace, 0, 3, m_ktf ? 2 : f.team, iconsize, true); // draw near flag thief } } }