1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00

Fixed lots of warnings.

Disabled the following (for MSVC only) that couldn't (or shouldn't) be fixed.

4003: not enough actual parameters for macro 'identifier'
4250: 'class1' : inherits 'class2::member' via dominance
4251: 'type' : class 'type1' needs to have dll-interface to be used by clients of class 'type2'
4275: non dll-interface class 'type1' used as base for dll-interface class 'type2'
This commit is contained in:
John Bolton
2020-10-01 01:38:06 -07:00
parent ff471af3de
commit a05ae78e67
142 changed files with 854 additions and 839 deletions

View File

@@ -615,7 +615,7 @@ void CFramerateManager::framerateDelay()
// FPS is higher than it should be, then wait some time
if (timeElapsed < rateticks)
{
SDL_Delay(ceil(this->rateticks) - timeElapsed);
SDL_Delay((Uint32)ceil(this->rateticks) - timeElapsed);
}
accumulatedTime += timeElapsed;
@@ -624,7 +624,7 @@ void CFramerateManager::framerateDelay()
if(accumulatedFrames >= 100)
{
//about 2 second should be passed
fps = ceil(1000.0 / (accumulatedTime/accumulatedFrames));
fps = static_cast<int>(ceil(1000.0 / (accumulatedTime/accumulatedFrames)));
accumulatedTime = 0;
accumulatedFrames = 0;
}