diff options
| author | jacob1 <jfu614@gmail.com> | 2012-09-06 23:49:50 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-06 23:53:29 (GMT) |
| commit | 5a91b83875c8a25e36ecdcddb6c79de61125da39 (patch) | |
| tree | fdaa6d76756ca7164f913726fdeba22ec1aef4be /src/game/GameView.cpp | |
| parent | 710583f0fc00184e15404d4551abf9a424275452 (diff) | |
| download | powder-5a91b83875c8a25e36ecdcddb6c79de61125da39.zip powder-5a91b83875c8a25e36ecdcddb6c79de61125da39.tar.gz | |
revert changing the lua/sdl includes and min/max changes
Diffstat (limited to 'src/game/GameView.cpp')
| -rw-r--r-- | src/game/GameView.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index 5b52424..fadbaea 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -1468,7 +1468,7 @@ void GameView::OnTick(float dt) } if(introText) { - introText -= int(dt)>0?std::min(int(dt), 5):1; + introText -= int(dt)>0?((int)dt < 5? dt:5):1; if(introText < 0) introText = 0; } |