mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 08:00:01 +00:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
a3b83a5d2f
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue