diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-19 01:21:04 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-19 01:21:04 +0100 |
| commit | 8d1996833bd73271ca14a3df46633d9b2ed13052 (patch) | |
| tree | daedb1622096e5bb6b8b9ec15882769b827506e1 /src/render/Glass.cpp | |
| parent | get rid of all PED_SKIN defines (diff) | |
| parent | little cleanup of templates (diff) | |
| download | re3-8d1996833bd73271ca14a3df46633d9b2ed13052.tar re3-8d1996833bd73271ca14a3df46633d9b2ed13052.tar.gz re3-8d1996833bd73271ca14a3df46633d9b2ed13052.tar.bz2 re3-8d1996833bd73271ca14a3df46633d9b2ed13052.tar.lz re3-8d1996833bd73271ca14a3df46633d9b2ed13052.tar.xz re3-8d1996833bd73271ca14a3df46633d9b2ed13052.tar.zst re3-8d1996833bd73271ca14a3df46633d9b2ed13052.zip | |
Diffstat (limited to 'src/render/Glass.cpp')
| -rw-r--r-- | src/render/Glass.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/render/Glass.cpp b/src/render/Glass.cpp index 536d94e0..a11495a9 100644 --- a/src/render/Glass.cpp +++ b/src/render/Glass.cpp @@ -1,4 +1,4 @@ -#include "common.h" +#include "common.h" #include "Glass.h" #include "Timer.h" @@ -150,7 +150,11 @@ CFallingGlassPane::Render(void) fwdNorm.Normalise(); uint8 alpha = CGlass::CalcAlphaWithNormal(&fwdNorm); - int32 time = clamp(CTimer::GetTimeInMilliseconds() - m_nTimer, 0, 500); +#ifdef FIX_BUGS + uint16 time = clamp(CTimer::GetTimeInMilliseconds() > m_nTimer ? CTimer::GetTimeInMilliseconds() - m_nTimer : 0u, 0u, 500u); +#else + uint16 time = clamp(CTimer::GetTimeInMilliseconds() - m_nTimer, 0, 500); +#endif uint8 color = int32( float(alpha) * (float(time) / 500) ); |