fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup, fixed so that spectators are shown with a "spectator"-tag like it should.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2600 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Molgrum 2007-08-20 02:57:11 +00:00
parent 0a463a7413
commit 25d16782ee
1 changed files with 61 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
engine/client/sbar.c
View file

@ -2067,58 +2067,72 @@ ping time frags name
//for reference: //for reference:
//define COLUMN(title, width, code) //define COLUMN(title, width, code)
#define COLUMN_PING COLUMN(ping, 4*8, \ #define COLUMN_PING COLUMN(ping, 4*8, \
{ \ { \
int p = s->ping; \ int p = s->ping; \
if (p < 0 || p > 999) p = 999; \ if (p < 0 || p > 999) p = 999; \
sprintf(num, "%4i", p); \ sprintf(num, "%4i", p); \
Draw_FunString(x, y, num); \ Draw_FunString(x, y, num); \
}) })
#define COLUMN_PL COLUMN(pl, 2*8, \ #define COLUMN_PL COLUMN(pl, 2*8, \
{ \ { \
int p = s->pl; \ int p = s->pl; \
sprintf(num, "%3i", p); \ sprintf(num, "%3i", p); \
Draw_FunString(x, y, num); \ Draw_FunString(x, y, num); \
}) })
#define COLUMN_TIME COLUMN(time, 4*8, \ #define COLUMN_TIME COLUMN(time, 4*8, \
{ \ { \
if (cl.intermission) \ if (cl.intermission) \
total = cl.completed_time - s->entertime; \ total = cl.completed_time - s->entertime; \
else \ else \
total = cl.servertime - s->entertime; \ total = cl.servertime - s->entertime; \
minutes = (int)total/60; \ minutes = (int)total/60; \
sprintf (num, "%4i", minutes); \ sprintf (num, "%4i", minutes); \
Draw_String ( x , y, num); \ Draw_String ( x , y, num); \
}) })
#define COLUMN_FRAGS COLUMN(frags, 5*8, \ #define COLUMN_FRAGS COLUMN(frags, 5*8, \
{ \ { \
top = Sbar_TopColour(s); \ top = Sbar_TopColour(s); \
bottom = Sbar_BottomColour(s); \ bottom = Sbar_BottomColour(s); \
top = Sbar_ColorForMap (top); \ top = Sbar_ColorForMap (top); \
bottom = Sbar_ColorForMap (bottom); \ bottom = Sbar_ColorForMap (bottom); \
\ \
if (largegame) \ if (s->spectator) \
Draw_Fill ( x, y+1, 40, 3, top); \ { \
else \ Draw_String( x, y, "spectator" ); \
Draw_Fill ( x, y, 40, 4, top); \ } \
Draw_Fill ( x, y+4, 40, 4, bottom); \ else \
\ { \
f = s->frags; \ if (largegame) \
sprintf (num, "%3i",f); \ Draw_Fill ( x, y+1, 40, 3, top); \
\ else \
Draw_Character ( x+8 , y, num[0]); \ Draw_Fill ( x, y, 40, 4, top); \
Draw_Character ( x+16 , y, num[1]); \ Draw_Fill ( x, y+4, 40, 4, bottom); \
Draw_Character ( x+24 , y, num[2]); \ \
\ f = s->frags; \
if ((cl.spectator && k == spec_track[0]) || \ sprintf (num, "%3i",f); \
(!cl.spectator && k == cl.playernum[0])) \ \
{ \ Draw_Character ( x+8 , y, num[0]); \
Draw_Character ( x, y, 16); \ Draw_Character ( x+16 , y, num[1]); \
Draw_Character ( x + 32, y, 17); \ Draw_Character ( x+24 , y, num[2]); \
} \ \
if ((cl.spectator && k == spec_track[0]) || \
(!cl.spectator && k == cl.playernum[0])) \
{ \
Draw_Character ( x, y, 16); \
Draw_Character ( x + 32, y, 17); \
} \
} \
\
})
#define COLUMN_TEAMNAME COLUMN(team, 4*8, \
{ \
if (!s->spectator) \
{ \
Draw_FunStringLen(x, y, s->team, 4); \
} \
}) })
#define COLUMN_TEAMNAME COLUMN(team, 4*8, {Draw_FunStringLen(x, y, s->team, 4);})
#define COLUMN_NAME COLUMN(name, 16*8, {Draw_FunString(x, y, s->name);}) #define COLUMN_NAME COLUMN(name, 16*8, {Draw_FunString(x, y, s->name);})
#define COLUMN_KILLS COLUMN(kils, 4*8, {Draw_FunString(x, y, va("%4i", Stats_GetKills(k)));}) #define COLUMN_KILLS COLUMN(kils, 4*8, {Draw_FunString(x, y, va("%4i", Stats_GetKills(k)));})
#define COLUMN_TKILLS COLUMN(tkil, 4*8, {Draw_FunString(x, y, va("%4i", Stats_GetTKills(k)));}) #define COLUMN_TKILLS COLUMN(tkil, 4*8, {Draw_FunString(x, y, va("%4i", Stats_GetTKills(k)));})