kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#215 FreeBSD build fix proposal

Browse Source
This commit is contained in:
drian
2021-04-15 11:34:59 +02:00
parent fb69c25d48
commit 963190b072
8 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/scoreboard.cpp
+18 -18
View File
@@ -97,7 +97,7 @@ struct teamscore
frags += d->frags;
deaths += d->deaths;
points += d->points;
if(m_flags) flagscore += d->flagscore;
if(m_genflags) flagscore += d->flagscore;
}
void addscore(discscore &d)
@@ -105,7 +105,7 @@ struct teamscore
frags += d.frags;
deaths += d.deaths;
points += d.points;
if(m_flags) flagscore += d.flags;
if(m_genflags) flagscore += d.flags;
}
};
@@ -159,8 +159,8 @@ static int discscorecmp(const discscore *x, const discscore *y)
{
if(x->team < y->team) return -1;
if(x->team > y->team) return 1;
if(m_flags && x->flags > y->flags) return -1;
if(m_flags && x->flags < y->flags) return 1;
if(m_genflags && x->flags > y->flags) return -1;
if(m_genflags && x->flags < y->flags) return 1;
if(x->frags > y->frags) return -1;
if(x->frags < y->frags) return 1;
if(x->deaths > y->deaths) return 1;
@@ -191,7 +191,7 @@ void renderdiscscores(int team)
if(team_isspect(d.team)) line.textcolor = '4';
const char *clag = team_isspect(d.team) ? "SPECT" : "";
if(m_flags) line.addcol(sc_flags, "%d", d.flags);
if(m_genflags) line.addcol(sc_flags, "%d", d.flags);
line.addcol(sc_frags, "%d", d.frags);
line.addcol(sc_deaths, "%d", d.deaths);
line.addcol(sc_ratio, "%.2f", SCORERATIO(d.frags, d.deaths));
@@ -223,7 +223,7 @@ void renderscore(playerent *d)
if(team_isspect(d->team)) line.textcolor = '4';
line.bgcolor = d==player1 ? &localplayerc : NULL;
if(m_flags) line.addcol(sc_flags, "%d", d->flagscore);
if(m_genflags) line.addcol(sc_flags, "%d", d->flagscore);
line.addcol(sc_frags, "%d", d->frags);
line.addcol(sc_deaths, "%d", d->deaths);
line.addcol(sc_ratio, "%.2f", SCORERATIO(d->frags, d->deaths));
@@ -234,7 +234,7 @@ void renderscore(playerent *d)
}
line.addcol(sc_clientnum, "\fs\f%d%d\fr", cncolumncolor, d->clientnum);
char flagicon = '\0';
if(m_flags) //show flag icon at flag carrier with use radaricons font
if(m_genflags) //show flag icon at flag carrier with use radaricons font
{
loopi(2)
{
@@ -255,7 +255,7 @@ void renderteamscore(teamscore *t)
}
sline &line = scorelines.add();
if(m_flags) line.addcol(sc_flags, "%d", t->flagscore);
if(m_genflags) line.addcol(sc_flags, "%d", t->flagscore);
line.addcol(sc_frags, "%d", t->frags);
line.addcol(sc_deaths, "%d", t->deaths);
line.addcol(sc_ratio, "%.2f", SCORERATIO(t->frags, t->deaths));
@@ -282,7 +282,7 @@ void reorderscorecolumns()
extern void *scoremenu;
sline sscore;
if(m_flags) sscore.addcol(sc_flags, "flags");
if(m_genflags) sscore.addcol(sc_flags, "flags");
sscore.addcol(sc_frags, "frags");
sscore.addcol(sc_deaths, "deaths");
sscore.addcol(sc_ratio, "ratio");
@@ -331,7 +331,7 @@ void renderscores(void *menu, bool init)
renderteamscore(&teamscores[sort ^ i]);
renderdiscscores(sort ^ i);
}
winner = m_flags ?
winner = m_genflags ?
(teamscores[sort].flagscore > teamscores[team_opposite(sort)].flagscore ? sort : -1) :
(teamscores[sort].frags > teamscores[team_opposite(sort)].frags ? sort : -1);
@@ -344,8 +344,8 @@ void renderscores(void *menu, bool init)
{
winner = scores[0]->clientnum;
if(scores.length() > 1
&& ((m_flags && scores[0]->flagscore == scores[1]->flagscore)
|| (!m_flags && scores[0]->frags == scores[1]->frags)))
&& ((m_genflags && scores[0]->flagscore == scores[1]->flagscore)
|| (!m_genflags && scores[0]->frags == scores[1]->frags)))
winner = -1;
}
}
@@ -482,7 +482,7 @@ const char *asciiscores(bool destjpg)
addstr(t, e, "\n");
else
{
formatstring(text)("\n%sfrags deaths cn%s name\n", m_flags ? "flags " : "", m_teammode ? " team" : "");
formatstring(text)("\n%sfrags deaths cn%s name\n", m_genflags ? "flags " : "", m_teammode ? " team" : "");
addstr(t, e, text);
}
loopv(scores)
@@ -492,9 +492,9 @@ const char *asciiscores(bool destjpg)
formatstring(team)(destjpg ? ", %s" : " %-4s", team_string(d->team, true));
formatstring(flags)(destjpg ? "%d/" : " %4d ", d->flagscore);
if(destjpg)
formatstring(text)("%s%s (%s%d/%d)\n", d->name, m_teammode ? team : "", m_flags ? flags : "", d->frags, d->deaths);
formatstring(text)("%s%s (%s%d/%d)\n", d->name, m_teammode ? team : "", m_genflags ? flags : "", d->frags, d->deaths);
else
formatstring(text)("%s %4d %4d %2d%s %s%s\n", m_flags ? flags : "", d->frags, d->deaths, d->clientnum,
formatstring(text)("%s %4d %4d %2d%s %s%s\n", m_genflags ? flags : "", d->frags, d->deaths, d->clientnum,
m_teammode ? team : "", d->name, d->clientrole==CR_ADMIN ? " (admin)" : d==player1 ? " (you)" : "");
addstr(t, e, text);
}
@@ -506,15 +506,15 @@ const char *asciiscores(bool destjpg)
formatstring(team)(destjpg ? ", %s" : " %-4s", team_string(d.team, true));
formatstring(flags)(destjpg ? "%d/" : " %4d ", d.flags);
if(destjpg)
formatstring(text)("%s(disconnected)%s (%s%d/%d)\n", d.name, m_teammode ? team : "", m_flags ? flags : "", d.frags, d.deaths);
formatstring(text)("%s(disconnected)%s (%s%d/%d)\n", d.name, m_teammode ? team : "", m_genflags ? flags : "", d.frags, d.deaths);
else
formatstring(text)("%s %4d %4d --%s %s(disconnected)\n", m_flags ? flags : "", d.frags, d.deaths, m_teammode ? team : "", d.name);
formatstring(text)("%s %4d %4d --%s %s(disconnected)\n", m_genflags ? flags : "", d.frags, d.deaths, m_teammode ? team : "", d.name);
addstr(t, e, text);
}
if(destjpg)
{
extern int minutesremaining;
formatstring(text)("(%sfrags/deaths), %d minute%s remaining\n", m_flags ? "flags/" : "", minutesremaining, minutesremaining == 1 ? "" : "s");
formatstring(text)("(%sfrags/deaths), %d minute%s remaining\n", m_genflags ? "flags/" : "", minutesremaining, minutesremaining == 1 ? "" : "s");
addstr(t, e, text);
}
return buf + 8;