Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff
This commit is contained in:
commit
8a93a79fc7
2 files changed
+7
No files matched your search
@@ -1334,7 +1334,12 @@ void CONS_Error(const char *msg)
|
||||
|
||||
// dirty quick hack, but for the good cause
|
||||
while (I_GetKey() != KEY_ENTER)
|
||||
{
|
||||
// Sleep so we don't take too much of cpu usage
|
||||
I_Sleep(1.f/TICRATE*1000);
|
||||
|
||||
I_OsPolling();
|
||||
}
|
||||
}
|
||||
|
||||
//======================================================================
|
||||
|
||||
@@ -550,7 +550,9 @@ void V_SetPalette(INT32 palettenum)
|
||||
if (!pLocalPalette)
|
||||
V_ReloadPalette();
|
||||
|
||||
#ifdef HWRENDER
|
||||
if (rendermode == render_soft || (rendermode == render_opengl && HWR_ShouldUsePaletteRendering())) // opengl without paletterendering hates subpalettes
|
||||
#endif
|
||||
{
|
||||
if (palettenum == 0)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user