zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation on platforms other than Windows

This commit is contained in:
alexey.lysiuk 2016-10-03 22:13:33 +03:00
parent 15af9242d6
commit 5d99e7dafe
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/g_shared/sbarinfo_commands.cpp
View File

@ -1187,12 +1187,12 @@ class CommandDrawNumber : public CommandDrawString
if (!(cvartype == CVAR_Bool || cvartype == CVAR_Int)) if (!(cvartype == CVAR_Bool || cvartype == CVAR_Int))
{ {
sc.ScriptMessage("CVar '%s' is not an int or bool", cvarName); sc.ScriptMessage("CVar '%s' is not an int or bool", cvarName.GetChars());
} }
} }
else else
{ {
sc.ScriptMessage("CVar '%s' does not exist", cvarName); sc.ScriptMessage("CVar '%s' does not exist", cvarName.GetChars());
} }
if (parenthesized) sc.MustGetToken(')'); if (parenthesized) sc.MustGetToken(')');

3
src/gl/stereo3d/gl_interleaved3d.cpp
View File

@ -104,10 +104,13 @@ void RowInterleaved3D::Present() const
// Compute absolute offset from top of screen to top of current display window // Compute absolute offset from top of screen to top of current display window
// because we need screen-relative, not window-relative, scan line parity // because we need screen-relative, not window-relative, scan line parity
int windowVOffset = 0; int windowVOffset = 0;
#ifdef _WIN32
if (! fullscreen) { if (! fullscreen) {
I_SaveWindowedPos(); // update win_y CVAR I_SaveWindowedPos(); // update win_y CVAR
windowVOffset = win_y; windowVOffset = win_y;
} }
#endif // _WIN32
GLRenderer->mPresent3dRowShader->VerticalPixelOffset.Set( GLRenderer->mPresent3dRowShader->VerticalPixelOffset.Set(
windowVOffset // fixme: vary with window location windowVOffset // fixme: vary with window location