Reverted the lag problem fix; it created new problems.

Fixed a Windows compile error.
This commit is contained in:
Pieter Hulshoff 2016-09-02 09:26:08 +02:00
parent f1d902703e
commit 989bd76857
3 changed files with 4 additions and 4 deletions

View File

@ -266,7 +266,7 @@ void ReloadableScrollingText::draw( )
{ {
Component::draw( ); Component::draw( );
if (!text_.empty( ) && waitEndTime_ <= 0.0f && baseViewInfo.Alpha > 0) if (!text_.empty( ) && waitEndTime_ <= 0.0f && baseViewInfo.Alpha > 0.0f)
{ {
Font *font; Font *font;
@ -365,7 +365,7 @@ void ReloadableScrollingText::draw( )
} }
else else
{ {
rect.x = static_cast<int>( xOrigin ) + imageMaxWidth + 1; // Stop handling the rest of the string rect.x = static_cast<int>( xOrigin ) + static_cast<int>( imageMaxWidth ) + 10; // Stop handling the rest of the string
} }
} }
position += glyph.advance * scale * scaleX_; position += glyph.advance * scale * scaleX_;

View File

@ -252,7 +252,7 @@ void RetroFE::run()
float lastTime = 0; float lastTime = 0;
float deltaTime = 0; float deltaTime = 0;
SDL_Event e; SDL_Event e;
while (SDL_PollEvent(&e)) if (SDL_PollEvent(&e))
{ {
if(input_.update(e)) if(input_.update(e))
{ {

View File

@ -20,7 +20,7 @@
std::string retrofe_version_major = "0"; std::string retrofe_version_major = "0";
std::string retrofe_version_minor = "7"; std::string retrofe_version_minor = "7";
std::string retrofe_version_build = "9"; std::string retrofe_version_build = "10";
std::string Version::getString() std::string Version::getString()