zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-22 12:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
nashmuhandes 2017-03-12 12:42:55 +08:00
commit 59103868ce
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.cpp
View file

@ -809,7 +809,7 @@ void D_Display ()
{
StatusBar->DrawBottomStuff (HUD_AltHud);
if (DrawFSHUD || automapactive) DrawHUD();
if (players[consoleplayer].camera && players[consoleplayer].camera->player)
if (players[consoleplayer].camera && players[consoleplayer].camera->player && !automapactive)
{
StatusBar->DrawCrosshair();
}

2
src/g_level.cpp
View file

@ -1080,7 +1080,7 @@ void G_DoLoadLevel (int position, bool autosave)
}
E_PlayerEntered(ii, finishstate == FINISH_SameHub);
// ENTER scripts are being handled when the player gets spawned, this cannot be changed due to its effect on voodoo dolls.
if (level.FromSnapshot) FBehavior::StaticStartTypedScripts(SCRIPT_Return, players[ii].mo, true);
if (level.FromSnapshot && !savegamerestore) FBehavior::StaticStartTypedScripts(SCRIPT_Return, players[ii].mo, true);
}
}

3
src/gl/renderer/gl_renderer.h
View file

@ -79,7 +79,8 @@ enum
{
DM_MAINVIEW,
DM_OFFSCREEN,
DM_PORTAL
DM_PORTAL,
DM_SKYPORTAL
};
class FGLRenderer

2
src/gl/scene/gl_portal.cpp
View file

@ -655,7 +655,7 @@ void GLSkyboxPortal::DrawContents()
SaveMapSection();
currentmapsection[mapsection >> 3] |= 1 << (mapsection & 7);
GLRenderer->DrawScene(DM_PORTAL);
GLRenderer->DrawScene(DM_SKYPORTAL);
portal->mFlags &= ~PORTSF_INSKYBOX;
inskybox = false;
gl_RenderState.SetDepthClamp(oldclamp);

2
src/gl/scene/gl_scene.cpp
View file

@ -491,7 +491,7 @@ void FGLRenderer::DrawScene(int drawmode)
{
ssao_portals_available = 0;
}
else if (ssao_portals_available > 0)
else if (drawmode == DM_PORTAL && ssao_portals_available > 0)
{
applySSAO = true;
ssao_portals_available--;

1
src/r_data/r_translate.cpp
View file

@ -561,7 +561,6 @@ void FRemapTable::AddToTranslation(const char *range)
}
sc.MustGetAnyToken();
Printf(0, "token type: %d", sc.TokenType);
if (sc.TokenType == '[')
{