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

- adjustments

Browse source
This commit is contained in:
Christoph Oelckers 2019-11-07 20:30:56 +01:00
parent e4735fdff1
commit d2cbd71dbf
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/common/console/c_console.cpp
View file

@ -1326,13 +1326,13 @@ void C_ToggleConsole ()
HistPos = NULL; HistPos = NULL;
TabbedLast = false; TabbedLast = false;
TabbedList = false; TabbedList = false;
GUICapture++; GUICapture |= 1;
} }
else //if (gamestate != GS_FULLCONSOLE && gamestate != GS_STARTUP) else //if (gamestate != GS_FULLCONSOLE && gamestate != GS_STARTUP)
{ {
ConsoleState = c_rising; ConsoleState = c_rising;
C_FlushDisplay (); C_FlushDisplay ();
GUICapture--; GUICapture &= ~1;
} }
} }

2
source/common/filesystem/file_zip.cpp
View file

@ -68,7 +68,7 @@ static bool UncompressZipLump(char *Cache, FileReader &Reader, int Method, int L
case METHOD_LZMA: case METHOD_LZMA:
{ {
FileReader frz; FileReader frz;
if (frz.OpenDecompressor(Reader, LumpSize, Method, false, [](const char* err) { throw std::runtime_error(err); })) if (frz.OpenDecompressor(Reader, LumpSize, Method, false, [](const char* err) { I_Error("%s", err); }))
{ {
frz.Read(Cache, LumpSize); frz.Read(Cache, LumpSize);
} }

3
source/glbackend/gl_shader.cpp
View file

@ -92,8 +92,7 @@ bool FShader::Load(const char * name, const char * vert_prog, const char * frag_
if (linked == 0) if (linked == 0)
{ {
// only print message if there's an error. // only print message if there's an error.
FStringf err("Init Shader '%s':\n%s\n", name, error.GetChars()); I_Error("Init Shader '%s':\n%s\n", name, error.GetChars());
throw std::runtime_error(err); // Failing to compile a shader is fatal.
} }
return true; return true;
} }