From 77a2abc8343d88871a683640de596ecc3db4945d Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Fri, 26 Dec 2008 11:48:39 +0000 Subject: [PATCH] fixed radar ent naming git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4065 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/renderhud.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index d7e153e5..0c9f262b 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -257,7 +257,7 @@ void drawequipicons(playerent *p) glEnable(GL_BLEND); } -void drawradarent(float x, float y, float yaw, int col, int row, float iconsize, bool pulse, char *label = NULL, ...) +void drawradarent(float x, float y, float yaw, int col, int row, float iconsize, bool pulse, const char *label = NULL, ...) { glPushMatrix(); if(pulse) glColor4f(1.0f, 1.0f, 1.0f, 0.2f+(sinf(lastmillis/30.0f)+1.0f)/2.0f); @@ -402,13 +402,13 @@ void drawradar(playerent *p, int w, int h) } glTranslatef(-(centerpos.x-res/2)/worldsize*radarsize, -(centerpos.y-res/2)/worldsize*radarsize, 0); - drawradarent(p->o.x*coordtrans, p->o.y*coordtrans, p->yaw, p->state==CS_ALIVE ? (isattacking(p) ? 2 : 0) : 1, 2, iconsize, isattacking(p), colorname(p)); // local player + drawradarent(p->o.x*coordtrans, p->o.y*coordtrans, p->yaw, p->state==CS_ALIVE ? (isattacking(p) ? 2 : 0) : 1, 2, iconsize, isattacking(p), "%s", colorname(p)); // local player loopv(players) // other players { playerent *pl = players[i]; if(!pl || pl==p || !isteam(p->team, pl->team) || !insideradar(centerpos, res/2, pl->o)) continue; - drawradarent(pl->o.x*coordtrans, pl->o.y*coordtrans, pl->yaw, pl->state==CS_ALIVE ? (isattacking(pl) ? 2 : 0) : 1, team_int(pl->team), iconsize, isattacking(pl), colorname(pl)); + drawradarent(pl->o.x*coordtrans, pl->o.y*coordtrans, pl->yaw, pl->state==CS_ALIVE ? (isattacking(pl) ? 2 : 0) : 1, team_int(pl->team), iconsize, isattacking(pl), "%s", colorname(pl)); } if(m_flags) {