a3x
/
re3
mirror of https://git.rip/DMCA_FUCKER/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Nikolay Korolev 2020-11-30 02:15:35 +03:00
parent 8f05ccd6c4 566282057a
commit a3b83a5d2f
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/Frontend.cpp
View File

@ -4157,12 +4157,22 @@ CMenuManager::ProcessButtonPresses(void)
DoSettingsBeforeStartingAGame(); DoSettingsBeforeStartingAGame();
return; return;
} }
if (glfwGetKey(PSGLOBAL(window), GLFW_KEY_D) == GLFW_PRESS) {
scriptToLoad = 2;
DoSettingsBeforeStartingAGame();
return;
}
#elif defined _WIN32 #elif defined _WIN32
if (GetAsyncKeyState('R') & 0x8000) { if (GetAsyncKeyState('R') & 0x8000) {
scriptToLoad = 1; scriptToLoad = 1;
DoSettingsBeforeStartingAGame(); DoSettingsBeforeStartingAGame();
return; return;
} }
if (GetAsyncKeyState('D') & 0x8000) {
scriptToLoad = 2;
DoSettingsBeforeStartingAGame();
return;
}
#endif #endif
} }
#endif #endif

1
src/render/Renderer.cpp
View File

@ -216,6 +216,7 @@ CRenderer::RenderOneNonRoad(CEntity *e)
e->Render(); e->Render();
if(e->IsVehicle()){ if(e->IsVehicle()){
BACKFACE_CULLING_OFF;
e->bImBeingRendered = true; e->bImBeingRendered = true;
CVisibilityPlugins::RenderAlphaAtomics(); CVisibilityPlugins::RenderAlphaAtomics();
e->bImBeingRendered = false; e->bImBeingRendered = false;