Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff
This commit is contained in:
commit
760b82fd63
7 files changed
+40
-9
No files matched your search
+6
-2
@@ -64,6 +64,7 @@ static patch_t *ttkflash; // flash screen
|
||||
|
||||
static patch_t *driver[2]; // Driving character on the waiting screen
|
||||
static UINT8 *waitcolormap; // colormap for the spinning character
|
||||
static INT32 waitscale = 1<<FRACBITS; // scale for the character on waiting screen; very hacky crap
|
||||
|
||||
static void F_SkyScroll(INT32 scrollspeed);
|
||||
|
||||
@@ -1166,17 +1167,20 @@ void F_StartWaitingPlayers(void)
|
||||
INT32 i;
|
||||
INT32 randskin;
|
||||
spriteframe_t *sprframe;
|
||||
|
||||
wipegamestate = GS_TITLESCREEN; // technically wiping from title screen
|
||||
finalecount = 0;
|
||||
|
||||
randskin = M_RandomKey(numskins);
|
||||
boolean waithires = skins[randskin].flags && SF_HIRES;
|
||||
|
||||
if (waitcolormap)
|
||||
Z_Free(waitcolormap);
|
||||
|
||||
waitcolormap = R_GetTranslationColormap(randskin, skins[randskin].prefcolor, 0);
|
||||
|
||||
if (waithires)
|
||||
waitscale = waitscale * FIXED_TO_FLOAT(skins[randskin].highresscale); // need to set scale here cause im lazy
|
||||
|
||||
for (i = 0; i < 2; i++)
|
||||
{
|
||||
sprframe = &skins[randskin].spritedef.spriteframes[(6+(i*3)) & FF_FRAMEMASK];
|
||||
@@ -1205,7 +1209,7 @@ void F_WaitingPlayersDrawer(void)
|
||||
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
|
||||
V_DrawCreditString((160 - (V_CreditStringWidth(waittext1)>>1))<<FRACBITS, 48<<FRACBITS, 0, waittext1);
|
||||
V_DrawCreditString((160 - (V_CreditStringWidth(waittext2)>>1))<<FRACBITS, 64<<FRACBITS, 0, waittext2);
|
||||
V_DrawFixedPatch((160<<FRACBITS) - driver[frame]->width / 2, 150<<FRACBITS, 1<<FRACBITS, flags, driver[frame], waitcolormap);
|
||||
V_DrawFixedPatch((160<<FRACBITS) - driver[frame]->width / 2, 150<<FRACBITS, waitscale, flags, driver[frame], waitcolormap); // "1<<FRACBITS"
|
||||
}
|
||||
|
||||
// ==========
|
||||
|
||||
+2
-2
@@ -9084,9 +9084,9 @@ static void K_drawNameTags(void)
|
||||
continue;
|
||||
if (!players[i].mo || P_MobjWasRemoved(players[i].mo) || players[i].spectator || !playeringame[i])
|
||||
continue;
|
||||
if (i == stplyrnum && !cv_showownnametag.value && !(leveltime < 130))
|
||||
if (i == displayplayers[stplyrnum] && !cv_showownnametag.value && !(leveltime < 130))
|
||||
continue;
|
||||
if (i != stplyrnum && leveltime < starttime)
|
||||
if (i != displayplayers[stplyrnum] && leveltime < starttime)
|
||||
continue;
|
||||
if (players[i].kartstuff[k_hyudorotimer]) // player is invisible
|
||||
continue;
|
||||
|
||||
+6
-1
@@ -896,7 +896,12 @@ static patch_t *R_CreateHardwarePatch(patch_t *patch)
|
||||
void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle, INT32 xpivot, INT32 ypivot, boolean flip)
|
||||
{
|
||||
UINT32 i;
|
||||
patch_t *rotated, *hwpatch;
|
||||
patch_t *rotated;
|
||||
|
||||
#ifdef HWRENDER
|
||||
patch_t *hwpatch;
|
||||
#endif
|
||||
|
||||
UINT16 *rawdst, *rawconv;
|
||||
size_t size;
|
||||
INT32 bflip = (flip != 0x00);
|
||||
|
||||
@@ -68,6 +68,15 @@ consvar_t cv_renderview = {"renderview", "On", 0, CV_OnOff, NULL, 0, NULL, NULL,
|
||||
consvar_t cv_vhseffect = {"vhspause", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_shittyscreen = {"televisionsignal", "Okay", CV_NOSHOWHELP, shittyscreen_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
static void Highreshudscale_OnChange(void);
|
||||
static CV_PossibleValue_t highreshudscale_cons_t[] = {{4*FRACUNIT/5, "MIN"}, {6*FRACUNIT/5, "MAX"}, {0, NULL}};
|
||||
consvar_t cv_highreshudscale = {"highreshudscale", "1", CV_SAVE|CV_FLOAT|CV_CALL|CV_NOINIT|CV_NOSHOWHELP, highreshudscale_cons_t, Highreshudscale_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
static void Highreshudscale_OnChange(void)
|
||||
{
|
||||
SCR_Recalc();
|
||||
}
|
||||
|
||||
static void SCR_ChangeFullscreen (void);
|
||||
|
||||
consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL};
|
||||
@@ -189,6 +198,7 @@ void SCR_Startup(void)
|
||||
vid.baseratio = FRACUNIT;
|
||||
|
||||
V_Init();
|
||||
CV_RegisterVar(&cv_highreshudscale);
|
||||
CV_RegisterVar(&cv_ticrate);
|
||||
CV_RegisterVar(&cv_accuratefps);
|
||||
CV_RegisterVar(&cv_menucaps);
|
||||
@@ -250,6 +260,14 @@ void SCR_Recalc(void)
|
||||
vid.fdupy = FixedDiv(vid.height*FRACUNIT, BASEVIDHEIGHT*FRACUNIT);
|
||||
}
|
||||
|
||||
if ((vid.width > 720) && (vid.height > 1280)) // ehhhh well this thing has so many issues, so ill lock it to higher resolutions instead
|
||||
{
|
||||
vid.dupx = FixedDiv(vid.dupx, cv_highreshudscale.value);
|
||||
vid.dupy = FixedDiv(vid.dupy, cv_highreshudscale.value);
|
||||
vid.fdupx = FixedDiv(vid.fdupx, cv_highreshudscale.value);
|
||||
vid.fdupy = FixedDiv(vid.fdupy, cv_highreshudscale.value);
|
||||
}
|
||||
|
||||
#ifdef HWRENDER
|
||||
//if (rendermode != render_opengl && rendermode != render_none) // This was just placing it incorrectly at non aspect correct resolutions in opengl
|
||||
// 13/11/18:
|
||||
|
||||
@@ -139,6 +139,7 @@ extern INT32 scr_bpp;
|
||||
extern UINT8 *scr_borderpatch; // patch used to fill the view borders
|
||||
|
||||
extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_fullscreen, cv_vhseffect, cv_shittyscreen;
|
||||
extern consvar_t cv_highreshudscale;
|
||||
// wait for page flipping to end or not
|
||||
extern consvar_t cv_vidwait;
|
||||
extern consvar_t cv_timescale;
|
||||
|
||||
+2
-1
@@ -19,6 +19,7 @@
|
||||
#include "hu_stuff.h"
|
||||
#include "r_draw.h"
|
||||
#include "r_main.h"
|
||||
#include "r_fps.h"
|
||||
#include "console.h"
|
||||
|
||||
#include "i_video.h" // rendermode
|
||||
@@ -1412,7 +1413,7 @@ void V_DrawVhsEffect(boolean rewind)
|
||||
if (rewind)
|
||||
V_DrawVhsEffect(false); // experimentation
|
||||
|
||||
fixed_t frac = cv_uncappedhud.value ? FixedMul(renderdeltatics, cv_timescale.value) : (renderisnewtic ? FRACUNIT : 0);
|
||||
fixed_t frac = R_UsingFrameInterpolation() ? renderdeltatics : FRACUNIT;
|
||||
upbary -= frac * (vid.dupy * (rewind ? 3 : 1.8f));
|
||||
downbary += frac * (vid.dupy * (rewind ? 2 : 1));
|
||||
|
||||
|
||||
+5
-3
@@ -826,9 +826,11 @@ UINT16 W_InitFile(const char *filename, boolean local)
|
||||
wadfiles[numwadfiles] = wadfile;
|
||||
numwadfiles++; // must come BEFORE W_LoadDehackedLumps, so any addfile called by COM_BufInsertText called by Lua doesn't overwrite what we just loaded
|
||||
|
||||
// Read shaders from file
|
||||
if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
|
||||
HWR_LoadCustomShadersFromFile(numwadfiles - 1, (type == RET_PK3));
|
||||
#ifdef HWRENDER
|
||||
// Read shaders from file
|
||||
if (rendermode == render_opengl && (vid.glstate == VID_GL_LIBRARY_LOADED))
|
||||
HWR_LoadCustomShadersFromFile(numwadfiles - 1, (type == RET_PK3));
|
||||
#endif
|
||||
|
||||
// TODO: HACK ALERT - Load Lua & SOC stuff right here. I feel like this should be out of this place, but... Let's stick with this for now.
|
||||
switch (wadfile->type)
|
||||
|
||||
Reference in new issue
Block a user