Compare commits

...
35 Commits
Author SHA1 Message Date
Alug e13ba89f1a use memcmp during startup map check
prob not faster just looks a bit better tbh
2025-05-31 17:20:38 +02:00
Alug d8b2134aef dont let dedi cache vote patches lol 2025-05-31 15:32:57 +02:00
Alug c168832f8e forgor to remove this 2025-05-31 15:32:53 +02:00
Alug 448a603a56 dont let dedi free votepatches lel 2025-05-31 15:32:42 +02:00
Alug 2a95201c6d free votepatches also in ogl not just software 2025-05-31 15:32:39 +02:00
Alug a73de55f96 also put votescreen patches into votescreen struct
+ more cleanup
2025-05-31 15:32:34 +02:00
Alug e4a4496be6 rename luaVoteScreen to luaPrefix + make it static buffer
since its effectively just a prefix,
2025-05-31 15:32:18 +02:00
Alug a8f3a8dfb0 fix oopsie that caused use after free 2025-05-31 15:32:14 +02:00
Alug e19b9d1c60 fix smol mistake votescreen check 2025-05-31 15:32:11 +02:00
Alug e28ec4e7cb unnest loop stuff in P_PartialAddWadFile
may speed this up ever so slightly since we dont need to go through all wad lumps 3 times per call anymore
2025-05-31 15:31:58 +02:00
Alug d0f09b467b Put votescreen background stuff into a struct
+ some refactoring and renaming

- removed some unused and redundant variables
- renamed some variables

turns out the lua votescreens always used the animated votescreen drawer, so i renamed it to lua votescreen drawer
2025-05-31 15:30:50 +02:00
Alug 6617382f54 Revert "reset the palette earlier during levelload"
This reverts commit 5e532a76cf.
2025-05-30 23:59:08 +02:00
Alug 7d68c0598c Fix underflow in consistancy checking code
https://git.srb2.org/Hanicef/SRB2Classic/-/commit/9f5686ef48956cd64ef92f737e59cbbaa27d8cf9
2025-05-30 02:54:48 +02:00
Alug 201c725dc7 cleanup d_main a little 2025-05-30 02:54:45 +02:00
Alug 57b2316c42 didnt mean to change this lel 2025-05-29 19:01:19 +02:00
Alug fe682a8071 only make screentexture for postprocess if we need to
gives quite a neat perfboost on the gpu side
2025-05-29 19:01:16 +02:00
Alug bf44a054a1 move HWR_GetTexturePalette calls
to after early returns/where they are used
2025-05-29 18:17:26 +02:00
Alug eca9c60d9b call HWR_LoadMapTextures in paletterender toggle callback
from srb2 pr
2025-05-29 18:17:23 +02:00
Alug cf42c35b9f add mo checks to automap stuff 2025-05-29 13:40:57 +02:00
Alug a364068abb add a bunch of checks for if G_BuildMapTitle returns NULL 2025-05-29 13:40:53 +02:00
Alug e88093d9cf no need for an else here 2025-05-29 12:30:07 +02:00
Alug 5e532a76cf reset the palette earlier during levelload
generally make this behave like srb2/rr again
2025-05-29 12:30:05 +02:00
Alug fb9c459269 readd cubeapply check here 2025-05-29 12:30:00 +02:00
Alug a6898bd1cd this memset is incorrect and does nothing 2025-05-28 22:12:00 +02:00
Alug ff474d18ee remove this
prob wrong assumption, our netcode sucks massive ass
2025-05-28 21:44:38 +02:00
Alug f15d3be263 forgor the hw state lel 2025-05-28 18:39:20 +02:00
Alug 19e5366c5b add wireframe mode for ogl 2025-05-28 18:31:55 +02:00
Alug 346dee019c fix compiler warning bout playeringame 2025-05-28 18:31:37 +02:00
Alug 18914f22f2 remove crappy memcpy redifine from md5 2025-05-28 18:31:33 +02:00
Alug 1219ecf818 check for 32bit with __SIZEOF_POINTER__ for precip drawdistance
thx @chromaticpipe for the tip!
2025-05-28 16:27:40 +02:00
Alug b6923d0d0d readd flexible array for softwarepatch columnofs
how did this ever work lel
2025-05-28 16:21:57 +02:00
Alug e8969b0645 dont always print openmpt version to console
just use I_OutputMsg instead
2025-05-27 18:31:20 +02:00
Alug 7932c1af6f Print the current SDL_mixer version
when initializing the sound system
2025-05-27 18:30:55 +02:00
Alug 95b4228d3c update windoze libbacktrace
never was updated since we added this 2 years ago lel
2025-05-26 11:03:56 +01:00
Alug a0ff44043f Merge branch 'Saturn' into Saturn-Next 2025-05-25 17:37:40 +02:00
29 changed files with 636 additions and 509 deletions

No files matched your search

