diff --git a/Crawler/Crawler.cpp b/Crawler/Crawler.cpp index 3d22e0b7..0525b733 100644 --- a/Crawler/Crawler.cpp +++ b/Crawler/Crawler.cpp @@ -123,10 +123,8 @@ bool Crawler::OnUserCreate(){ bool Crawler::OnUserUpdate(float fElapsedTime){ fElapsedTime=std::clamp(fElapsedTime,0.f,1/30.f); //HACK fix. We can't have a negative time. Although using a more precise system clock should make this never occur. Also make sure if the game is too slow we advance by only 1/30th of a second. levelTime+=fElapsedTime; - if(totalBossEncounterMobs>0){ - bossDisplayTimer=std::max(0.f,bossDisplayTimer-fElapsedTime); - } - if(encounterStarted){ + bossDisplayTimer=std::max(0.f,bossDisplayTimer-fElapsedTime); + if(encounterStarted&&totalBossEncounterMobs>0){ encounterDuration+=fElapsedTime; } HandleUserInput(fElapsedTime); diff --git a/Crawler/Version.h b/Crawler/Version.h index d5190273..c5be7f36 100644 --- a/Crawler/Version.h +++ b/Crawler/Version.h @@ -2,7 +2,7 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 2 #define VERSION_PATCH 0 -#define VERSION_BUILD 1572 +#define VERSION_BUILD 1576 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Crawler/utils.cpp b/Crawler/utils.cpp index 1c0e047e..31887da6 100644 --- a/Crawler/utils.cpp +++ b/Crawler/utils.cpp @@ -35,15 +35,11 @@ std::string util::timerStr(float time){ timeStr+=std::to_string(hours)+":"; } - if(minutes>0){ - if(minutes%60<10)timeStr+="0"; - timeStr+=std::to_string(minutes%60)+":"; - } + if(minutes%60<10)timeStr+="0"; + timeStr+=std::to_string(minutes%60)+":"; - if(seconds>0){ - if(seconds%60<10&&minutes>0)timeStr+="0"; - timeStr+=std::to_string(seconds%60); - } + if(seconds%60<10)timeStr+="0"; + timeStr+=std::to_string(seconds%60); return timeStr; } \ No newline at end of file diff --git a/x64/Release/Crawler.exe b/x64/Release/Crawler.exe index 4c13eaa2..17c7daed 100644 Binary files a/x64/Release/Crawler.exe and b/x64/Release/Crawler.exe differ