From 989bd7685779bab9f81a33d60f75698df7510900 Mon Sep 17 00:00:00 2001 From: Pieter Hulshoff Date: Fri, 2 Sep 2016 09:26:08 +0200 Subject: [PATCH] Reverted the lag problem fix; it created new problems. Fixed a Windows compile error. --- RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp | 4 ++-- RetroFE/Source/RetroFE.cpp | 2 +- RetroFE/Source/Version.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp b/RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp index d15e99f..0f96121 100644 --- a/RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp +++ b/RetroFE/Source/Graphics/Component/ReloadableScrollingText.cpp @@ -266,7 +266,7 @@ void ReloadableScrollingText::draw( ) { Component::draw( ); - if (!text_.empty( ) && waitEndTime_ <= 0.0f && baseViewInfo.Alpha > 0) + if (!text_.empty( ) && waitEndTime_ <= 0.0f && baseViewInfo.Alpha > 0.0f) { Font *font; @@ -365,7 +365,7 @@ void ReloadableScrollingText::draw( ) } else { - rect.x = static_cast( xOrigin ) + imageMaxWidth + 1; // Stop handling the rest of the string + rect.x = static_cast( xOrigin ) + static_cast( imageMaxWidth ) + 10; // Stop handling the rest of the string } } position += glyph.advance * scale * scaleX_; diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp index e518bf6..e8c2795 100644 --- a/RetroFE/Source/RetroFE.cpp +++ b/RetroFE/Source/RetroFE.cpp @@ -252,7 +252,7 @@ void RetroFE::run() float lastTime = 0; float deltaTime = 0; SDL_Event e; - while (SDL_PollEvent(&e)) + if (SDL_PollEvent(&e)) { if(input_.update(e)) { diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp index 1de9c36..9d8ea4c 100644 --- a/RetroFE/Source/Version.cpp +++ b/RetroFE/Source/Version.cpp @@ -20,7 +20,7 @@ std::string retrofe_version_major = "0"; std::string retrofe_version_minor = "7"; -std::string retrofe_version_build = "9"; +std::string retrofe_version_build = "10"; std::string Version::getString()