+9 -8
View File
@@ -1,5 +1,5 @@
/* backtrace.h -- Public header file for stack backtrace library. /* backtrace.h -- Public header file for stack backtrace library.
Copyright (C) 2012-2020 Free Software Foundation, Inc. Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google. Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
@@ -54,13 +54,14 @@ struct backtrace_state;
invalid after this function returns. invalid after this function returns.
As a special case, the ERRNUM argument will be passed as -1 if no As a special case, the ERRNUM argument will be passed as -1 if no
debug info can be found for the executable, but the function debug info can be found for the executable, or if the debug info
requires debug info (e.g., backtrace_full, backtrace_pcinfo). The exists but has an unsupported version, but the function requires
MSG in this case will be something along the lines of "no debug debug info (e.g., backtrace_full, backtrace_pcinfo). The MSG in
info". Similarly, ERRNUM will be passed as -1 if there is no this case will be something along the lines of "no debug info".
symbol table, but the function requires a symbol table (e.g., Similarly, ERRNUM will be passed as -1 if there is no symbol table,
backtrace_syminfo). This may be used as a signal that some other but the function requires a symbol table (e.g., backtrace_syminfo).
approach should be tried. */ This may be used as a signal that some other approach should be
tried. */
typedef void (*backtrace_error_callback) (void *data, const char *msg, typedef void (*backtrace_error_callback) (void *data, const char *msg,
int errnum); int errnum);
Binary file not shown.
+7 -3
View File
@@ -197,7 +197,7 @@ static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF;
// used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof) // used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
static fixed_t scale_ftom; static fixed_t scale_ftom;
static player_t *plr; // the player represented by an arrow static player_t *plr = NULL; // the player represented by an arrow
static boolean followplayer = true; // specifies whether to follow the player around static boolean followplayer = true; // specifies whether to follow the player around
@@ -237,7 +237,7 @@ static inline void AM_restoreScaleAndLoc(void)
m_x = old_m_x; m_x = old_m_x;
m_y = old_m_y; m_y = old_m_y;
} }
else else if (plr && plr->mo)
{ {
m_x = (plr->mo->x >> FRACTOMAPBITS) - m_w/2; m_x = (plr->mo->x >> FRACTOMAPBITS) - m_w/2;
m_y = (plr->mo->y >> FRACTOMAPBITS) - m_h/2; m_y = (plr->mo->y >> FRACTOMAPBITS) - m_h/2;
@@ -318,7 +318,8 @@ static void AM_initVariables(void)
break; break;
plr = &players[pnum]; plr = &players[pnum];
if (plr != NULL && plr->mo != NULL)
if (plr && plr->mo)
{ {
m_x = (plr->mo->x >> FRACTOMAPBITS) - m_w/2; m_x = (plr->mo->x >> FRACTOMAPBITS) - m_w/2;
m_y = (plr->mo->y >> FRACTOMAPBITS) - m_h/2; m_y = (plr->mo->y >> FRACTOMAPBITS) - m_h/2;
@@ -597,6 +598,9 @@ static inline void AM_changeWindowScale(void)
static inline void AM_doFollowPlayer(void) static inline void AM_doFollowPlayer(void)
{ {
if (!plr || !plr->mo)
return;
if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y) if (f_oldloc.x != plr->mo->x || f_oldloc.y != plr->mo->y)
{ {
m_x = FTOM(MTOF(plr->mo->x >> FRACTOMAPBITS)) - m_w/2; m_x = FTOM(MTOF(plr->mo->x >> FRACTOMAPBITS)) - m_w/2;
-1
View File
@@ -240,7 +240,6 @@ void COM_ImmedExecute(const char *ptext)
while (i < strlen(ptext)) while (i < strlen(ptext))
{ {
quotes = 0; quotes = 0;
for (j = 0; i < strlen(ptext); i++,j++) for (j = 0; i < strlen(ptext); i++,j++)
{ {
+19 -24
View File
@@ -1068,6 +1068,7 @@ static void SV_RequireResynch(INT32 node)
// Initial setup // Initial setup
memset(resynch_sent[node], 0, MAXPLAYERS); memset(resynch_sent[node], 0, MAXPLAYERS);
for (i = 0; i < MAXPLAYERS; ++i) for (i = 0; i < MAXPLAYERS; ++i)
{ {
if (!playeringame[i]) // Player not in game so just drop it from required synch if (!playeringame[i]) // Player not in game so just drop it from required synch
@@ -1687,13 +1688,7 @@ static void SV_SendPlayerInfo(INT32 node)
for (i = 0; i < MSCOMPAT_MAXPLAYERS; i++) for (i = 0; i < MSCOMPAT_MAXPLAYERS; i++)
{ {
if (i >= MAXPLAYERS) if ((i >= MAXPLAYERS) || !playeringame[i])
{
netbuffer->u.playerinfo[i].node = 255;
continue;
}
if (playeringame[i] == UINT8_MAX || !playeringame[i])
{ {
netbuffer->u.playerinfo[i].node = 255; // This slot is empty. netbuffer->u.playerinfo[i].node = 255; // This slot is empty.
continue; continue;
@@ -1778,8 +1773,6 @@ static boolean SV_SendServerConfig(INT32 node)
memset(netbuffer->u.servercfg.playerskins, 0xFF, sizeof(netbuffer->u.servercfg.playerskins)); memset(netbuffer->u.servercfg.playerskins, 0xFF, sizeof(netbuffer->u.servercfg.playerskins));
memset(netbuffer->u.servercfg.playercolor, 0xFF, sizeof(netbuffer->u.servercfg.playercolor)); memset(netbuffer->u.servercfg.playercolor, 0xFF, sizeof(netbuffer->u.servercfg.playercolor));
memset(netbuffer->u.servercfg.adminplayers, -1, sizeof(netbuffer->u.servercfg.adminplayers));
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
netbuffer->u.servercfg.adminplayers[i] = (SINT8)adminplayers[i]; netbuffer->u.servercfg.adminplayers[i] = (SINT8)adminplayers[i];
@@ -3275,7 +3268,7 @@ void CL_ClearPlayer(INT32 playernum)
P_RemoveMobj(players[playernum].mo); P_RemoveMobj(players[playernum].mo);
} }
memset(&players[playernum], 0, sizeof (player_t)); memset(&players[playernum], 0, sizeof(player_t));
} }
// //
@@ -4284,14 +4277,14 @@ void SV_ResetServer(void)
sprintf(player_names[i], "Player %d", i + 1); sprintf(player_names[i], "Player %d", i + 1);
} }
memset(player_name_changes, 0, sizeof player_name_changes); memset(player_name_changes, 0, sizeof(player_name_changes));
memset(playeringame, false, sizeof playeringame); memset(playeringame, false, sizeof(playeringame));
memset(playernode, UINT8_MAX, sizeof playernode); memset(playernode, UINT8_MAX, sizeof(playernode));
pingmeasurecount = 1; pingmeasurecount = 1;
memset(realpingtable, 0, sizeof realpingtable); memset(realpingtable, 0, sizeof(realpingtable));
memset(playerpingtable, 0, sizeof playerpingtable); memset(playerpingtable, 0, sizeof(playerpingtable));
ClearAdminPlayers(); ClearAdminPlayers();
@@ -5324,18 +5317,18 @@ static void HandlePacketFromPlayer(SINT8 node)
/// \todo Use a separate cvar for that kind of timeout? /// \todo Use a separate cvar for that kind of timeout?
freezetimeout[node] = I_GetTime() + connectiontimeout; freezetimeout[node] = I_GetTime() + connectiontimeout;
// If we've alredy received a ticcmd for this tic, just submit it for the next one.
tic_t faketic = maketic;
if ((!!(netcmds[maketic % TICQUEUE][netconsole].angleturn & TICCMD_RECEIVED))
&& (maketic - firstticstosend < TICQUEUE - 1))
faketic++;
// Don't do anything for packets of type NODEKEEPALIVE? // Don't do anything for packets of type NODEKEEPALIVE?
// Sryder 2018/07/01: Update the freezetimeout still! // Sryder 2018/07/01: Update the freezetimeout still!
if (netbuffer->packettype == PT_NODEKEEPALIVE if (netbuffer->packettype == PT_NODEKEEPALIVE
|| netbuffer->packettype == PT_NODEKEEPALIVEMIS) || netbuffer->packettype == PT_NODEKEEPALIVEMIS)
break; break;
// If we've alredy received a ticcmd for this tic, just submit it for the next one.
tic_t faketic = maketic;
if ((!!(netcmds[maketic % TICQUEUE][netconsole].angleturn & TICCMD_RECEIVED))
&& (maketic - firstticstosend < TICQUEUE - 1))
faketic++;
// Copy ticcmd // Copy ticcmd
G_MoveTiccmd(&netcmds[faketic%TICQUEUE][netconsole], &netbuffer->u.clientpak.cmd, 1); G_MoveTiccmd(&netcmds[faketic%TICQUEUE][netconsole], &netbuffer->u.clientpak.cmd, 1);
@@ -5395,7 +5388,7 @@ static void HandlePacketFromPlayer(SINT8 node)
// Check player consistancy during the level // Check player consistancy during the level
if (gamestate == GS_LEVEL if (gamestate == GS_LEVEL
&& (realstart > gametic - TICQUEUE+1 && realstart <= gametic) && (realstart <= gametic && realstart + TICQUEUE - 1 > gametic)
&& consistancy[realstart%TICQUEUE] != SHORT(netbuffer->u.clientpak.consistancy) && consistancy[realstart%TICQUEUE] != SHORT(netbuffer->u.clientpak.consistancy)
&& (!UseSaturnSynch(node) || (!resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime() && !SV_ResendingSavegameToAnyone()))) && (!UseSaturnSynch(node) || (!resendingsavegame[node] && savegameresendcooldown[node] <= I_GetTime() && !SV_ResendingSavegameToAnyone())))
{ {
@@ -5425,10 +5418,13 @@ static void HandlePacketFromPlayer(SINT8 node)
} }
if (cv_blamecfail.value) if (cv_blamecfail.value)
{
CONS_Printf(M_GetText("Synch failure for player %d (%s); expected %hd, got %hd\n"), CONS_Printf(M_GetText("Synch failure for player %d (%s); expected %hd, got %hd\n"),
netconsole+1, player_names[netconsole], netconsole+1, player_names[netconsole],
consistancy[realstart%TICQUEUE], consistancy[realstart%TICQUEUE],
SHORT(netbuffer->u.clientpak.consistancy)); SHORT(netbuffer->u.clientpak.consistancy));
}
DEBFILE(va("Restoring player %d (synch failure) [%update] %d!=%d\n", DEBFILE(va("Restoring player %d (synch failure) [%update] %d!=%d\n",
netconsole, realstart, consistancy[realstart%TICQUEUE], netconsole, realstart, consistancy[realstart%TICQUEUE],
SHORT(netbuffer->u.clientpak.consistancy))); SHORT(netbuffer->u.clientpak.consistancy)));
@@ -5700,7 +5696,7 @@ static void HandlePacketFromPlayer(SINT8 node)
break; break;
} }
//Update client ping table from the server. // Update client ping table from the server.
if (client) if (client)
{ {
UINT8 i; UINT8 i;
@@ -6510,7 +6506,6 @@ static inline void PingUpdate(void)
if (pingtimeout[i] > 0) if (pingtimeout[i] > 0)
pingtimeout[i]--; pingtimeout[i]--;
} }
} }
//kick lagging players... unless everyone but the server's ping sucks. //kick lagging players... unless everyone but the server's ping sucks.
+127 -124
View File
@@ -197,12 +197,10 @@ static void D_PadMenuScrollInput(UINT8 input)
// and pass it to the eventlist // and pass it to the eventlist
static void D_GamePadMenuScrollTicker(void) static void D_GamePadMenuScrollTicker(void)
{ {
UINT8 i;
static UINT8 menuInputDelayTimer = 0; static UINT8 menuInputDelayTimer = 0;
if (dedicated) for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
return;
for (UINT8 i = 0; i < 4; i++)
{ {
if (dpadscrollstate[i]) if (dpadscrollstate[i])
{ {
@@ -222,10 +220,10 @@ static void D_GamePadMenuScrollTicker(void)
static void D_DeviceLEDTick(void) static void D_DeviceLEDTick(void)
{ {
UINT8 i; UINT8 i;
static UINT16 color[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0}; static UINT16 color[MAXSPLITSCREENPLAYERS] = {0};
static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {0, 0, 0, 0}; static UINT16 curcolor[MAXSPLITSCREENPLAYERS] = {0};
if (dedicated || numcontrollers == 0) if (numcontrollers == 0)
{ {
return; return;
} }
@@ -252,7 +250,6 @@ static void D_DeviceLEDTick(void)
void D_ProcessEvents(void) void D_ProcessEvents(void)
{ {
event_t *ev; event_t *ev;
boolean eaten; boolean eaten;
for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1)) for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
@@ -291,8 +288,10 @@ void D_ProcessEvents(void)
// Demo input: // Demo input:
if (demo.playback) if (demo.playback)
{
if (M_DemoResponder(ev)) if (M_DemoResponder(ev))
continue; // demo ate the event continue; // demo ate the event
}
// console input // console input
#ifdef HAVE_THREADS #ifdef HAVE_THREADS
@@ -317,6 +316,88 @@ void D_ProcessEvents(void)
// draw current display, possibly wiping it from the previous // draw current display, possibly wiping it from the previous
// //
static void D_Renderview(void)
{
UINT8 i;
if (automapactive)
return;
R_ApplyLevelInterpolators(rendertimefrac);
for (i = 0; i <= splitscreen; i++)
{
const boolean issplitscreen = (i > 0);
if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
{
viewssnum = i;
if (!issplitscreen) // Initialize for P1
{
viewwindowy = viewwindowx = 0;
topleft = screens[0];
objectsdrawn = 0;
}
#ifdef HWRENDER
if (rendermode == render_opengl)
{
HWR_RenderPlayerView();
R_RestoreLevelInterpolators();
return;
}
#endif
if (issplitscreen) // Splitscreen-specific
{
const INT32 len = viewheight*sizeof(ylookup[0]);
switch (i)
{
case 1:
if (splitscreen > 1)
{
viewwindowx = viewwidth;
viewwindowy = 0;
}
else
{
viewwindowx = 0;
viewwindowy = viewheight;
}
M_Memcpy(ylookup, ylookup2, len);
break;
case 2:
viewwindowx = 0;
viewwindowy = viewheight;
M_Memcpy(ylookup, ylookup3, len);
break;
case 3:
viewwindowx = viewwidth;
viewwindowy = viewheight;
M_Memcpy(ylookup, ylookup4, len);
default:
break;
}
topleft = screens[0] + viewwindowy*vid.width + viewwindowx;
}
R_RenderPlayerView(&players[displayplayers[i]]);
if (issplitscreen)
M_Memcpy(ylookup, ylookup1, viewheight*sizeof (ylookup[0]));
}
if (!issplitscreen)
R_ApplyViewMorph();
V_DoPostProcessor(i, postimgparam[i]);
}
R_RestoreLevelInterpolators();
}
// wipegamestate can be set to -1 to force a wipe on the next draw // wipegamestate can be set to -1 to force a wipe on the next draw
// added comment : there is a wipe eatch change of the gamestate // added comment : there is a wipe eatch change of the gamestate
gamestate_t wipegamestate = GS_LEVEL; gamestate_t wipegamestate = GS_LEVEL;
@@ -327,7 +408,6 @@ static boolean D_Display(void)
boolean forcerefresh = false; boolean forcerefresh = false;
static boolean wipe = false; static boolean wipe = false;
INT32 wipedefindex = 0; INT32 wipedefindex = 0;
UINT8 i;
if (!dedicated) if (!dedicated)
{ {
@@ -366,6 +446,7 @@ static boolean D_Display(void)
{ {
// set for all later // set for all later
wipedefindex = gamestate; // wipe_xxx_toblack wipedefindex = gamestate; // wipe_xxx_toblack
if (gamestate == GS_TITLESCREEN && wipegamestate != GS_INTRO) if (gamestate == GS_TITLESCREEN && wipegamestate != GS_INTRO)
wipedefindex = wipe_timeattack_toblack; wipedefindex = wipe_timeattack_toblack;
else if (gamestate == GS_INTERMISSION) else if (gamestate == GS_INTERMISSION)
@@ -378,26 +459,28 @@ static boolean D_Display(void)
if (!dedicated) if (!dedicated)
{ {
// Fade to black first if (gamestate != GS_LEVEL)
if (gamestate != GS_LEVEL // fades to black on its own timing, always
&& wipedefs[wipedefindex] != UINT8_MAX)
{ {
F_WipeStartScreen(); // Fade to black first
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); if (wipedefs[wipedefindex] != UINT8_MAX) // fades to black on its own timing, always
F_WipeEndScreen(); {
F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK); F_WipeStartScreen();
ranwipe = true; V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
} F_WipeEndScreen();
F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
ranwipe = true;
}
if (gamestate != GS_LEVEL && rendermode != render_none) if (rendermode != render_none)
{ {
V_SetPaletteLump("PLAYPAL"); // Reset the palette V_SetPaletteLump("PLAYPAL"); // Reset the palette
R_ReInitColormaps(0, LUMPERROR); R_ReInitColormaps(0, LUMPERROR);
}
} }
F_WipeStartScreen(); F_WipeStartScreen();
} }
else //dedicated servers else // dedicated servers
{ {
F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK); F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
ranwipe = true; ranwipe = true;
@@ -405,7 +488,7 @@ static boolean D_Display(void)
} }
} }
if (dedicated) //bail out after wipe logic if (dedicated) // bail out after wipe logic
return false; return false;
// do buffered drawing // do buffered drawing
@@ -430,9 +513,6 @@ static boolean D_Display(void)
HU_Drawer(); HU_Drawer();
break; break;
case GS_TIMEATTACK:
break;
case GS_INTRO: case GS_INTRO:
F_IntroDrawer(); F_IntroDrawer();
if (wipegamestate == (gamestate_t)-1) if (wipegamestate == (gamestate_t)-1)
@@ -484,6 +564,7 @@ static boolean D_Display(void)
HU_Erase(); HU_Erase();
HU_Drawer(); HU_Drawer();
} }
case GS_TIMEATTACK:
case GS_DEDICATEDSERVER: case GS_DEDICATEDSERVER:
case GS_NULL: case GS_NULL:
break; break;
@@ -492,89 +573,10 @@ static boolean D_Display(void)
if (gamestate == GS_LEVEL) if (gamestate == GS_LEVEL)
{ {
// draw the view directly // draw the view directly
if (cv_renderview.value && !automapactive) if (cv_renderview.value)
{ {
PS_START_TIMING(ps_rendercalltime); PS_START_TIMING(ps_rendercalltime);
D_Renderview();
R_ApplyLevelInterpolators(rendertimefrac);
for (i = 0; i <= splitscreen; i++)
{
if (!P_MobjWasRemoved(players[displayplayers[i]].mo) || players[displayplayers[i]].playerstate == PST_DEAD)
{
viewssnum = i;
if (i == 0) // Initialize for P1
{
viewwindowy = 0;
viewwindowx = 0;
topleft = screens[0] + viewwindowy*vid.width + viewwindowx;
objectsdrawn = 0;
}
#ifdef HWRENDER
if (rendermode == render_opengl)
HWR_RenderPlayerView();
else
#endif
if (rendermode != render_none)
{
if (i > 0) // Splitscreen-specific
{
switch (i)
{
case 1:
if (splitscreen > 1)
{
viewwindowx = viewwidth;
viewwindowy = 0;
}
else
{
viewwindowx = 0;
viewwindowy = viewheight;
}
M_Memcpy(ylookup, ylookup2, viewheight*sizeof (ylookup[0]));
break;
case 2:
viewwindowx = 0;
viewwindowy = viewheight;
M_Memcpy(ylookup, ylookup3, viewheight*sizeof (ylookup[0]));
break;
case 3:
viewwindowx = viewwidth;
viewwindowy = viewheight;
M_Memcpy(ylookup, ylookup4, viewheight*sizeof (ylookup[0]));
default:
break;
}
topleft = screens[0] + viewwindowy*vid.width + viewwindowx;
}
R_RenderPlayerView(&players[displayplayers[i]]);
if (i > 0)
M_Memcpy(ylookup, ylookup1, viewheight*sizeof (ylookup[0]));
}
}
}
if (rendermode == render_soft)
{
if (!splitscreen)
R_ApplyViewMorph();
for (i = 0; i <= splitscreen; i++)
{
V_DoPostProcessor(i, postimgparam[i]);
}
}
R_RestoreLevelInterpolators();
PS_STOP_TIMING(ps_rendercalltime); PS_STOP_TIMING(ps_rendercalltime);
} }
@@ -584,6 +586,7 @@ static boolean D_Display(void)
{ {
VID_BlitLinearScreen(screens[0], screens[1], vid.width*vid.bpp, vid.height, vid.width*vid.bpp, vid.rowbytes); VID_BlitLinearScreen(screens[0], screens[1], vid.width*vid.bpp, vid.height, vid.width*vid.bpp, vid.rowbytes);
} }
lastdraw = false; lastdraw = false;
} }
@@ -606,13 +609,8 @@ static boolean D_Display(void)
// draw pause pic // draw pause pic
if (paused && cv_showhud.value && !demo.playback) if (paused && cv_showhud.value && !demo.playback)
{ {
INT32 py; INT32 py = (automapactive) ? 4 : (viewwindowy + 4);
patch_t *patch; patch_t *patch = W_CachePatchName("M_PAUSE", PU_PATCH);
if (automapactive)
py = 4;
else
py = viewwindowy + 4;
patch = W_CachePatchName("M_PAUSE", PU_PATCH);
V_DrawScaledPatch(viewwindowx + (BASEVIDWIDTH - patch->width)/2, py, V_SNAPTOTOP, patch); V_DrawScaledPatch(viewwindowx + (BASEVIDWIDTH - patch->width)/2, py, V_SNAPTOTOP, patch);
} }
@@ -754,7 +752,7 @@ void D_SRB2Loop(void)
// Casting the return value of a function is bad practice (apparently) // Casting the return value of a function is bad practice (apparently)
double budget = ((R_GetFramerateCap() == 0) ? 0.0 : round((1.0 / R_GetFramerateCap()) * I_GetPrecisePrecision())); double budget = ((R_GetFramerateCap() == 0) ? 0.0 : round((1.0 / R_GetFramerateCap()) * I_GetPrecisePrecision()));
capbudget = (precise_t) budget; capbudget = (precise_t)budget;
boolean ranwipe = false; boolean ranwipe = false;
@@ -824,12 +822,15 @@ void D_SRB2Loop(void)
doDisplay = true; doDisplay = true;
} }
if (menuactive) if (!dedicated)
{ {
D_GamePadMenuScrollTicker(); if (menuactive)
} {
D_GamePadMenuScrollTicker();
}
D_DeviceLEDTick(); D_DeviceLEDTick();
}
} }
if (interp) if (interp)
@@ -841,7 +842,9 @@ void D_SRB2Loop(void)
ps_interp_frac.value.p = (precise_t)((FIXED_TO_FLOAT(g_time.timefrac)) * 1000.0f); ps_interp_frac.value.p = (precise_t)((FIXED_TO_FLOAT(g_time.timefrac)) * 1000.0f);
ps_interp_lag.value.p = (precise_t)((deltasecs) * 1000.0f); ps_interp_lag.value.p = (precise_t)((deltasecs) * 1000.0f);
if (!(paused || P_AutoPause()) && deltatics < 1.0 && !hu_stopped) const boolean lagging = ((deltatics >= 1.0) || hu_stopped);
if (!(paused || P_AutoPause()) && !lagging)
{ {
rendertimefrac = g_time.timefrac; rendertimefrac = g_time.timefrac;
} }
@@ -850,7 +853,7 @@ void D_SRB2Loop(void)
rendertimefrac = FRACUNIT; rendertimefrac = FRACUNIT;
} }
if ((deltatics < 1.0) && !hu_stopped) if (!lagging)
{ {
rendertimefrac_unpaused = g_time.timefrac; rendertimefrac_unpaused = g_time.timefrac;
} }
@@ -1809,7 +1812,7 @@ void D_SRB2Main(void)
{ {
name = lumpinfo->name; name = lumpinfo->name;
if (name[0] == 'M' && name[1] == 'A' && name[2] == 'P') // Ignore the headers if (memcmp(name, "MAP", 3) == 0) // Ignore the headers
{ {
INT16 num; INT16 num;
if (name[5] != '\0') if (name[5] != '\0')
@@ -1839,7 +1842,7 @@ void D_SRB2Main(void)
{ {
name = lumpinfo->name; name = lumpinfo->name;
if (name[0] == 'M' && name[1] == 'A' && name[2] == 'P') // Ignore the headers if (memcmp(name, "MAP", 3) == 0) // Ignore the headers
{ {
INT16 num; INT16 num;
if (name[5] != '\0') if (name[5] != '\0')
+9 -7
View File
@@ -216,11 +216,8 @@ static CV_PossibleValue_t teamscramble_cons_t[] = {{0, "Off"}, {1, "Random"}, {2
static CV_PossibleValue_t startingliveslimit_cons_t[] = {{1, "MIN"}, {99, "MAX"}, {0, NULL}}; static CV_PossibleValue_t startingliveslimit_cons_t[] = {{1, "MIN"}, {99, "MAX"}, {0, NULL}};
static CV_PossibleValue_t sleeping_cons_t[] = {{0, "MIN"}, {1000/TICRATE, "MAX"}, {0, NULL}}; static CV_PossibleValue_t sleeping_cons_t[] = {{0, "MIN"}, {1000/TICRATE, "MAX"}, {0, NULL}};
static CV_PossibleValue_t competitionboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Teleports"}, static CV_PossibleValue_t competitionboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Teleports"}, {3, "None"}, {0, NULL}};
{3, "None"}, {0, NULL}}; static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Non-Random"}, {3, "None"}, {0, NULL}};
static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Non-Random"},
{3, "None"}, {0, NULL}};
//static CV_PossibleValue_t chances_cons_t[] = {{0, "MIN"}, {9, "MAX"}, {0, NULL}}; //static CV_PossibleValue_t chances_cons_t[] = {{0, "MIN"}, {9, "MAX"}, {0, NULL}};
static CV_PossibleValue_t match_scoring_cons_t[] = {{0, "Normal"}, {1, "Classic"}, {0, NULL}}; static CV_PossibleValue_t match_scoring_cons_t[] = {{0, "Normal"}, {1, "Classic"}, {0, NULL}};
@@ -2777,7 +2774,7 @@ static void Command_Map_f(void)
// G_TOLFlag handles both multiplayer gametype and ignores it for !multiplayer // G_TOLFlag handles both multiplayer gametype and ignores it for !multiplayer
else else
{ {
if (!mapheaderinfo[newmapnum-1] || mapheaderinfo[newmapnum-1] == NULL) if (!mapheaderinfo[newmapnum-1])
{ {
CONS_Alert(CONS_WARNING, M_GetText("Invalid mapheaderinfo for Course %s (%s)\n"), realmapname, G_BuildMapName(newmapnum)); CONS_Alert(CONS_WARNING, M_GetText("Invalid mapheaderinfo for Course %s (%s)\n"), realmapname, G_BuildMapName(newmapnum));
Z_Free(realmapname); Z_Free(realmapname);
@@ -3031,9 +3028,14 @@ static void Command_ReplayMarker(void)
adjustedleveltime = 0; adjustedleveltime = 0;
char *title = G_BuildMapTitle(gamemap); char *title = G_BuildMapTitle(gamemap);
snprintf(demo.titlename, 64, "%s [%i:%02d/%.5s]", title, G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
if (title) if (title)
{
snprintf(demo.titlename, 64, "%s [%i:%02d/%.5s]", title, G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
Z_Free(title); Z_Free(title);
}
else
snprintf(demo.titlename, 64, "[%i:%02d/%.5s]", G_TicsToMinutes(adjustedleveltime, false), G_TicsToSeconds(adjustedleveltime), modeattacking ? "Record Attack" : connectedservername);
CONS_Printf("Replay will be saved!\n"); CONS_Printf("Replay will be saved!\n");
} }
+10 -4
View File
@@ -388,7 +388,7 @@ static void DRPC_GotServerIP(UINT32 address)
--------------------------------------------------*/ --------------------------------------------------*/
static const char *DRPC_GetServerIP(void) static const char *DRPC_GetServerIP(void)
{ {
const char *address; const char *address;
// If you're connected // If you're connected
if (I_GetNodeAddress && (address = I_GetNodeAddress(servernode)) != NULL) if (I_GetNodeAddress && (address = I_GetNodeAddress(servernode)) != NULL)
@@ -489,7 +489,7 @@ void DRPC_UpdatePresence(void)
{ {
#endif #endif
discordPresence.state = "Private"; discordPresence.state = "Private";
#ifdef MASTERSERVER #ifdef MASTERSERVER
} }
#endif #endif
@@ -571,9 +571,15 @@ void DRPC_UpdatePresence(void)
{ {
// Map name on tool tip // Map name on tool tip
char *title = G_BuildMapTitle(gamemap); char *title = G_BuildMapTitle(gamemap);
snprintf(mapname, 48, "Map: %s", title); if (title)
{
snprintf(mapname, 48, "Map: %s", title);
Z_Free(title);
}
else
snprintf(mapname, 48, "Map: UNKNOWN");
discordPresence.largeImageText = mapname; discordPresence.largeImageText = mapname;
Z_Free(title);
} }
if (gamestate == GS_LEVEL && Playing()) if (gamestate == GS_LEVEL && Playing())
+7 -4
View File
@@ -3998,7 +3998,6 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool
} }
} }
char *G_BuildMapTitle(INT32 mapnum) char *G_BuildMapTitle(INT32 mapnum)
{ {
char *title = NULL; char *title = NULL;
@@ -6068,15 +6067,19 @@ void G_BeginRecording(void)
char *title = G_BuildMapTitle(gamemap); char *title = G_BuildMapTitle(gamemap);
// Print to a separate temp buffer instead of demo.titlename, so we can use it in M_TextInputSetString // Print to a separate temp buffer instead of demo.titlename, so we can use it in M_TextInputSetString
snprintf(demotitlename, 64, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername); if (title)
{
snprintf(demotitlename, 64, "%s - %s", title, modeattacking ? "Time Attack" : connectedservername);
Z_Free(title);
}
else
snprintf(demotitlename, 64, "%s", modeattacking ? "Time Attack" : connectedservername);
// Init just in case it isn't initialized already // Init just in case it isn't initialized already
M_TextInputInit(&demo.titlenameinput, demo.titlename, sizeof(demo.titlename)); M_TextInputInit(&demo.titlenameinput, demo.titlename, sizeof(demo.titlename));
// This will indirectly assign to demo.titlename too // This will indirectly assign to demo.titlename too
M_TextInputSetString(&demo.titlenameinput, demotitlename); M_TextInputSetString(&demo.titlenameinput, demotitlename);
Z_Free(title);
} }
// demo checksum // demo checksum
+1 -1
View File
@@ -124,7 +124,7 @@ void HWR_ProcessPolygon(FSurfaceInfo *pSurf, FOutVector *pOutVerts, FUINT iNumPt
polygonArray[polygonArraySize].numVerts = iNumPts; polygonArray[polygonArraySize].numVerts = iNumPts;
polygonArray[polygonArraySize].polyFlags = PolyFlags; polygonArray[polygonArraySize].polyFlags = PolyFlags;
polygonArray[polygonArraySize].texture = current_texture; polygonArray[polygonArraySize].texture = current_texture;
polygonArray[polygonArraySize].shader = (shader_target != -1) ? HWR_GetShaderFromTarget(shader_target) : shader_target; polygonArray[polygonArraySize].shader = (shader_target != SHADER_NONE) ? HWR_GetShaderFromTarget(shader_target) : shader_target;
polygonArray[polygonArraySize].horizonSpecial = horizonSpecial; polygonArray[polygonArraySize].horizonSpecial = horizonSpecial;
polygonArraySize++; polygonArraySize++;
+14 -9
View File
@@ -46,12 +46,16 @@ RGBA_t *HWR_GetTexturePalette(void)
static INT32 format2bpp(GLTextureFormat_t format) static INT32 format2bpp(GLTextureFormat_t format)
{ {
if (format == GL_TEXFMT_RGBA) switch (format)
return 4; {
else if (format == GL_TEXFMT_ALPHA_INTENSITY_88 || format == GL_TEXFMT_AP_88) case GL_TEXFMT_RGBA:
return 2; return 4;
else case GL_TEXFMT_ALPHA_INTENSITY_88:
return 1; case GL_TEXFMT_AP_88:
return 2;
default:
return 1;
}
} }
// This code was originally placed directly in HWR_DrawPatchInCache. // This code was originally placed directly in HWR_DrawPatchInCache.
@@ -221,8 +225,6 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
if (texture->width <= 0 || texture->height <= 0) if (texture->width <= 0 || texture->height <= 0)
return; return;
palette = HWR_GetTexturePalette();
x1 = patch->originx; x1 = patch->originx;
width = SHORT(realpatch->width); width = SHORT(realpatch->width);
height = SHORT(realpatch->height); height = SHORT(realpatch->height);
@@ -234,6 +236,8 @@ static void HWR_DrawTexturePatchInCache(GLMipmap_t *mipmap,
if (patch->originy > texture->height || (patch->originy + height) < 0) if (patch->originy > texture->height || (patch->originy + height) < 0)
return; // patch not located within texture's y bounds, ignore return; // patch not located within texture's y bounds, ignore
palette = HWR_GetTexturePalette();
// patch is actually inside the texture! // patch is actually inside the texture!
// now check if texture is partly off-screen and adjust accordingly // now check if texture is partly off-screen and adjust accordingly
@@ -323,7 +327,6 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
boolean skyspecial = false; // poor hack for Legacy large skies.. boolean skyspecial = false; // poor hack for Legacy large skies..
RGBA_t *palette; RGBA_t *palette;
palette = HWR_GetTexturePalette();
texture = textures[texnum]; texture = textures[texnum];
@@ -361,6 +364,8 @@ static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *gltex, boolean noe
INT32 j; INT32 j;
RGBA_t col; RGBA_t col;
palette = HWR_GetTexturePalette();
col = palette[HWR_CHROMAKEY_EQUIVALENTCOLORINDEX]; col = palette[HWR_CHROMAKEY_EQUIVALENTCOLORINDEX];
for (idx = 0, j = 0; j < blockheight; j++) for (idx = 0, j = 0; j < blockheight; j++)
+2
View File
@@ -318,6 +318,8 @@ enum hwdsetspecialstate
HWD_SET_TEXTUREFILTERMODE, HWD_SET_TEXTUREFILTERMODE,
HWD_SET_TEXTUREANISOTROPICMODE, HWD_SET_TEXTUREANISOTROPICMODE,
HWD_SET_WIREFRAME,
HWD_SET_MSAA, HWD_SET_MSAA,
HWD_SET_SCREEN_TEXTURES, HWD_SET_SCREEN_TEXTURES,
+29 -15
View File
@@ -226,6 +226,8 @@ consvar_t cv_glsolvetjoin = {"gr_solvetjoin", "On", 0, CV_OnOff, NULL, 0, NULL,
consvar_t cv_glbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_glbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_glwireframe = {"gr_wireframe", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_glrenderdistance = {"gr_renderdistance", "Max", CV_SAVE, glrenderdistance_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_glrenderdistance = {"gr_renderdistance", "Max", CV_SAVE, glrenderdistance_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_glhorizonlines = {"gr_horizonlines", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_glhorizonlines = {"gr_horizonlines", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -338,6 +340,11 @@ static void HWR_SetShaderState(void)
GL_SetSpecialState(HWD_SET_SHADERS, HWR_UseShader() ? 1 : 0); GL_SetSpecialState(HWD_SET_SHADERS, HWR_UseShader() ? 1 : 0);
} }
static boolean HWR_IsWireframeMode(void)
{
return (cv_glwireframe.value /*&& cv_debug*/);
}
static boolean HWR_OverrideObjectLightLevel(mobj_t *thing, INT32 *lightlevel) static boolean HWR_OverrideObjectLightLevel(mobj_t *thing, INT32 *lightlevel)
{ {
if (R_ThingIsFullBright(thing)) if (R_ThingIsFullBright(thing))
@@ -4227,7 +4234,6 @@ static void *HWR_CreateDrawNode(gl_drawnode_type_t type)
Z_Realloc(drawnodes, alloceddrawnodes * sizeof(gl_drawnode_t), PU_LEVEL, &drawnodes); Z_Realloc(drawnodes, alloceddrawnodes * sizeof(gl_drawnode_t), PU_LEVEL, &drawnodes);
} }
drawnode = &drawnodes[numdrawnodes++]; drawnode = &drawnodes[numdrawnodes++];
drawnode->type = type; drawnode->type = type;
@@ -5259,6 +5265,9 @@ static void HWR_DrawSkyBackground(void)
if (drewsky) if (drewsky)
return; return;
if (HWR_IsWireframeMode())
return;
GL_SetBlend(PF_Translucent|PF_NoDepthTest|PF_Modulated); GL_SetBlend(PF_Translucent|PF_NoDepthTest|PF_Modulated);
memcpy(&dometransform, &atransform, sizeof(FTransform)); memcpy(&dometransform, &atransform, sizeof(FTransform));
@@ -5461,8 +5470,8 @@ void HWR_RenderViewpoint(gl_portal_t *rootportal, const float fpov, player_t *pl
HWR_PortalClipping(rootportal); HWR_PortalClipping(rootportal);
} }
// Set transform. if (HWR_IsWireframeMode())
GL_SetTransform(&atransform); GL_SetSpecialState(HWD_SET_WIREFRAME, 1);
ps_numbspcalls.value.i = 0; ps_numbspcalls.value.i = 0;
ps_numpolyobjects.value.i = 0; ps_numpolyobjects.value.i = 0;
@@ -5527,6 +5536,9 @@ void HWR_RenderViewpoint(gl_portal_t *rootportal, const float fpov, player_t *pl
ps_hw_nodedrawtime.value.p = 0; ps_hw_nodedrawtime.value.p = 0;
HWR_RenderDrawNodes(); HWR_RenderDrawNodes();
if (HWR_IsWireframeMode())
GL_SetSpecialState(HWD_SET_WIREFRAME, 0);
HWR_FreePortalList(portallist); HWR_FreePortalList(portallist);
} }
@@ -5750,7 +5762,7 @@ static void HWR_TogglePaletteRendering(void)
// If the r_opengl "texture palette" stays the same during this switch, these textures // If the r_opengl "texture palette" stays the same during this switch, these textures
// will not be cleared out. However they are still out of date since the // will not be cleared out. However they are still out of date since the
// composite texture blending method has changed. Therefore they need to be cleared. // composite texture blending method has changed. Therefore they need to be cleared.
GL_ClearMipMapCache(); HWR_LoadMapTextures(numtextures);
} }
} }
else else
@@ -5764,7 +5776,7 @@ static void HWR_TogglePaletteRendering(void)
// If the r_opengl "texture palette" stays the same during this switch, these textures // If the r_opengl "texture palette" stays the same during this switch, these textures
// will not be cleared out. However they are still out of date since the // will not be cleared out. However they are still out of date since the
// composite texture blending method has changed. Therefore they need to be cleared. // composite texture blending method has changed. Therefore they need to be cleared.
GL_ClearMipMapCache(); HWR_LoadMapTextures(numtextures);
} }
} }
} }
@@ -5801,6 +5813,8 @@ void HWR_AddCommands(void)
CV_RegisterVar(&cv_glbatching); CV_RegisterVar(&cv_glbatching);
CV_RegisterVar(&cv_glwireframe);
CV_RegisterVar(&cv_glrenderdistance); CV_RegisterVar(&cv_glrenderdistance);
CV_RegisterVar(&cv_glhorizonlines); CV_RegisterVar(&cv_glhorizonlines);
@@ -5873,7 +5887,6 @@ static void COM_HWR_glinfo(void)
CONS_Printf("Unrecognized argument: %s\n", argv); CONS_Printf("Unrecognized argument: %s\n", argv);
return; return;
} }
} }
CONS_Printf("\x88OpenGL %s\x80\n", gl_version); CONS_Printf("\x88OpenGL %s\x80\n", gl_version);
@@ -5993,19 +6006,19 @@ static void HWR_DoPostProcessor(player_t *player)
if (cv_glscreentextures.value != 2) // screen textures are needed for the rest of the effects if (cv_glscreentextures.value != 2) // screen textures are needed for the rest of the effects
return; return;
// Capture the screen for intermission and screen waving //UINT8 viewnum = R_GetViewNumber(); // see below
if (gamestate != GS_INTERMISSION)
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
if (splitscreen) // Not supported in splitscreen - someone want to add support?
return;
//UINT8 viewnum = R_GetViewNumber(); // see above
//camera_t *thiscam = &camera[viewnum]; //camera_t *thiscam = &camera[viewnum];
camera_t *thiscam = &camera[0]; camera_t *thiscam = &camera[0];
// Not supported in splitscreen - someone want to add support?
const boolean screenwave = (!splitscreen && (thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT));
// Capture the screen for intermission and screen waving
if ((lastdraw || screenwave) && gamestate != GS_INTERMISSION)
GL_MakeScreenTexture(HWD_SCREENTEXTURE_GENERIC1);
// Drunken vision! WooOOooo~ // Drunken vision! WooOOooo~
if (thiscam->postimg & POSTIMG_WATER || thiscam->postimg & POSTIMG_HEAT) if (screenwave)
{ {
// 10 by 10 grid. 2 coordinates (xy) // 10 by 10 grid. 2 coordinates (xy)
float v[SCREENVERTS][SCREENVERTS][2]; float v[SCREENVERTS][SCREENVERTS][2];
@@ -6039,6 +6052,7 @@ static void HWR_DoPostProcessor(player_t *player)
v[x][y][1] = (y/((float)(SCREENVERTS-1.0f)/9.0f))-4.5f; v[x][y][1] = (y/((float)(SCREENVERTS-1.0f)/9.0f))-4.5f;
} }
} }
GL_PostImgRedraw(v); GL_PostImgRedraw(v);
// Capture the screen again for screen waving on the intermission // Capture the screen again for screen waving on the intermission
+3 -1
View File
@@ -202,6 +202,8 @@ extern consvar_t cv_glsolvetjoin;
extern consvar_t cv_glbatching; extern consvar_t cv_glbatching;
extern consvar_t cv_glwireframe;
extern consvar_t cv_glrenderdistance; extern consvar_t cv_glrenderdistance;
extern consvar_t cv_glhorizonlines; extern consvar_t cv_glhorizonlines;
@@ -223,7 +225,7 @@ FUNCINLINE static ATTRINLINE boolean HWR_ShouldUsePaletteRendering(void)
FUNCINLINE static ATTRINLINE boolean HWR_PalRenderFlashpal(void) FUNCINLINE static ATTRINLINE boolean HWR_PalRenderFlashpal(void)
{ {
return (HWR_ShouldUsePaletteRendering() && cv_glflashpal.value); return (cv_glflashpal.value && HWR_ShouldUsePaletteRendering());
} }
#endif #endif
+7
View File
@@ -350,6 +350,8 @@ typedef void (APIENTRY * PFNglDisable) (GLenum cap);
static PFNglDisable pglDisable; static PFNglDisable pglDisable;
typedef void (APIENTRY * PFNglGetFloatv) (GLenum pname, GLfloat *params); typedef void (APIENTRY * PFNglGetFloatv) (GLenum pname, GLfloat *params);
static PFNglGetFloatv pglGetFloatv; static PFNglGetFloatv pglGetFloatv;
typedef void (APIENTRY * PFNglPolygonMode) (GLenum, GLenum);
static PFNglPolygonMode pglPolygonMode;
/* Depth Buffer */ /* Depth Buffer */
typedef void (APIENTRY * PFNglClearDepth) (GLclampd depth); typedef void (APIENTRY * PFNglClearDepth) (GLclampd depth);
@@ -549,6 +551,7 @@ boolean SetupGLfunc(void)
GETOPENGLFUNC(pglGetFloatv, glGetFloatv) GETOPENGLFUNC(pglGetFloatv, glGetFloatv)
GETOPENGLFUNC(pglGetIntegerv, glGetIntegerv) GETOPENGLFUNC(pglGetIntegerv, glGetIntegerv)
GETOPENGLFUNC(pglGetString, glGetString) GETOPENGLFUNC(pglGetString, glGetString)
GETOPENGLFUNC(pglPolygonMode, glPolygonMode)
GETOPENGLFUNC(pglClearDepth, glClearDepth) GETOPENGLFUNC(pglClearDepth, glClearDepth)
GETOPENGLFUNC(pglDepthFunc, glDepthFunc) GETOPENGLFUNC(pglDepthFunc, glDepthFunc)
@@ -2364,6 +2367,10 @@ void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value)
GL_Flush(); //??? if we want to change filter mode by texture, remove this GL_Flush(); //??? if we want to change filter mode by texture, remove this
break; break;
case HWD_SET_WIREFRAME:
pglPolygonMode(GL_FRONT_AND_BACK, Value ? GL_LINE : GL_FILL);
break;
case HWD_SET_TEXTURE_FORMAT: case HWD_SET_TEXTURE_FORMAT:
gltexformat = (Value == 32) ? GL_RGBA : GL_RGB5_A1; gltexformat = (Value == 32) ? GL_RGBA : GL_RGB5_A1;
GL_Flush(); GL_Flush();
-2
View File
@@ -259,8 +259,6 @@ INT32 HU_FallBackFrSpecialLetter(INT32 key)
} }
} }
static char cechotext[1024]; static char cechotext[1024];
static tic_t cechotimer = 0; static tic_t cechotimer = 0;
static tic_t cechoduration = 5*TICRATE; static tic_t cechoduration = 5*TICRATE;
+4 -16
View File
@@ -1260,15 +1260,10 @@ extern int lib_hudadd(lua_State *L);
static int lib_hudsetvotebackground(lua_State *L) static int lib_hudsetvotebackground(lua_State *L)
{ {
memset(VoteScreen.luaPrefix, 0, sizeof(VoteScreen.luaPrefix));
if (lua_isnoneornil(L, 1)) if (lua_isnoneornil(L, 1))
{ {
if (luaVoteScreen)
{
free(luaVoteScreen);
}
luaVoteScreen = NULL;
return 0; return 0;
} }
@@ -1279,15 +1274,8 @@ static int lib_hudsetvotebackground(lua_State *L)
return luaL_argerror(L, 1, "prefix should 4 characters wide"); return luaL_argerror(L, 1, "prefix should 4 characters wide");
} }
if (!luaVoteScreen) strncpy(VoteScreen.luaPrefix, prefix, 4);
{ strupr(VoteScreen.luaPrefix);
luaVoteScreen = (char*)malloc(5);
luaVoteScreen[4] = 0;
}
strncpy(luaVoteScreen, prefix, 4);
strupr(luaVoteScreen);
return 0; return 0;
} }
+35 -17
View File
@@ -7167,8 +7167,11 @@ static void DrawReplayHutReplayInfo(void)
if (mapheaderinfo[demolist[dir_on[menudepthleft]].map-1]) if (mapheaderinfo[demolist[dir_on[menudepthleft]].map-1])
{ {
char *title = G_BuildMapTitle(demolist[dir_on[menudepthleft]].map); char *title = G_BuildMapTitle(demolist[dir_on[menudepthleft]].map);
V_DrawString(x, y, V_SNAPTOTOP|MENUCAPS, title); if (title)
Z_Free(title); {
V_DrawString(x, y, V_SNAPTOTOP|MENUCAPS, title);
Z_Free(title);
}
} }
else else
V_DrawString(x, y, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT, "Level is not loaded."); V_DrawString(x, y, V_SNAPTOTOP|V_ALLOWLOWERCASE|V_TRANSLUCENT, "Level is not loaded.");
@@ -8120,6 +8123,9 @@ UINT8 skyRoomMenuTranslations[MAXUNLOCKABLES];
static char *M_GetConditionString(condition_t cond) static char *M_GetConditionString(condition_t cond)
{ {
char *title = NULL;
char *response = NULL;
switch(cond.type) switch(cond.type)
{ {
case UC_PLAYTIME: case UC_PLAYTIME:
@@ -8146,33 +8152,45 @@ static char *M_GetConditionString(condition_t cond)
G_TicsToSeconds(cond.requirement)); G_TicsToSeconds(cond.requirement));
case UC_MAPVISITED: case UC_MAPVISITED:
{ {
char *title = G_BuildMapTitle(cond.requirement-1); title = G_BuildMapTitle(cond.requirement-1);
char *response = va("Visit %s", title); if (title)
Z_Free(title); {
response = va("Visit %s", title);
Z_Free(title);
}
return response; return response;
} }
case UC_MAPBEATEN: case UC_MAPBEATEN:
{ {
char *title = G_BuildMapTitle(cond.requirement-1); title = G_BuildMapTitle(cond.requirement-1);
char *response = va("Beat %s", title); if (title)
Z_Free(title); {
response = va("Beat %s", title);
Z_Free(title);
}
return response; return response;
} }
case UC_MAPALLEMERALDS: case UC_MAPALLEMERALDS:
{ {
char *title = G_BuildMapTitle(cond.requirement-1); title = G_BuildMapTitle(cond.requirement-1);
char *response = va("Beat %s w/ all emeralds", title); if (title)
Z_Free(title); {
response = va("Beat %s w/ all emeralds", title);
Z_Free(title);
}
return response; return response;
} }
case UC_MAPTIME: case UC_MAPTIME:
{ {
char *title = G_BuildMapTitle(cond.extrainfo1-1); title = G_BuildMapTitle(cond.extrainfo1-1);
char *response = va("Beat %s in %i:%02i.%02i", title, if (title)
G_TicsToMinutes(cond.requirement, true), {
G_TicsToSeconds(cond.requirement), response = va("Beat %s in %i:%02i.%02i", title,
G_TicsToCentiseconds(cond.requirement)); G_TicsToMinutes(cond.requirement, true),
Z_Free(title); G_TicsToSeconds(cond.requirement),
G_TicsToCentiseconds(cond.requirement));
Z_Free(title);
}
return response; return response;
} }
case UC_TOTALEMBLEMS: case UC_TOTALEMBLEMS:
-6
View File
@@ -26,12 +26,6 @@
#if defined (STDC_HEADERS) || defined (_LIBC) #if defined (STDC_HEADERS) || defined (_LIBC)
#include <stdlib.h> #include <stdlib.h>
#else
#ifndef HAVE_MEMCPY
#if !(defined (_WIN32) && !defined (__CYGWIN__)) && !defined (__APPLE__)
#define memcpy(d, s, n) bcopy ((s), (d), (n))
#endif
#endif
#endif #endif
#include "md5.h" #include "md5.h"
+143 -114
View File
@@ -67,6 +67,8 @@
#include "lua_script.h" #include "lua_script.h"
#include "lua_hook.h" #include "lua_hook.h"
#include "y_inter.h"
#if !defined (UNDER_CE) #if !defined (UNDER_CE)
#include <time.h> #include <time.h>
#endif #endif
@@ -2868,12 +2870,9 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
F_WipeStartScreen(); F_WipeStartScreen();
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol);
F_WipeEndScreen(); F_WipeEndScreen();
F_RunWipe(wipedefs[(encoremode ? wipe_level_final : wipe_level_toblack)], false);
}
else //dedicated servers
{
F_RunWipe(wipedefs[(encoremode ? wipe_level_final : wipe_level_toblack)], false);
} }
F_RunWipe(wipedefs[(encoremode ? wipe_level_final : wipe_level_toblack)], false);
} }
// Reset the palette now all fades have been done // Reset the palette now all fades have been done
@@ -3109,11 +3108,128 @@ boolean P_AddWadFile(const char *wadfilename, boolean local)
return true; return true;
} }
// check for replacement votescreen backgrounds static size_t sreplaces = 0, mreplaces = 0, digmreplaces = 0;
boolean wideracereplaced = false;
boolean racereplaced = false; //
boolean widebattlereplaced = false; // search for sound replacements
boolean battlereplaced = false; //
static boolean P_CheckSoundReplacements(UINT16 wadnum, char *name, size_t i)
{
size_t j;
lumpnum_t lumpnum = (i|(wadnum<<16));
if (name[0] == 'D')
{
if (name[1] == 'S')
{
for (j = 1; j < NUMSFX; j++)
{
if (S_sfx[j].name && !strnicmp(S_sfx[j].name, name + 2, 6)
&& (S_sfx[j].lumpnum != lumpnum) && (S_sfx[j].lumpnum != LUMPERROR))
{
// the sound will be reloaded when needed,
// since sfx->data will be NULL
CONS_Debug(DBG_SETUP, "Sound %.8s replaced\n", name);
I_FreeSfx(&S_sfx[j]);
// Re-cache it
if (S_PrecacheSound())
S_sfx[j].data = I_GetSfx(&S_sfx[j]);
sreplaces++;
return true;
}
}
}
else if (name[1] == '_')
{
CONS_Debug(DBG_SETUP, "Music %.8s ignored\n", name);
mreplaces++;
return true;
}
}
else if (name[0] == 'O' && name[1] == '_')
{
CONS_Debug(DBG_SETUP, "Music %.8s replaced\n", name);
digmreplaces++;
return true;
}
return false;
}
//
// search for maps
//
static boolean P_CheckMapReplacements(char *name)
{
if (memcmp(name, "MAP", 3) == 0) // Ignore the headers
{
INT16 num;
if (name[5] != '\0')
return false;
num = (INT16)M_MapNumber(name[3], name[4]);
// we want to record whether this map exists. if it doesn't have a header, we can assume it's not relephant
if (num <= NUMMAPS && mapheaderinfo[num-1])
{
if (mapheaderinfo[num-1]->menuflags & LF2_EXISTSHACK)
G_SetGameModified(multiplayer, true); // oops, double-defined - no record attack privileges for you
mapheaderinfo[num-1]->menuflags |= LF2_EXISTSHACK;
}
if (num == gamemap)
partadd_replacescurrentmap = true;
CONS_Printf("%s\n", name);
return true;
}
return false;
}
//
// check for non Lua votescreen replacements
//
static boolean P_CheckVoteReplacements(char *name)
{
// widescreen patch Race
if (!VoteScreen.replaced.widerace && !memcmp(name, "INTERSCW", 8))
{
VoteScreen.replaced.widerace = true;
return false;
}
if (!VoteScreen.replaced.race && !memcmp(name, "INTERSCR", 8))
{
VoteScreen.replaced.race = true;
return false;
}
// widescreen patch Battle
if (!VoteScreen.replaced.widebattle && !memcmp(name, "BATTLSCW", 8))
{
VoteScreen.replaced.widebattle = true;
return false;
}
if (!VoteScreen.replaced.battle && !memcmp(name, "BATTLSCR", 8))
{
VoteScreen.replaced.battle = true;
return false;
}
if (VoteScreen.replaced.widerace && VoteScreen.replaced.race
&& VoteScreen.replaced.widebattle && VoteScreen.replaced.battle)
{
return true;
}
return false;
}
// //
// Add a WAD file and do the per-WAD setup stages. // Add a WAD file and do the per-WAD setup stages.
@@ -3121,12 +3237,15 @@ boolean battlereplaced = false;
// //
UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local) UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
{ {
size_t i, j, sreplaces = 0, mreplaces = 0, digmreplaces = 0; size_t i;
UINT16 numlumps, wadnum; UINT16 numlumps, wadnum;
char *name; char *name;
boolean mapsadded = false; boolean mapsadded = false;
static boolean allvotereplaced = false;
lumpinfo_t *lumpinfo; lumpinfo_t *lumpinfo;
sreplaces = mreplaces = digmreplaces = 0;
if ((numlumps = W_InitFile(wadfilename, local)) == INT16_MAX) if ((numlumps = W_InitFile(wadfilename, local)) == INT16_MAX)
{ {
refreshdirmenu |= REFRESHDIR_NOTLOADED; refreshdirmenu |= REFRESHDIR_NOTLOADED;
@@ -3141,46 +3260,24 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
wadfiles[wadnum]->localfile = local; wadfiles[wadnum]->localfile = local;
//
// search for sound replacements
//
lumpinfo = wadfiles[wadnum]->lumpinfo; lumpinfo = wadfiles[wadnum]->lumpinfo;
for (i = 0; i < numlumps; i++, lumpinfo++) for (i = 0; i < numlumps; i++, lumpinfo++)
{ {
name = lumpinfo->name; name = lumpinfo->name;
lumpnum_t lumpnum = i|(wadnum<<16);
if (name[0] == 'D') if (P_CheckSoundReplacements(wadnum, name, i))
continue;
if (P_CheckMapReplacements(name))
{ {
if (name[1] == 'S') for (j = 1; j < NUMSFX; j++) mapsadded = true;
{ continue;
if (S_sfx[j].name && !strnicmp(S_sfx[j].name, name + 2, 6) && S_sfx[j].lumpnum != lumpnum && S_sfx[j].lumpnum != LUMPERROR)
{
// the sound will be reloaded when needed,
// since sfx->data will be NULL
CONS_Debug(DBG_SETUP, "Sound %.8s replaced\n", name);
I_FreeSfx(&S_sfx[j]);
// Re-cache it
if (S_PrecacheSound())
S_sfx[j].data = I_GetSfx(&S_sfx[j]);
sreplaces++;
}
}
else if (name[1] == '_')
{
CONS_Debug(DBG_SETUP, "Music %.8s ignored\n", name);
mreplaces++;
}
}
else if (name[0] == 'O' && name[1] == '_')
{
CONS_Debug(DBG_SETUP, "Music %.8s replaced\n", name);
digmreplaces++;
} }
if (!allvotereplaced && P_CheckVoteReplacements(name))
allvotereplaced = true;
} }
if (!devparm && sreplaces) if (!devparm && sreplaces)
CONS_Printf(M_GetText("%s sounds replaced\n"), sizeu1(sreplaces)); CONS_Printf(M_GetText("%s sounds replaced\n"), sizeu1(sreplaces));
if (!devparm && mreplaces) if (!devparm && mreplaces)
@@ -3188,6 +3285,9 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
if (!devparm && digmreplaces) if (!devparm && digmreplaces)
CONS_Printf(M_GetText("%s digital musics replaced\n"), sizeu1(digmreplaces)); CONS_Printf(M_GetText("%s digital musics replaced\n"), sizeu1(digmreplaces));
if (!mapsadded)
CONS_Printf(M_GetText("No maps added\n"));
// //
// search for sprite replacements // search for sprite replacements
// //
@@ -3212,80 +3312,9 @@ UINT16 P_PartialAddWadFile(const char *wadfilename, boolean local)
// //
S_LoadMusicDefs(wadnum); S_LoadMusicDefs(wadnum);
//
// search for maps
//
lumpinfo = wadfiles[wadnum]->lumpinfo;
for (i = 0; i < numlumps; i++, lumpinfo++)
{
name = lumpinfo->name;
if (name[0] == 'M' && name[1] == 'A' && name[2] == 'P') // Ignore the headers
{
INT16 num;
if (name[5]!='\0')
continue;
num = (INT16)M_MapNumber(name[3], name[4]);
// we want to record whether this map exists. if it doesn't have a header, we can assume it's not relephant
if (num <= NUMMAPS && mapheaderinfo[num-1])
{
if (mapheaderinfo[num-1]->menuflags & LF2_EXISTSHACK)
G_SetGameModified(multiplayer, true); // oops, double-defined - no record attack privileges for you
mapheaderinfo[num-1]->menuflags |= LF2_EXISTSHACK;
}
if (num == gamemap)
partadd_replacescurrentmap = true;
CONS_Printf("%s\n", name);
mapsadded = true;
}
}
if (!mapsadded)
CONS_Printf(M_GetText("No maps added\n"));
// TODO: Experimental SPRTINFO support, test first // TODO: Experimental SPRTINFO support, test first
R_LoadSpriteInfoLumps(wadnum, wadfiles[wadnum]->numlumps); R_LoadSpriteInfoLumps(wadnum, wadfiles[wadnum]->numlumps);
//
// check for votescreen replacements
//
if (!wideracereplaced && !racereplaced && !widebattlereplaced && !battlereplaced)
{
lumpinfo = wadfiles[wadnum]->lumpinfo;
for (i = 0; i < numlumps; i++, lumpinfo++)
{
name = lumpinfo->name;
// widescreen patch Race
if (!wideracereplaced && !strncmp(name, "INTERSCW", 8))
{
wideracereplaced = true;
continue;
}
if (!racereplaced && !strncmp(name, "INTERSCR", 8))
{
racereplaced = true;
continue;
}
// widescreen patch Battle
if (!widebattlereplaced && !strncmp(name, "BATTLSCW", 8))
{
widebattlereplaced = true;
continue;
}
if (!battlereplaced && !strncmp(name, "BATTLSCR", 8))
{
battlereplaced = true;
continue;
}
}
}
refreshdirmenu &= ~REFRESHDIR_GAMEDATA; // Under usual circumstances we'd wait for REFRESHDIR_GAMEDATA to disappear the next frame, but it's a bit too dangerous for that... refreshdirmenu &= ~REFRESHDIR_GAMEDATA; // Under usual circumstances we'd wait for REFRESHDIR_GAMEDATA to disappear the next frame, but it's a bit too dangerous for that...
partadd_stage = 0; partadd_stage = 0;
return wadnum; return wadnum;
-5
View File
@@ -68,11 +68,6 @@ void HWR_LoadLevel(boolean reloadinggamestate);
boolean P_AddWadFile(const char *wadfilename, boolean local); boolean P_AddWadFile(const char *wadfilename, boolean local);
extern boolean wideracereplaced;
extern boolean racereplaced;
extern boolean widebattlereplaced;
extern boolean battlereplaced;
// WARNING: The following functions should be grouped as follows: // WARNING: The following functions should be grouped as follows:
// any amount of PartialAdds followed by MultiSetups until returned true, // any amount of PartialAdds followed by MultiSetups until returned true,
// as soon as possible. // as soon as possible.
+1 -1
View File
@@ -668,7 +668,7 @@ typedef struct
INT16 height; INT16 height;
INT16 leftoffset; // pixels to the left of origin INT16 leftoffset; // pixels to the left of origin
INT16 topoffset; // pixels below the origin INT16 topoffset; // pixels below the origin
INT32 columnofs[8]; // only [width] used INT32 columnofs[]; // only [width] used
// the [0] is &columnofs[width] // the [0] is &columnofs[width]
} ATTRPACK softwarepatch_t; } ATTRPACK softwarepatch_t;
+7 -6
View File
@@ -125,16 +125,17 @@ static CV_PossibleValue_t drawdist_cons_t[] = {
{8192, "8192"}, {12288, "12288"}, {20480, "20480"}, {8192, "8192"}, {12288, "12288"}, {20480, "20480"},
{24576, "24576"},{0, "Infinite"}, {0, NULL}}; {24576, "24576"},{0, "Infinite"}, {0, NULL}};
#if defined(__x86_64__) || defined(__amd64__) || defined(__aarch64__) || defined(__arm64__) // only for 64bit (idk how else to proper check lmao) #if __SIZEOF_POINTER__ < 8 // only for 64bit
static CV_PossibleValue_t drawdist_precip_cons_t[] = { static CV_PossibleValue_t drawdist_precip_cons_t[] = {
{256, "256"}, {512, "512"}, {768, "768"}, {256, "256"}, {512, "512"}, {768, "768"},
{1024, "1024"}, {1536, "1536"}, {2048, "2048"}, {1024, "1024"}, {1536, "1536"}, {2048, "2048"},
{3072, "3072"}, {4096, "4096"}, {0, "None"}, {0, NULL}}; {0, "None"}, {0, NULL}};
#else #else
static CV_PossibleValue_t drawdist_precip_cons_t[] = { static CV_PossibleValue_t drawdist_precip_cons_t[] = {
{256, "256"}, {512, "512"}, {768, "768"}, {256, "256"}, {512, "512"}, {768, "768"},
{1024, "1024"}, {1536, "1536"}, {2048, "2048"}, {1024, "1024"}, {1536, "1536"}, {2048, "2048"},
{0, "None"}, {0, NULL}}; {3072, "3072"}, {4096, "4096"}, {0, "None"}, {0, NULL}};
#endif #endif
static CV_PossibleValue_t maxinterpdist_cons_t[] = { static CV_PossibleValue_t maxinterpdist_cons_t[] = {
+6 -3
View File
@@ -2042,9 +2042,12 @@ static boolean S_SkipIntroMusic(void)
char *maptitle = G_BuildMapTitle(gamemap); // Zzz... char *maptitle = G_BuildMapTitle(gamemap); // Zzz...
// check if menu music is playing, otherwise it may continue playing if (maptitle)
if (!stricmp(music.name, "titles") || (maptitle && (!stricmp(maptitle, "Wandering Falls")))) // wandering balls changes its song when the race starts Zzz... {
skip = false; // check if menu music is playing, otherwise it may continue playing
if (!stricmp(music.name, "titles") || (maptitle && (!stricmp(maptitle, "Wandering Falls")))) // wandering balls changes its song when the race starts Zzz...
skip = false;
}
Z_Free(maptitle); Z_Free(maptitle);
+13 -3
View File
@@ -213,10 +213,20 @@ void I_StartupSound(void)
// call to start audio failed -- we do not have it // call to start audio failed -- we do not have it
return; return;
} }
SDL_version SDLmixcompiled;
const SDL_version *SDLmixlinked;
SDL_MIXER_VERSION(&SDLmixcompiled)
SDLmixlinked = Mix_Linked_Version();
I_OutputMsg("Compiled for SDL_mixer version: %d.%d.%d\n",
SDLmixcompiled.major, SDLmixcompiled.minor, SDLmixcompiled.patch);
I_OutputMsg("Linked with SDL_mixer version: %d.%d.%d\n",
SDLmixlinked->major, SDLmixlinked->minor, SDLmixlinked->patch);
#ifdef HAVE_OPENMPT #ifdef HAVE_OPENMPT
CONS_Printf("libopenmpt version: %s\n", openmpt_get_string("library_version")); I_OutputMsg("libopenmpt version: %s\n", openmpt_get_string("library_version"));
CONS_Printf("libopenmpt build date: %s\n", openmpt_get_string("build")); I_OutputMsg("libopenmpt build date: %s\n", openmpt_get_string("build"));
#endif #endif
sound_started = true; sound_started = true;
+1 -1
View File
@@ -187,7 +187,7 @@ void ST_doPaletteStuff(void)
#ifdef HWRENDER #ifdef HWRENDER
if (rendermode == render_opengl && !HWR_PalRenderFlashpal()) if (rendermode == render_opengl && !HWR_PalRenderFlashpal())
palette = 0; // No flashpals here in OpenGL palette = 0; // Don't set the palette to a flashpal in OpenGL's truecolor mode
#endif #endif
palette = min(max(palette, 0), 13); palette = min(max(palette, 0), 13);
+3
View File
@@ -457,6 +457,9 @@ static void LoadPalette(const char *lumpname)
#endif #endif
pLocalPalette[i].s.alpha = 0xFF; pLocalPalette[i].s.alpha = 0xFF;
if (!Cubeapply)
continue;
// lerp of colour cubing! if you want, make it smoother yourself // lerp of colour cubing! if you want, make it smoother yourself
V_CubeApply(&pLocalPalette[i].s.red, &pLocalPalette[i].s.green, &pLocalPalette[i].s.blue); V_CubeApply(&pLocalPalette[i].s.red, &pLocalPalette[i].s.green, &pLocalPalette[i].s.blue);
} }
+145 -133
View File
@@ -57,30 +57,15 @@ typedef struct
static y_data_t data; static y_data_t data;
// graphics // graphics
static patch_t *bgpatch = NULL; // INTERSCR
static patch_t *widebgpatch = NULL; // INTERSCW
static patch_t *bgtile = NULL; // SPECTILE/SRB2BACK static patch_t *bgtile = NULL; // SPECTILE/SRB2BACK
static INT32 timer; static INT32 timer;
static INT32 intertic; static INT32 intertic;
static INT32 endtic = -1; static INT32 endtic = -1;
static INT32 sorttic = -1; static INT32 sorttic = -1;
patch_t *animVoteFramesPatches = NULL;
// VEXTRN - Vote (V) Extra (EXT) Race (R) Normal (N - Normal sized patch)
// VEXTBN - Vote (V) Extra (EXT) Battle (B) Normal (N - Normal sized patch)
// VEXTBW - Vote (V) Extra (EXT) Battle (B) Normal (W - Wide patch used in software)
// VEXTRW - Vote (V) Extra (EXT) Race (R) Normal (W - Wide patch used in software)
char animPrefix[] = "INTSC";
char animWidePrefix[] = "INTSW";
char *luaVoteScreen = NULL;
INT32 currentAnimFrame = 0;
static INT32 foundAnimVoteFrames = 0;
static INT32 foundAnimVoteWideFrames = 0;
intertype_t intertype = int_none; intertype_t intertype = int_none;
static huddrawlist_h luahuddrawlist_intermission = NULL; static huddrawlist_h luahuddrawlist_intermission = NULL;
@@ -118,17 +103,13 @@ typedef struct
boolean loaded; boolean loaded;
} y_voteclient; } y_voteclient;
// votescreen stuff
votescreen_t VoteScreen = {0};
static y_votelvlinfo levelinfo[5]; static y_votelvlinfo levelinfo[5];
static y_voteclient voteclient; static y_voteclient voteclient;
static INT32 votetic; static INT32 votetic;
static INT32 voteendtic = -1; static INT32 voteendtic = -1;
static patch_t *cursor = NULL;
static patch_t *cursor1 = NULL;
static patch_t *cursor2 = NULL;
static patch_t *cursor3 = NULL;
static patch_t *cursor4 = NULL;
static patch_t *randomlvl = NULL;
static patch_t *rubyicon = NULL;
static void Y_UnloadVoteData(void); static void Y_UnloadVoteData(void);
@@ -287,49 +268,6 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
} }
} }
//
// Y_AnimatedVoteScreenCheck
//
// Check if the lumps exist (checking for VEXTR(N|W)xx for race and VEXTRB(N|W)xx for battle)
static void Y_AnimatedVoteScreenCheck(void)
{
char tmpPrefix[] = "INTS";
if (luaVoteScreen)
strncpy(tmpPrefix, luaVoteScreen, 4);
else if (G_BattleGametype())
strcpy(tmpPrefix, "BTLS");
strncpy(animPrefix, tmpPrefix, 4);
animPrefix[4] = 'C';
strncpy(animWidePrefix, tmpPrefix, 4);
animWidePrefix[4] = 'W';
foundAnimVoteFrames = foundAnimVoteWideFrames = 0;
currentAnimFrame = 0;
INT32 i = 1;
for (;;)
{
boolean normalLumpExists = W_LumpExists(va("%sC%d", tmpPrefix, i));
boolean wideLumpExists = W_LumpExists(va("%sW%d", tmpPrefix, i));
if (normalLumpExists || wideLumpExists)
{
if (normalLumpExists)
foundAnimVoteFrames++;
if (wideLumpExists)
foundAnimVoteWideFrames++;
}
else // If we don't find at least frame 1 (e.g VEXTRN1), let's just stop looking
break;
i++;
}
}
// Y_PlayerStandingsDrawer // Y_PlayerStandingsDrawer
// //
// Handles drawing the center-of-screen player standings. // Handles drawing the center-of-screen player standings.
@@ -863,7 +801,8 @@ void Y_StartIntermission(void)
// //
void Y_EndIntermission(void) void Y_EndIntermission(void)
{ {
Y_UnloadData(); if (!dedicated)
Y_UnloadData();
endtic = -1; endtic = -1;
sorttic = -1; sorttic = -1;
@@ -881,28 +820,72 @@ static void Y_FollowIntermission(void)
G_AfterIntermission(); G_AfterIntermission();
} }
#define UNLOAD(x) if (x) {Patch_Free(x);} x = NULL; #define UNLOAD(x) {if ((x) != NULL) {Patch_Free(x);} x = NULL;}
// //
// Y_UnloadData // Y_UnloadData
// //
static void Y_UnloadData(void) static void Y_UnloadData(void)
{ {
// In hardware mode, don't Z_ChangeTag a pointer returned by W_CachePatchName().
// It doesn't work and is unnecessary.
if (rendermode != render_soft)
return;
// unload the background patches // unload the background patches
UNLOAD(bgpatch); UNLOAD(VoteScreen.bgpatch);
UNLOAD(widebgpatch); UNLOAD(VoteScreen.widebgpatch);
UNLOAD(bgtile); UNLOAD(bgtile);
//UNLOAD(interpic); //UNLOAD(interpic);
} }
// SRB2Kart: Voting! // SRB2Kart: Voting!
static void Y_DrawVoteBackground(patch_t *patch) //
// Y_VoteScreenCheck
//
static void Y_VoteScreenCheck(void)
{
strcpy(VoteScreen.Prefix, "INTS");
if (VoteScreen.luaPrefix[0] != 0)
strlcpy(VoteScreen.Prefix, VoteScreen.luaPrefix, sizeof(VoteScreen.Prefix));
else if (G_BattleGametype())
strcpy(VoteScreen.Prefix, "BTLS");
VoteScreen.foundLuaVoteFrames = VoteScreen.foundLuaVoteWideFrames = 0;
VoteScreen.currentAnimFrame = 0;
INT32 i = 1;
// check for lua vote background replacements
for (;;)
{
// Check if the lumps exist (checking for VEXTR(N|W)xx for race and VEXTRB(N|W)xx for battle)
boolean normalLumpExists = W_LumpExists(va("%sC%d", VoteScreen.Prefix, i));
boolean wideLumpExists = W_LumpExists(va("%sW%d", VoteScreen.Prefix, i));
if (normalLumpExists || wideLumpExists)
{
if (normalLumpExists)
VoteScreen.foundLuaVoteFrames++;
if (wideLumpExists)
VoteScreen.foundLuaVoteWideFrames++;
}
else // If we don't find at least frame 1 (e.g VEXTRN1), let's just stop looking
break;
i++;
}
// non lua vote background handling
boolean prefbattletype = ((votelevels[0][1] & ~0x80) == GT_MATCH);
VoteScreen.widebgpatch = W_CachePatchName((prefbattletype ? "BATTLSCW" : "INTERSCW"), PU_PATCH);
VoteScreen.bgpatch = W_CachePatchName((prefbattletype ? "BATTLSCR" : "INTERSCR"), PU_PATCH);
}
//
// Y_VoteBackgroundDrawer
//
// Determines which patch drawer to use for scaling
//
static void Y_VoteBackgroundDrawer(patch_t *patch)
{ {
switch (cv_votebgscaling.value) switch (cv_votebgscaling.value)
{ {
@@ -924,57 +907,74 @@ static void Y_DrawVoteBackground(patch_t *patch)
} }
} }
// Y_DrawAnimatedVoteScreenPatch
// //
// Draw animated patch based on frame counter on vote screen // Y_DrawLuaVoteScreenPatch
// //
static void Y_DrawAnimatedVoteScreenPatch(boolean widePatch) // Handles votebackgrounds set by "setVoteBackground"
// Aswell as animated patches
//
static void Y_DrawLuaVoteScreenPatch(boolean widePatch)
{ {
INT32 nextframe = 0; INT32 nextframe = 0;
patch_t *votebg = NULL; patch_t *votebg = NULL;
char tempAnimPrefix[7]; char tempPrefix[6];
const INT32 tempFoundAnimVoteFrames = ((widePatch ? foundAnimVoteWideFrames : foundAnimVoteFrames) - 1); const INT32 tempfoundAnimLuaVoteFrames = ((widePatch ? VoteScreen.foundLuaVoteWideFrames : VoteScreen.foundLuaVoteFrames) - 1);
strcpy(tempAnimPrefix, (widePatch ? animWidePrefix : animPrefix)); strcpy(tempPrefix, va("%s%s", VoteScreen.Prefix, (widePatch ? "W" : "C")));
// Draw non animated patch
if (!tempfoundAnimLuaVoteFrames)
{
votebg = W_CachePatchName(va("%s1", tempPrefix), PU_PATCH);
Y_VoteBackgroundDrawer(votebg);
return;
}
// Draw animated patch based on frame counter on vote screen
// Just in case someone provides LESS widescreen frames than normal frames or vice versa, reset the frame counter to 0 // Just in case someone provides LESS widescreen frames than normal frames or vice versa, reset the frame counter to 0
if (currentAnimFrame > tempFoundAnimVoteFrames) if (VoteScreen.currentAnimFrame > tempfoundAnimLuaVoteFrames)
currentAnimFrame = 0; VoteScreen.currentAnimFrame = 0;
nextframe = (currentAnimFrame + 1); nextframe = (VoteScreen.currentAnimFrame + 1);
votebg = W_CachePatchName(va("%s%d", (widePatch ? animWidePrefix : animPrefix), nextframe), PU_PATCH); votebg = W_CachePatchName(va("%s%d", tempPrefix, nextframe), PU_PATCH);
Y_DrawVoteBackground(votebg); Y_VoteBackgroundDrawer(votebg);
if (renderisnewtic && (votetic % 2 == 0) && !paused) if (renderisnewtic && (votetic % 2 == 0) && !paused)
currentAnimFrame = (nextframe > tempFoundAnimVoteFrames) ? 0 : nextframe; VoteScreen.currentAnimFrame = (nextframe > tempfoundAnimLuaVoteFrames) ? 0 : nextframe;
} }
//
// Y_DrawVoteScreenPatch
//
static void Y_DrawVoteScreenPatch(void) static void Y_DrawVoteScreenPatch(void)
{ {
patch_t *votebg = NULL; patch_t *votebg = NULL;
const boolean widescreen = (vid.width / vid.dupx > 320); const boolean widescreen = (vid.width / vid.dupx > 320);
if (foundAnimVoteWideFrames || foundAnimVoteFrames) if (VoteScreen.foundLuaVoteWideFrames || VoteScreen.foundLuaVoteFrames)
{ {
Y_DrawAnimatedVoteScreenPatch((foundAnimVoteWideFrames && widescreen)); Y_DrawLuaVoteScreenPatch(((widescreen && VoteScreen.foundLuaVoteWideFrames) || !VoteScreen.foundLuaVoteFrames));
return; return;
} }
votebg = bgpatch; // non widescreen patch // non widescreen patch
votebg = VoteScreen.bgpatch;
UINT8 prefgametype = (votelevels[0][1] & ~0x80); UINT8 prefgametype = (votelevels[0][1] & ~0x80);
const boolean widebgreplaced = (prefgametype == GT_MATCH) ? widebattlereplaced : wideracereplaced; const boolean widebgreplaced = (prefgametype == GT_MATCH) ? VoteScreen.replaced.widebattle : VoteScreen.replaced.widerace;
const boolean bgreplaced = (prefgametype == GT_MATCH) ? battlereplaced : racereplaced; const boolean bgreplaced = (prefgametype == GT_MATCH) ? VoteScreen.replaced.battle : VoteScreen.replaced.race;
// we check a bunch of stuff to always have a "valid" fallback
if ((widescreen && (widebgreplaced || !bgreplaced)) if ((widescreen && (widebgreplaced || !bgreplaced))
|| (!widescreen && (widebgreplaced && !bgreplaced))) || (!widescreen && (widebgreplaced && !bgreplaced)))
{ {
votebg = widebgpatch; votebg = VoteScreen.widebgpatch; // widescreen patch
} }
Y_DrawVoteBackground(votebg); Y_VoteBackgroundDrawer(votebg);
} }
// //
@@ -1037,7 +1037,7 @@ void Y_VoteDrawer(void)
if (i == 3) if (i == 3)
{ {
str = "RANDOM"; str = "RANDOM";
pic = randomlvl; pic = VoteScreen.randomlvl;
} }
else else
{ {
@@ -1061,7 +1061,7 @@ void Y_VoteDrawer(void)
if (!splitscreen) if (!splitscreen)
{ {
thiscurs = cursor; thiscurs = VoteScreen.cursor[0];
p = consoleplayer; p = consoleplayer;
color = levelinfo[i].gtc; color = levelinfo[i].gtc;
colormap = NULL; colormap = NULL;
@@ -1071,19 +1071,19 @@ void Y_VoteDrawer(void)
switch (j) switch (j)
{ {
case 1: case 1:
thiscurs = cursor2; thiscurs = VoteScreen.cursor[2];
p = displayplayers[1]; p = displayplayers[1];
break; break;
case 2: case 2:
thiscurs = cursor3; thiscurs = VoteScreen.cursor[3];
p = displayplayers[2]; p = displayplayers[2];
break; break;
case 3: case 3:
thiscurs = cursor4; thiscurs = VoteScreen.cursor[4];
p = displayplayers[3]; p = displayplayers[3];
break; break;
default: default:
thiscurs = cursor1; thiscurs = VoteScreen.cursor[1];
p = displayplayers[0]; p = displayplayers[0];
break; break;
} }
@@ -1111,7 +1111,7 @@ void Y_VoteDrawer(void)
else else
{ {
V_DrawFixedPatch((BASEVIDWIDTH-20)<<FRACBITS, (y)<<FRACBITS, FRACUNIT/2, V_FLIP|V_SNAPTORIGHT, pic, 0); V_DrawFixedPatch((BASEVIDWIDTH-20)<<FRACBITS, (y)<<FRACBITS, FRACUNIT/2, V_FLIP|V_SNAPTORIGHT, pic, 0);
V_DrawFixedPatch((BASEVIDWIDTH-60)<<FRACBITS, ((y+25)<<FRACBITS) - (rubyheight<<1), FRACUNIT, V_SNAPTORIGHT, rubyicon, NULL); V_DrawFixedPatch((BASEVIDWIDTH-60)<<FRACBITS, ((y+25)<<FRACBITS) - (rubyheight<<1), FRACUNIT, V_SNAPTORIGHT, VoteScreen.rubyicon, NULL);
} }
V_DrawRightAlignedThinString(BASEVIDWIDTH-21, 40+y, V_SNAPTORIGHT|V_6WIDTHSPACE, str); V_DrawRightAlignedThinString(BASEVIDWIDTH-21, 40+y, V_SNAPTORIGHT|V_6WIDTHSPACE, str);
@@ -1135,7 +1135,7 @@ void Y_VoteDrawer(void)
else else
{ {
V_DrawFixedPatch((BASEVIDWIDTH-20)<<FRACBITS, y<<FRACBITS, FRACUNIT/4, V_FLIP|V_SNAPTORIGHT, pic, 0); V_DrawFixedPatch((BASEVIDWIDTH-20)<<FRACBITS, y<<FRACBITS, FRACUNIT/4, V_FLIP|V_SNAPTORIGHT, pic, 0);
V_DrawFixedPatch((BASEVIDWIDTH-40)<<FRACBITS, (y<<FRACBITS) + (25<<(FRACBITS-1)) - rubyheight, FRACUNIT/2, V_SNAPTORIGHT, rubyicon, NULL); V_DrawFixedPatch((BASEVIDWIDTH-40)<<FRACBITS, (y<<FRACBITS) + (25<<(FRACBITS-1)) - rubyheight, FRACUNIT/2, V_SNAPTORIGHT, VoteScreen.rubyicon, NULL);
} }
if (levelinfo[i].gts) if (levelinfo[i].gts)
@@ -1164,13 +1164,13 @@ void Y_VoteDrawer(void)
patch_t *pic; patch_t *pic;
if (votes[i] >= 3 && (i != pickedvote || voteendtic == -1)) if (votes[i] >= 3 && (i != pickedvote || voteendtic == -1))
pic = randomlvl; pic = VoteScreen.randomlvl;
else else
pic = levelinfo[votes[i]].pic; pic = levelinfo[votes[i]].pic;
if (!timer && i == voteclient.ranim) if (!timer && i == voteclient.ranim)
{ {
V_DrawScaledPatch(x-18, y+9, V_SNAPTOLEFT, cursor); V_DrawScaledPatch(x-18, y+9, V_SNAPTOLEFT, VoteScreen.cursor[0]);
if (voteendtic != -1 && !(votetic % 4)) if (voteendtic != -1 && !(votetic % 4))
V_DrawFill(x-1, y-1, 42, 27, 120|V_SNAPTOLEFT); V_DrawFill(x-1, y-1, 42, 27, 120|V_SNAPTOLEFT);
else else
@@ -1182,7 +1182,7 @@ void Y_VoteDrawer(void)
else else
{ {
V_DrawFixedPatch((x+40)<<FRACBITS, (y)<<FRACBITS, FRACUNIT/4, V_SNAPTOLEFT|V_FLIP, pic, 0); V_DrawFixedPatch((x+40)<<FRACBITS, (y)<<FRACBITS, FRACUNIT/4, V_SNAPTOLEFT|V_FLIP, pic, 0);
V_DrawFixedPatch((x+20)<<FRACBITS, (y<<FRACBITS) + (25<<(FRACBITS-1)) - rubyheight, FRACUNIT/2, V_SNAPTOLEFT, rubyicon, NULL); V_DrawFixedPatch((x+20)<<FRACBITS, (y<<FRACBITS) + (25<<(FRACBITS-1)) - rubyheight, FRACUNIT/2, V_SNAPTOLEFT, VoteScreen.rubyicon, NULL);
} }
if (levelinfo[votes[i]].gts) if (levelinfo[votes[i]].gts)
@@ -1471,10 +1471,28 @@ void Y_VoteTicker(void)
// //
// MK online style voting screen, appears after intermission // MK online style voting screen, appears after intermission
// //
static void Y_InitVoteDrawing(void)
{
if (dedicated)
return;
// setup the background patches
Y_VoteScreenCheck();
VoteScreen.cursor[0] = W_CachePatchName("M_CURSOR", PU_PATCH);
VoteScreen.cursor[1] = W_CachePatchName("P1CURSOR", PU_PATCH);
VoteScreen.cursor[2] = W_CachePatchName("P2CURSOR", PU_PATCH);
VoteScreen.cursor[3] = W_CachePatchName("P3CURSOR", PU_PATCH);
VoteScreen.cursor[4] = W_CachePatchName("P4CURSOR", PU_PATCH);
VoteScreen.randomlvl = W_CachePatchName("RANDOMLV", PU_PATCH);
VoteScreen.rubyicon = W_CachePatchName("RUBYICON", PU_PATCH);
}
void Y_StartVote(void) void Y_StartVote(void)
{ {
INT32 i = 0; INT32 i = 0;
UINT8 prefgametype = (votelevels[0][1] & ~0x80);
votetic = -1; votetic = -1;
@@ -1483,17 +1501,8 @@ void Y_StartVote(void)
I_Error("voteendtic is dirty"); I_Error("voteendtic is dirty");
#endif #endif
Y_AnimatedVoteScreenCheck(); // cache vote patches
Y_InitVoteDrawing();
widebgpatch = W_CachePatchName(((prefgametype == GT_MATCH) ? "BATTLSCW" : "INTERSCW"), PU_PATCH);
bgpatch = W_CachePatchName(((prefgametype == GT_MATCH) ? "BATTLSCR" : "INTERSCR"), PU_PATCH);
cursor = W_CachePatchName("M_CURSOR", PU_PATCH);
cursor1 = W_CachePatchName("P1CURSOR", PU_PATCH);
cursor2 = W_CachePatchName("P2CURSOR", PU_PATCH);
cursor3 = W_CachePatchName("P3CURSOR", PU_PATCH);
cursor4 = W_CachePatchName("P4CURSOR", PU_PATCH);
randomlvl = W_CachePatchName("RANDOMLV", PU_PATCH);
rubyicon = W_CachePatchName("RUBYICON", PU_PATCH);
timer = cv_votetime.value*TICRATE; timer = cv_votetime.value*TICRATE;
pickedvote = -1; pickedvote = -1;
@@ -1559,11 +1568,14 @@ void Y_StartVote(void)
levelinfo[i].gts = NULL; levelinfo[i].gts = NULL;
// set up the pic // set up the pic
lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(votelevels[i][0]+1))); if (!dedicated)
if (lumpnum != LUMPERROR) {
levelinfo[i].pic = W_CachePatchName(va("%sP", G_BuildMapName(votelevels[i][0]+1)), PU_PATCH); lumpnum = W_CheckNumForName(va("%sP", G_BuildMapName(votelevels[i][0]+1)));
else if (lumpnum != LUMPERROR)
levelinfo[i].pic = W_CachePatchName("BLANKLVL", PU_PATCH); levelinfo[i].pic = W_CachePatchName(va("%sP", G_BuildMapName(votelevels[i][0]+1)), PU_PATCH);
else
levelinfo[i].pic = W_CachePatchName("BLANKLVL", PU_PATCH);
}
} }
voteclient.loaded = true; voteclient.loaded = true;
@@ -1588,18 +1600,18 @@ static void Y_UnloadVoteData(void)
{ {
voteclient.loaded = false; voteclient.loaded = false;
if (rendermode != render_soft) if (dedicated)
return; return;
UNLOAD(widebgpatch); UNLOAD(VoteScreen.widebgpatch);
UNLOAD(bgpatch); UNLOAD(VoteScreen.bgpatch);
UNLOAD(cursor); UNLOAD(VoteScreen.cursor[0]);
UNLOAD(cursor1); UNLOAD(VoteScreen.cursor[1]);
UNLOAD(cursor2); UNLOAD(VoteScreen.cursor[2]);
UNLOAD(cursor3); UNLOAD(VoteScreen.cursor[3]);
UNLOAD(cursor4); UNLOAD(VoteScreen.cursor[4]);
UNLOAD(randomlvl); UNLOAD(VoteScreen.randomlvl);
UNLOAD(rubyicon); UNLOAD(VoteScreen.rubyicon);
UNLOAD(levelinfo[3].pic); UNLOAD(levelinfo[3].pic);
UNLOAD(levelinfo[2].pic); UNLOAD(levelinfo[2].pic);
+34 -1
View File
@@ -10,7 +10,6 @@
/// \brief Tally screens, or "Intermissions" as they were formally called in Doom /// \brief Tally screens, or "Intermissions" as they were formally called in Doom
extern boolean usebuffer; extern boolean usebuffer;
extern char *luaVoteScreen;
void Y_IntermissionDrawer(void); void Y_IntermissionDrawer(void);
void Y_Ticker(void); void Y_Ticker(void);
@@ -55,3 +54,37 @@ typedef enum
int_classicrace, // Competition int_classicrace, // Competition
} intertype_t; } intertype_t;
extern intertype_t intertype; extern intertype_t intertype;
// Votescreen stuff
typedef struct
{
boolean race; // non lua race patch replaced
boolean widerace; // non lua widescreen race patch replaced
boolean battle; // non lua battle patch replaced
boolean widebattle; // non lua widescreen battle patch replaced
} votereplace_t;
// VEXTRN - Vote (V) Extra (EXT) Race (R) Normal (N - Normal sized patch)
// VEXTRW - Vote (V) Extra (EXT) Race (R) Normal (W - Wide patch)
// VEXTBN - Vote (V) Extra (EXT) Battle (B) Normal (N - Normal sized patch)
// VEXTBW - Vote (V) Extra (EXT) Battle (B) Normal (W - Wide patch)
typedef struct
{
char Prefix[5]; // Race = INTSX, Battle = BTLSX
char luaPrefix[5]; // prefix for lua votescreens
INT32 currentAnimFrame; // current animated background frame
INT32 foundLuaVoteFrames; // normal lua patch frames
INT32 foundLuaVoteWideFrames; // widescreen lua patch frames
votereplace_t replaced; // checks which non lua patch has been replaced
patch_t *bgpatch; // votebackground patch
patch_t *widebgpatch; // wide votebackground patch
patch_t *cursor[5]; // cursor patches
patch_t *randomlvl; // randomlevel patch
patch_t *rubyicon; // encore ruby patch
} votescreen_t;
extern votescreen_t VoteScreen;