use #define instead of costly function call - thanks for the tip Brahma :)

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5168 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
flowtron
2010-06-10 20:21:38 +00:00
parent 87f226aa0f
commit 041b4de607
+15 -18
View File
@@ -1,6 +1,7 @@
// creation of scoreboard pseudo-menu
#include "cube.h"
#define SCORERATIO(F,D) (float)(F >= 0 ? F : 0) / (float)(D > 0 ? D : 1)
void *scoremenu = NULL, *teammenu = NULL, *ctfmenu = NULL;
@@ -95,7 +96,7 @@ static int discscorecmp(const discscore *x, const discscore *y)
const char *scoreratio(int frags, int deaths, int precis = 0)
{
static string res;
float ratio = (float)(frags >= 0 ? frags : 0) / (float)(deaths > 0 ? deaths : 1);
float ratio = SCORERATIO(frags, deaths);
int precision = precis;
if(!precision)
{
@@ -113,19 +114,18 @@ void renderdiscscores(int team)
discscore &d = discscores[i];
sline &line = scorelines.add();
const char *spect = team_isspect(d.team) ? "\f4" : "";
const char *sr = scoreratio(d.frags, d.deaths, 1);
//float ratio = (float)(d.frags >= 0 ? d.frags : 0) / (float)(d.deaths > 0 ? d.deaths : 1);
float ratio = SCORERATIO(d.frags, d.deaths);
const char *clag = team_isspect(d.team) ? "SPECT" : "";
if(m_flags) formatstring(line.s)("%s%s\t%d\t%d\t%d\t%s\t%d\t%s\tDISC",
if(m_flags) formatstring(line.s)("%s%s\t%d\t%d\t%d\t%.1f\t%d\t%s\tDISC",
spect, d.name,
d.flags, d.frags, d.deaths,
sr,
ratio,
d.points,
clag);
else formatstring(line.s)("%s%s\t%d\t%d\t%s\t%d\t%s\tDISC",
else formatstring(line.s)("%s%s\t%d\t%d\t%.1f\t%d\t%s\tDISC",
spect, d.name,
d.frags, d.deaths,
sr,
ratio,
d.points,
clag);
}
@@ -138,26 +138,25 @@ void renderscore(playerent *d)
if(d->clientrole==CR_ADMIN) status = d->state==CS_DEAD ? "\f7" : "\f3";
else if(d->state==CS_DEAD) status = "\f4";
const char *spect = team_isspect(d->team) ? "\f4" : "";
const char *sr = scoreratio(d->frags, d->deaths, 1);
//float ratio = (float)(d->frags >= 0 ? d->frags : 0) / (float)(d->deaths > 0 ? d->deaths : 1);
float ratio = SCORERATIO(d->frags, d->deaths);
const char *clag = team_isspect(d->team) ? "SPECT" : (d->state==CS_LAGGED ? "LAG" : colorpj(d->plag));
const char *cping = colorping(d->ping);
const char *ign = d->ignored ? " (ignored)" : (d->muted ? " (muted)" : "");
sline &line = scorelines.add();
line.bgcolor = d==player1 ? &localplayerc : NULL;
string &s = line.s;
if(m_flags) formatstring(s)("%s%d\t%s%s\t%d\t%d\t%d\t%s\t%d\t%s\t%s\t%s",
if(m_flags) formatstring(s)("%s%d\t%s%s\t%d\t%d\t%d\t%.1f\t%d\t%s\t%s\t%s",
spect, d->clientnum,
status, colorname(d),
d->flagscore, d->frags, d->deaths,
sr,
ratio,
d->points,
clag, cping, ign);
else formatstring(s)("%s%d\t%s%s\t%d\t%d\t%s\t%d\t%s\t%s\t%s",
else formatstring(s)("%s%d\t%s%s\t%d\t%d\t%.1f\t%d\t%s\t%s\t%s",
spect, d->clientnum,
status, colorname(d),
d->frags, d->deaths,
sr,
ratio,
d->points,
clag, cping, ign);
}
@@ -171,11 +170,9 @@ void renderteamscore(teamscore *t)
}
sline &line = scorelines.add();
defformatstring(plrs)("(%d %s)", t->teammembers.length(), t->teammembers.length() == 1 ? "player" : "players");
const char *sr = scoreratio(t->frags, t->deaths, 1);
//float ratio = (float)(t->frags >= 0 ? t->frags : 0) / (float)(t->deaths > 0 ? t->deaths : 1);
if(m_flags) formatstring(line.s)("\t\t%d\t%d\t%d\t%s\t%d\t\t%s\t%s", t->flagscore, t->frags, t->deaths, sr, t->points, team_string(t->team), plrs);
else formatstring(line.s)("\t\t%d\t%d\t%s\t%d\t\t%s\t%s", t->frags, t->deaths, sr, t->points, team_string(t->team), plrs);
float ratio = SCORERATIO(t->frags, t->deaths);
if(m_flags) formatstring(line.s)("\t\t%d\t%d\t%d\t%.1f\t%d\t\t%s\t%s", t->flagscore, t->frags, t->deaths, ratio, t->points, team_string(t->team), plrs);
else formatstring(line.s)("\t\t%d\t%d\t%.1f\t%d\t\t%s\t%s", t->frags, t->deaths, ratio, t->points, team_string(t->team), plrs);
static color teamcolors[2] = { color(1.0f, 0, 0, 0.2f), color(0, 0, 1.0f, 0.2f) };
line.bgcolor = &teamcolors[team_base(t->team)];