Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-22 02:12:45 +01:00
Code Issues Projects Releases Activity

Merge pull request #487 from NFSMONSTR/fix432

Browse Source 
Fix #432
This commit is contained in:
darkf 2018-05-31 23:13:28 -05:00 committed by GitHub
commit 04e857ba0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rwengine/src/render/GameRenderer.cpp
View File

@ -402,12 +402,12 @@ void GameRenderer::renderWorld(GameWorld* world, const ViewCamera& camera,
}
if ((world->state->isCinematic || world->state->currentCutscene) &&
splashTexName != 0) {
splashTexName != 0 && !world->isPaused()) {
renderLetterbox();
}
float fadeTimer = world->getGameTime() - world->state->fadeStart;
if (fadeTimer < world->state->fadeTime || !world->state->fadeOut) {
if ((fadeTimer < world->state->fadeTime || !world->state->fadeOut) && !world->isPaused()) {
/// @todo rewrite this render code to use renderer class
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glUseProgram(ssRectProgram);
@ -439,7 +439,7 @@ void GameRenderer::renderWorld(GameWorld* world, const ViewCamera& camera,
}
if ((world->state->isCinematic || world->state->currentCutscene) &&
splashTexName == 0) {
splashTexName == 0 && !world->isPaused()) {
renderLetterbox();
}

3
rwgame/RWGame.cpp
View File

@ -612,7 +612,8 @@ void RWGame::render(float alpha, float time) {
}
RW_PROFILE_END();
drawOnScreenText(world.get(), &renderer);
if (!world->isPaused())
drawOnScreenText(world.get(), &renderer);
}
void RWGame::renderDebugStats(float time) {