From c7ddc423f67236a99956960cf9fe89abf077839b Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 5 Sep 2008 00:02:14 +0000 Subject: Reformat (beautify) Raven sources and add GPL headers. Subversion-branch: /branches/raven-branch Subversion-revision: 1197 --- src/heretic/in_lude.c | 1520 +++++++++++++++++++++++++------------------------ 1 file changed, 783 insertions(+), 737 deletions(-) (limited to 'src/heretic/in_lude.c') diff --git a/src/heretic/in_lude.c b/src/heretic/in_lude.c index bdf7fa6e..efb84ed8 100644 --- a/src/heretic/in_lude.c +++ b/src/heretic/in_lude.c @@ -1,3 +1,25 @@ +// Emacs style mode select -*- C++ -*- +//----------------------------------------------------------------------------- +// +// Copyright(C) 1993-1996 Id Software, Inc. +// Copyright(C) 1993-2008 Raven Software +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +// 02111-1307, USA. +// +//----------------------------------------------------------------------------- /* ======================== = @@ -11,9 +33,9 @@ typedef enum { - SINGLE, - COOPERATIVE, - DEATHMATCH + SINGLE, + COOPERATIVE, + DEATHMATCH } gametype_t; // Public functions @@ -57,7 +79,7 @@ static int hours; static int minutes; static int seconds; -static int slaughterboy; // in DM, the player with the most kills +static int slaughterboy; // in DM, the player with the most kills static int killPercent[MAXPLAYERS]; static int bonusPercent[MAXPLAYERS]; @@ -86,45 +108,44 @@ extern char *LevelNames[]; typedef struct { - int x; - int y; + int x; + int y; } yahpt_t; -static yahpt_t YAHspot[3][9] = -{ - { - { 172, 78 }, - { 86, 90 }, - { 73, 66 }, - { 159, 95 }, - { 148, 126 }, - { 132, 54 }, - { 131, 74 }, - { 208, 138 }, - { 52, 101 } - }, - { - { 218, 57 }, - { 137, 81 }, - { 155, 124 }, - { 171, 68 }, - { 250, 86 }, - { 136, 98 }, - { 203, 90 }, - { 220, 140 }, - { 279, 106 } - }, - { - { 86, 99 }, - { 124, 103 }, - { 154, 79 }, - { 202, 83 }, - { 178, 59 }, - { 142, 58 }, - { 219, 66 }, - { 247, 57 }, - { 107, 80 } - } +static yahpt_t YAHspot[3][9] = { + { + {172, 78}, + {86, 90}, + {73, 66}, + {159, 95}, + {148, 126}, + {132, 54}, + {131, 74}, + {208, 138}, + {52, 101} + }, + { + {218, 57}, + {137, 81}, + {155, 124}, + {171, 68}, + {250, 86}, + {136, 98}, + {203, 90}, + {220, 140}, + {279, 106} + }, + { + {86, 99}, + {124, 103}, + {154, 79}, + {202, 83}, + {178, 59}, + {142, 58}, + {219, 66}, + {247, 57}, + {107, 80} + } }; //======================================================================== @@ -133,20 +154,20 @@ static yahpt_t YAHspot[3][9] = // //======================================================================== -extern void AM_Stop (void); +extern void AM_Stop(void); void IN_Start(void) { - I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE)); - IN_LoadPics(); - IN_InitStats(); - intermission = true; - interstate = -1; - skipintermission = false; - intertime = 0; - oldintertime = 0; - AM_Stop(); - S_StartSong(mus_intr, true); + I_SetPalette(W_CacheLumpName("PLAYPAL", PU_CACHE)); + IN_LoadPics(); + IN_InitStats(); + intermission = true; + interstate = -1; + skipintermission = false; + intertime = 0; + oldintertime = 0; + AM_Stop(); + S_StartSong(mus_intr, true); } //======================================================================== @@ -157,11 +178,11 @@ void IN_Start(void) void IN_WaitStop(void) { - if(!--cnt) - { - IN_Stop(); - G_WorldDone(); - } + if (!--cnt) + { + IN_Stop(); + G_WorldDone(); + } } //======================================================================== @@ -172,10 +193,10 @@ void IN_WaitStop(void) void IN_Stop(void) { - intermission = false; - IN_UnloadPics(); - SB_state = -1; - BorderNeedRefresh = true; + intermission = false; + IN_UnloadPics(); + SB_state = -1; + BorderNeedRefresh = true; } //======================================================================== @@ -187,91 +208,92 @@ void IN_Stop(void) void IN_InitStats(void) { - int i; - int j; - signed int slaughterfrags; - int posnum; - int slaughtercount; - int playercount; - - - if(!netgame) - { - gametype = SINGLE; - time = leveltime/35; - hours = time/3600; - time -= hours*3600; - minutes = time/60; - time -= minutes*60; - seconds = time; - } - else if(netgame && !deathmatch) - { - gametype = COOPERATIVE; - memset(killPercent, 0, MAXPLAYERS*sizeof(int)); - memset(bonusPercent, 0, MAXPLAYERS*sizeof(int)); - memset(secretPercent, 0, MAXPLAYERS*sizeof(int)); - for(i=0; i slaughterfrags) - { - slaughterboy = 1< slaughterfrags) + { + slaughterboy = 1 << i; + slaughterfrags = totalFrags[i]; + slaughtercount = 1; + } + else if (totalFrags[i] == slaughterfrags) + { + slaughterboy |= 1 << i; + slaughtercount++; + } + } + if (playercount == slaughtercount) + { // don't do the slaughter stuff if everyone is equal + slaughterboy = 0; + } + } } //======================================================================== @@ -282,36 +304,36 @@ void IN_InitStats(void) void IN_LoadPics(void) { - int i; - - switch(gameepisode) - { - case 1: - patchINTERPIC = W_CacheLumpName("MAPE1", PU_STATIC); - break; - case 2: - patchINTERPIC = W_CacheLumpName("MAPE2", PU_STATIC); - break; - case 3: - patchINTERPIC = W_CacheLumpName("MAPE3", PU_STATIC); - break; - default: - break; - } - patchBEENTHERE = W_CacheLumpName("IN_X", PU_STATIC); - patchGOINGTHERE = W_CacheLumpName("IN_YAH", PU_STATIC); - FontBLumpBase = W_GetNumForName("FONTB16"); - for(i=0; i<10; i++) - { - FontBNumbers[i] = W_CacheLumpNum(FontBLumpBase+i, PU_STATIC); - } - FontBLump = W_GetNumForName("FONTB_S")+1; - FontBNegative = W_CacheLumpName("FONTB13", PU_STATIC); - - FontBSlash = W_CacheLumpName("FONTB15", PU_STATIC); - FontBPercent = W_CacheLumpName("FONTB05", PU_STATIC); - patchFaceOkayBase = W_GetNumForName("FACEA0"); - patchFaceDeadBase = W_GetNumForName("FACEB0"); + int i; + + switch (gameepisode) + { + case 1: + patchINTERPIC = W_CacheLumpName("MAPE1", PU_STATIC); + break; + case 2: + patchINTERPIC = W_CacheLumpName("MAPE2", PU_STATIC); + break; + case 3: + patchINTERPIC = W_CacheLumpName("MAPE3", PU_STATIC); + break; + default: + break; + } + patchBEENTHERE = W_CacheLumpName("IN_X", PU_STATIC); + patchGOINGTHERE = W_CacheLumpName("IN_YAH", PU_STATIC); + FontBLumpBase = W_GetNumForName("FONTB16"); + for (i = 0; i < 10; i++) + { + FontBNumbers[i] = W_CacheLumpNum(FontBLumpBase + i, PU_STATIC); + } + FontBLump = W_GetNumForName("FONTB_S") + 1; + FontBNegative = W_CacheLumpName("FONTB13", PU_STATIC); + + FontBSlash = W_CacheLumpName("FONTB15", PU_STATIC); + FontBPercent = W_CacheLumpName("FONTB05", PU_STATIC); + patchFaceOkayBase = W_GetNumForName("FACEA0"); + patchFaceDeadBase = W_GetNumForName("FACEB0"); } //======================================================================== @@ -322,21 +344,21 @@ void IN_LoadPics(void) void IN_UnloadPics(void) { - int i; - - if(patchINTERPIC) - { - Z_ChangeTag(patchINTERPIC, PU_CACHE); - } - Z_ChangeTag(patchBEENTHERE, PU_CACHE); - Z_ChangeTag(patchGOINGTHERE, PU_CACHE); - for(i=0; i<10; i++) - { - Z_ChangeTag(FontBNumbers[i], PU_CACHE); - } - Z_ChangeTag(FontBNegative, PU_CACHE); - Z_ChangeTag(FontBSlash, PU_CACHE); - Z_ChangeTag(FontBPercent, PU_CACHE); + int i; + + if (patchINTERPIC) + { + Z_ChangeTag(patchINTERPIC, PU_CACHE); + } + Z_ChangeTag(patchBEENTHERE, PU_CACHE); + Z_ChangeTag(patchGOINGTHERE, PU_CACHE); + for (i = 0; i < 10; i++) + { + Z_ChangeTag(FontBNumbers[i], PU_CACHE); + } + Z_ChangeTag(FontBNegative, PU_CACHE); + Z_ChangeTag(FontBSlash, PU_CACHE); + Z_ChangeTag(FontBPercent, PU_CACHE); } //======================================================================== @@ -347,66 +369,66 @@ void IN_UnloadPics(void) void IN_Ticker(void) { - if(!intermission) - { - return; - } - if(interstate == 3) - { - IN_WaitStop(); - return; - } - IN_CheckForSkip(); - intertime++; - if(oldintertime < intertime) - { - interstate++; - if(gameepisode > 3 && interstate >= 1) - { // Extended Wad levels: skip directly to the next level - interstate = 3; - } - switch(interstate) - { - case 0: - oldintertime = intertime+300; - if(gameepisode > 3) - { - oldintertime = intertime+1200; - } - break; - case 1: - oldintertime = intertime+200; - break; - case 2: - oldintertime = MAXINT; - break; - case 3: - cnt = 10; - break; - default: - break; - } - } - if(skipintermission) - { - if(interstate == 0 && intertime < 150) - { - intertime = 150; - skipintermission = false; - return; - } - else if(interstate < 2 && gameepisode < 4) - { - interstate = 2; - skipintermission = false; - S_StartSound(NULL, sfx_dorcls); - return; - } - interstate = 3; - cnt = 10; - skipintermission = false; - S_StartSound(NULL, sfx_dorcls); - } + if (!intermission) + { + return; + } + if (interstate == 3) + { + IN_WaitStop(); + return; + } + IN_CheckForSkip(); + intertime++; + if (oldintertime < intertime) + { + interstate++; + if (gameepisode > 3 && interstate >= 1) + { // Extended Wad levels: skip directly to the next level + interstate = 3; + } + switch (interstate) + { + case 0: + oldintertime = intertime + 300; + if (gameepisode > 3) + { + oldintertime = intertime + 1200; + } + break; + case 1: + oldintertime = intertime + 200; + break; + case 2: + oldintertime = MAXINT; + break; + case 3: + cnt = 10; + break; + default: + break; + } + } + if (skipintermission) + { + if (interstate == 0 && intertime < 150) + { + intertime = 150; + skipintermission = false; + return; + } + else if (interstate < 2 && gameepisode < 4) + { + interstate = 2; + skipintermission = false; + S_StartSound(NULL, sfx_dorcls); + return; + } + interstate = 3; + cnt = 10; + skipintermission = false; + S_StartSound(NULL, sfx_dorcls); + } } //======================================================================== @@ -418,39 +440,39 @@ void IN_Ticker(void) void IN_CheckForSkip(void) { - int i; - player_t *player; - - for (i=0, player = players ; icmd.buttons&BT_ATTACK) - { - if (!player->attackdown) - { - skipintermission = 1; - } - player->attackdown = true; - } - else - { - player->attackdown = false; - } - if (player->cmd.buttons&BT_USE) - { - if (!player->usedown) - { - skipintermission = 1; - } - player->usedown = true; - } - else - { - player->usedown = false; - } - } - } + int i; + player_t *player; + + for (i = 0, player = players; i < MAXPLAYERS; i++, player++) + { + if (playeringame[i]) + { + if (player->cmd.buttons & BT_ATTACK) + { + if (!player->attackdown) + { + skipintermission = 1; + } + player->attackdown = true; + } + else + { + player->attackdown = false; + } + if (player->cmd.buttons & BT_USE) + { + if (!player->usedown) + { + skipintermission = 1; + } + player->usedown = true; + } + else + { + player->usedown = false; + } + } + } } //======================================================================== @@ -461,63 +483,63 @@ void IN_CheckForSkip(void) void IN_Drawer(void) { - static int oldinterstate; - - if(!intermission) - { - return; - } - if(interstate == 3) - { - return; - } - UpdateState |= I_FULLSCRN; - if(oldinterstate != 2 && interstate == 2) - { - S_StartSound(NULL, sfx_pstop); - } - oldinterstate = interstate; - switch(interstate) - { - case 0: // draw stats - IN_DrawStatBack(); - switch(gametype) - { - case SINGLE: - IN_DrawSingleStats(); - break; - case COOPERATIVE: - IN_DrawCoopStats(); - break; - case DEATHMATCH: - IN_DrawDMStats(); - break; - } - break; - case 1: // leaving old level - if(gameepisode < 4) - { - V_DrawPatch(0, 0, patchINTERPIC); - IN_DrawOldLevel(); - } - break; - case 2: // going to the next level - if(gameepisode < 4) - { - V_DrawPatch(0, 0, patchINTERPIC); - IN_DrawYAH(); - } - break; - case 3: // waiting before going to the next level - if(gameepisode < 4) - { - V_DrawPatch(0, 0, patchINTERPIC); - } - break; - default: - I_Error("IN_lude: Intermission state out of range.\n"); - break; - } + static int oldinterstate; + + if (!intermission) + { + return; + } + if (interstate == 3) + { + return; + } + UpdateState |= I_FULLSCRN; + if (oldinterstate != 2 && interstate == 2) + { + S_StartSound(NULL, sfx_pstop); + } + oldinterstate = interstate; + switch (interstate) + { + case 0: // draw stats + IN_DrawStatBack(); + switch (gametype) + { + case SINGLE: + IN_DrawSingleStats(); + break; + case COOPERATIVE: + IN_DrawCoopStats(); + break; + case DEATHMATCH: + IN_DrawDMStats(); + break; + } + break; + case 1: // leaving old level + if (gameepisode < 4) + { + V_DrawPatch(0, 0, patchINTERPIC); + IN_DrawOldLevel(); + } + break; + case 2: // going to the next level + if (gameepisode < 4) + { + V_DrawPatch(0, 0, patchINTERPIC); + IN_DrawYAH(); + } + break; + case 3: // waiting before going to the next level + if (gameepisode < 4) + { + V_DrawPatch(0, 0, patchINTERPIC); + } + break; + default: + I_Error("IN_lude: Intermission state out of range.\n"); + break; + } } //======================================================================== @@ -528,28 +550,28 @@ void IN_Drawer(void) void IN_DrawStatBack(void) { - int x; - int y; - - byte *src; - byte *dest; - - src = W_CacheLumpName ("FLOOR16", PU_CACHE); - dest = screen; - - for (y=0 ; y= 30) - { - S_StartSound(NULL, sfx_dorcls); - sounds++; - } - IN_DrawNumber(players[consoleplayer].killcount, 200, 65, 3); - V_DrawShadowedPatch(237, 65, FontBSlash); - IN_DrawNumber(totalkills, 248, 65, 3); - if(intertime < 60) - { - return; - } - if(sounds < 2 && intertime >= 60) - { - S_StartSound(NULL, sfx_dorcls); - sounds++; - } - IN_DrawNumber(players[consoleplayer].itemcount, 200, 90, 3); - V_DrawShadowedPatch(237, 90, FontBSlash); - IN_DrawNumber(totalitems, 248, 90, 3); - if(intertime < 90) - { - return; - } - if(sounds < 3 && intertime >= 90) - { - S_StartSound(NULL, sfx_dorcls); - sounds++; - } - IN_DrawNumber(players[consoleplayer].secretcount, 200, 115, 3); - V_DrawShadowedPatch(237, 115, FontBSlash); - IN_DrawNumber(totalsecret, 248, 115, 3); - if(intertime < 150) - { - return; - } - if(sounds < 4 && intertime >= 150) - { - S_StartSound(NULL, sfx_dorcls); - sounds++; - } - - if(!ExtendedWAD || gameepisode < 4) - { - IN_DrTextB("TIME", 85, 160); - IN_DrawTime(155, 160, hours, minutes, seconds); - } - else - { - x = 160-MN_TextAWidth("NOW ENTERING:")/2; - MN_DrTextA("NOW ENTERING:", x, 160); - x = 160-MN_TextBWidth(LevelNames[(gameepisode-1)*9+gamemap-1]+7)/2; - IN_DrTextB(LevelNames[(gameepisode-1)*9+gamemap-1]+7, x, 170); - skipintermission = false; - } + int x; + static int sounds; + + IN_DrTextB("KILLS", 50, 65); + IN_DrTextB("ITEMS", 50, 90); + IN_DrTextB("SECRETS", 50, 115); + + x = 160 - MN_TextBWidth(LevelNames[(gameepisode - 1) * 9 + prevmap - 1] + + 7) / 2; + IN_DrTextB(LevelNames[(gameepisode - 1) * 9 + prevmap - 1] + 7, x, 3); + x = 160 - MN_TextAWidth("FINISHED") / 2; + MN_DrTextA("FINISHED", x, 25); + + if (intertime < 30) + { + sounds = 0; + return; + } + if (sounds < 1 && intertime >= 30) + { + S_StartSound(NULL, sfx_dorcls); + sounds++; + } + IN_DrawNumber(players[consoleplayer].killcount, 200, 65, 3); + V_DrawShadowedPatch(237, 65, FontBSlash); + IN_DrawNumber(totalkills, 248, 65, 3); + if (intertime < 60) + { + return; + } + if (sounds < 2 && intertime >= 60) + { + S_StartSound(NULL, sfx_dorcls); + sounds++; + } + IN_DrawNumber(players[consoleplayer].itemcount, 200, 90, 3); + V_DrawShadowedPatch(237, 90, FontBSlash); + IN_DrawNumber(totalitems, 248, 90, 3); + if (intertime < 90) + { + return; + } + if (sounds < 3 && intertime >= 90) + { + S_StartSound(NULL, sfx_dorcls); + sounds++; + } + IN_DrawNumber(players[consoleplayer].secretcount, 200, 115, 3); + V_DrawShadowedPatch(237, 115, FontBSlash); + IN_DrawNumber(totalsecret, 248, 115, 3); + if (intertime < 150) + { + return; + } + if (sounds < 4 && intertime >= 150) + { + S_StartSound(NULL, sfx_dorcls); + sounds++; + } + + if (!ExtendedWAD || gameepisode < 4) + { + IN_DrTextB("TIME", 85, 160); + IN_DrawTime(155, 160, hours, minutes, seconds); + } + else + { + x = 160 - MN_TextAWidth("NOW ENTERING:") / 2; + MN_DrTextA("NOW ENTERING:", x, 160); + x = 160 - + MN_TextBWidth(LevelNames[(gameepisode - 1) * 9 + gamemap - 1] + + 7) / 2; + IN_DrTextB(LevelNames[(gameepisode - 1) * 9 + gamemap - 1] + 7, x, + 170); + skipintermission = false; + } } //======================================================================== @@ -728,46 +757,49 @@ void IN_DrawSingleStats(void) void IN_DrawCoopStats(void) { - int i; - int x; - int ypos; - - static int sounds; - - IN_DrTextB("KILLS", 95, 35); - IN_DrTextB("BONUS", 155, 35); - IN_DrTextB("SECRET", 232, 35); - x = 160-MN_TextBWidth(LevelNames[(gameepisode-1)*9+prevmap-1]+7)/2; - IN_DrTextB(LevelNames[(gameepisode-1)*9+prevmap-1]+7, x, 3); - x = 160-MN_TextAWidth("FINISHED")/2; - MN_DrTextA("FINISHED", x, 25); - - ypos = 50; - for(i=0; i= 40 && sounds < 1) - { - S_StartSound(NULL, sfx_dorcls); - sounds++; - } - IN_DrawNumber(killPercent[i], 85, ypos+10, 3); - V_DrawShadowedPatch(121, ypos+10, FontBPercent); - IN_DrawNumber(bonusPercent[i], 160, ypos+10, 3); - V_DrawShadowedPatch(196, ypos+10, FontBPercent); - IN_DrawNumber(secretPercent[i], 237, ypos+10, 3); - V_DrawShadowedPatch(273, ypos+10, FontBPercent); - ypos += 37; - } - } + int i; + int x; + int ypos; + + static int sounds; + + IN_DrTextB("KILLS", 95, 35); + IN_DrTextB("BONUS", 155, 35); + IN_DrTextB("SECRET", 232, 35); + x = 160 - MN_TextBWidth(LevelNames[(gameepisode - 1) * 9 + prevmap - 1] + + 7) / 2; + IN_DrTextB(LevelNames[(gameepisode - 1) * 9 + prevmap - 1] + 7, x, 3); + x = 160 - MN_TextAWidth("FINISHED") / 2; + MN_DrTextA("FINISHED", x, 25); + + ypos = 50; + for (i = 0; i < MAXPLAYERS; i++) + { + if (playeringame[i]) + { + V_DrawShadowedPatch(25, ypos, + W_CacheLumpNum(patchFaceOkayBase + i, + PU_CACHE)); + if (intertime < 40) + { + sounds = 0; + ypos += 37; + continue; + } + else if (intertime >= 40 && sounds < 1) + { + S_StartSound(NULL, sfx_dorcls); + sounds++; + } + IN_DrawNumber(killPercent[i], 85, ypos + 10, 3); + V_DrawShadowedPatch(121, ypos + 10, FontBPercent); + IN_DrawNumber(bonusPercent[i], 160, ypos + 10, 3); + V_DrawShadowedPatch(196, ypos + 10, FontBPercent); + IN_DrawNumber(secretPercent[i], 237, ypos + 10, 3); + V_DrawShadowedPatch(273, ypos + 10, FontBPercent); + ypos += 37; + } + } } //======================================================================== @@ -778,87 +810,100 @@ void IN_DrawCoopStats(void) void IN_DrawDMStats(void) { - int i; - int j; - int ypos; - int xpos; - int kpos; - int x; - - static int sounds; - - xpos = 90; - ypos = 55; - - IN_DrTextB("TOTAL", 265, 30); - MN_DrTextA("VICTIMS", 140, 8); - for(i=0; i<7; i++) - { - MN_DrTextA(KillersText[i], 10, 80+9*i); - } - if(intertime < 20) - { - for(i=0; i>FRACBITS, W_CacheLumpNum(patchFaceOkayBase+i, PU_CACHE)); - V_DrawShadowedPatch(((xpos<>FRACBITS, 18, W_CacheLumpNum(patchFaceDeadBase+i, PU_CACHE)); - } - } - sounds = 0; - return; - } - if(intertime >= 20 && sounds < 1) - { - S_StartSound(NULL, sfx_dorcls); - sounds++; - } - if(intertime >= 100 && slaughterboy && sounds < 2) - { - S_StartSound(NULL, sfx_wpnup); - sounds++; - } - for(i=0; i> FRACBITS, + W_CacheLumpNum(patchFaceOkayBase + i, + PU_CACHE)); + V_DrawShadowedPatch(((xpos << FRACBITS) + + dSlideX[i] * intertime) >> FRACBITS, 18, + W_CacheLumpNum(patchFaceDeadBase + i, + PU_CACHE)); + } + } + sounds = 0; + return; + } + if (intertime >= 20 && sounds < 1) + { + S_StartSound(NULL, sfx_dorcls); + sounds++; + } + if (intertime >= 100 && slaughterboy && sounds < 2) + { + S_StartSound(NULL, sfx_wpnup); + sounds++; + } + for (i = 0; i < MAXPLAYERS; i++) + { + if (playeringame[i]) + { + if (intertime < 100 || i == consoleplayer) + { + V_DrawShadowedPatch(40, ypos, + W_CacheLumpNum(patchFaceOkayBase + i, + PU_CACHE)); + V_DrawShadowedPatch(xpos, 18, + W_CacheLumpNum(patchFaceDeadBase + i, + PU_CACHE)); + } + else + { + V_DrawFuzzPatch(40, ypos, + W_CacheLumpNum(patchFaceOkayBase + i, + PU_CACHE)); + V_DrawFuzzPatch(xpos, 18, + W_CacheLumpNum(patchFaceDeadBase + i, + PU_CACHE)); + } + kpos = 86; + for (j = 0; j < MAXPLAYERS; j++) + { + if (playeringame[j]) + { + IN_DrawNumber(players[i].frags[j], kpos, ypos + 10, 3); + kpos += 43; + } + } + if (slaughterboy & (1 << i)) + { + if (!(intertime & 16)) + { + IN_DrawNumber(totalFrags[i], 263, ypos + 10, 3); + } + } + else + { + IN_DrawNumber(totalFrags[i], 263, ypos + 10, 3); + } + ypos += 36; + xpos += 43; + } + } } //======================================================================== @@ -869,22 +914,22 @@ void IN_DrawDMStats(void) void IN_DrawTime(int x, int y, int h, int m, int s) { - if(h) - { - IN_DrawNumber(h, x, y, 2); - IN_DrTextB(":", x+26, y); - } - x += 34; - if(m || h) - { - IN_DrawNumber(m, x, y, 2); - } - x += 34; - if(s) - { - IN_DrTextB(":", x-8, y); - IN_DrawNumber(s, x, y, 2); - } + if (h) + { + IN_DrawNumber(h, x, y, 2); + IN_DrTextB(":", x + 26, y); + } + x += 34; + if (m || h) + { + IN_DrawNumber(m, x, y, 2); + } + x += 34; + if (s) + { + IN_DrTextB(":", x - 8, y); + IN_DrawNumber(s, x, y, 2); + } } //======================================================================== @@ -895,89 +940,90 @@ void IN_DrawTime(int x, int y, int h, int m, int s) void IN_DrawNumber(int val, int x, int y, int digits) { - patch_t *patch; - int xpos; - int oldval; - int realdigits; - boolean neg; - - oldval = val; - xpos = x; - neg = false; - realdigits = 1; - - if(val < 0) - { //...this should reflect negative frags - val = -val; - neg = true; - if(val > 99) - { - val = 99; - } - } - if(val > 9) - { - realdigits++; - if(digits < realdigits) - { - realdigits = digits; - val = 9; - } - } - if(val > 99) - { - realdigits++; - if(digits < realdigits) - { - realdigits = digits; - val = 99; - } - } - if(val > 999) - { - realdigits++; - if(digits < realdigits) - { - realdigits = digits; - val = 999; - } - } - if(digits == 4) - { - patch = FontBNumbers[val/1000]; - V_DrawShadowedPatch(xpos+6-patch->width/2-12, y, patch); - } - if(digits > 2) - { - if(realdigits > 2) - { - patch = FontBNumbers[val/100]; - V_DrawShadowedPatch(xpos+6-patch->width/2, y, patch); - } - xpos += 12; - } - val = val%100; - if(digits > 1) - { - if(val > 9) - { - patch = FontBNumbers[val/10]; - V_DrawShadowedPatch(xpos+6-patch->width/2, y, patch); - } - else if(digits == 2 || oldval > 99) - { - V_DrawShadowedPatch(xpos, y, FontBNumbers[0]); - } - xpos += 12; - } - val = val%10; - patch = FontBNumbers[val]; - V_DrawShadowedPatch(xpos+6-patch->width/2, y, patch); - if(neg) - { - patch = FontBNegative; - V_DrawShadowedPatch(xpos+6-patch->width/2-12*(realdigits), y, patch); - } + patch_t *patch; + int xpos; + int oldval; + int realdigits; + boolean neg; + + oldval = val; + xpos = x; + neg = false; + realdigits = 1; + + if (val < 0) + { //...this should reflect negative frags + val = -val; + neg = true; + if (val > 99) + { + val = 99; + } + } + if (val > 9) + { + realdigits++; + if (digits < realdigits) + { + realdigits = digits; + val = 9; + } + } + if (val > 99) + { + realdigits++; + if (digits < realdigits) + { + realdigits = digits; + val = 99; + } + } + if (val > 999) + { + realdigits++; + if (digits < realdigits) + { + realdigits = digits; + val = 999; + } + } + if (digits == 4) + { + patch = FontBNumbers[val / 1000]; + V_DrawShadowedPatch(xpos + 6 - patch->width / 2 - 12, y, patch); + } + if (digits > 2) + { + if (realdigits > 2) + { + patch = FontBNumbers[val / 100]; + V_DrawShadowedPatch(xpos + 6 - patch->width / 2, y, patch); + } + xpos += 12; + } + val = val % 100; + if (digits > 1) + { + if (val > 9) + { + patch = FontBNumbers[val / 10]; + V_DrawShadowedPatch(xpos + 6 - patch->width / 2, y, patch); + } + else if (digits == 2 || oldval > 99) + { + V_DrawShadowedPatch(xpos, y, FontBNumbers[0]); + } + xpos += 12; + } + val = val % 10; + patch = FontBNumbers[val]; + V_DrawShadowedPatch(xpos + 6 - patch->width / 2, y, patch); + if (neg) + { + patch = FontBNegative; + V_DrawShadowedPatch(xpos + 6 - patch->width / 2 - 12 * (realdigits), + y, patch); + } } //======================================================================== @@ -988,20 +1034,20 @@ void IN_DrawNumber(int val, int x, int y, int digits) void IN_DrTextB(char *text, int x, int y) { - char c; - patch_t *p; - - while((c = *text++) != 0) - { - if(c < 33) - { - x += 8; - } - else - { - p = W_CacheLumpNum(FontBLump+c-33, PU_CACHE); - V_DrawShadowedPatch(x, y, p); - x += p->width-1; - } - } + char c; + patch_t *p; + + while ((c = *text++) != 0) + { + if (c < 33) + { + x += 8; + } + else + { + p = W_CacheLumpNum(FontBLump + c - 33, PU_CACHE); + V_DrawShadowedPatch(x, y, p); + x += p->width - 1; + } + } } -- cgit v1.2.3