zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

splitscreen: print "reserved" quotes in the upper half of the screen.

Browse source 
Reverved quotes are ones like "Killed by xxx". Since they're only
shown for the first player for now, printing them in the upper part
makes more sense (in above/below split, the first player is above).

git-svn-id: https://svn.eduke32.com/eduke32@2950 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-08-21 17:39:00 +00:00
parent 5d83f679dd
commit d2d10a4c4c
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
polymer/eduke32/source/game.c
View file

@ -1759,7 +1759,8 @@ static int32_t calc_ybase(int32_t begy)
{ {
int32_t k = begy; int32_t k = begy;
if (GTFLAGS(GAMETYPE_FRAGBAR) && ud.screen_size > 0 && (g_netServer || ud.multimode > 1)) if (GTFLAGS(GAMETYPE_FRAGBAR) && (ud.screen_size > 0 && !g_fakeMultiMode)
&& (g_netServer || ud.multimode > 1))
{ {
int32_t i, j = 0; int32_t i, j = 0;
@ -1783,14 +1784,13 @@ void G_PrintGameQuotes(int32_t snum)
int32_t i, j, k; int32_t i, j, k;
const DukePlayer_t *const ps = g_player[snum].ps; const DukePlayer_t *const ps = g_player[snum].ps;
const int32_t reserved_quote = (ps->ftq >= QUOTE_RESERVED && ps->ftq <= QUOTE_RESERVED3);
k = calc_ybase(1); k = calc_ybase(1);
if (ps->fta > 1 && (ps->ftq < QUOTE_RESERVED || ps->ftq > QUOTE_RESERVED3)) if (ps->fta > 1 && !reserved_quote)
{ {
if (ps->fta > 6) k += min(7, ps->fta);
k += 7;
else k += ps->fta;
} }
j = scale(k, ydim, 200); j = scale(k, ydim, 200);
@ -1801,6 +1801,7 @@ void G_PrintGameQuotes(int32_t snum)
if (user_quote_time[i] <= 0) if (user_quote_time[i] <= 0)
continue; continue;
k = user_quote_time[i]; k = user_quote_time[i];
sh = hud_glowingquotes ? (sintable[((totalclock+(i<<2))<<5)&2047]>>11) : 0; sh = hud_glowingquotes ? (sintable[((totalclock+(i<<2))<<5)&2047]>>11) : 0;
@ -1812,7 +1813,6 @@ void G_PrintGameQuotes(int32_t snum)
while (l > (ud.config.ScreenWidth - USERQUOTE_RIGHTOFFSET)) while (l > (ud.config.ScreenWidth - USERQUOTE_RIGHTOFFSET))
{ {
l -= (ud.config.ScreenWidth-USERQUOTE_RIGHTOFFSET); l -= (ud.config.ScreenWidth-USERQUOTE_RIGHTOFFSET);
j += textsc(k > 4 ? 8 : (k<<1)); j += textsc(k > 4 ? 8 : (k<<1));
} }
} }
@ -1822,7 +1822,8 @@ void G_PrintGameQuotes(int32_t snum)
else else
quotebot = quotebotgoal; quotebot = quotebotgoal;
if (ps->fta <= 1) return; if (ps->fta <= 1)
return;
if (ScriptQuotes[ps->ftq] == NULL) if (ScriptQuotes[ps->ftq] == NULL)
{ {
@ -1834,9 +1835,12 @@ void G_PrintGameQuotes(int32_t snum)
if (k == 0) if (k == 0)
{ {
if (ps->ftq >= QUOTE_RESERVED && ps->ftq <= QUOTE_RESERVED3) if (reserved_quote)
{ {
k = 140;//quotebot-8-4; if (!g_fakeMultiMode)
k = 140;//quotebot-8-4;
else
k = 50;
} }
else else
{ {