Fix MSVC build broken by 34d32ce

SmallJoker · SmallJoker · commit 61202513208b · 2017-04-17T14:02:26.000+02:00
`round` -&gt; `myround`
Remove superflous `floor` calls
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
@@ -726,7 +726,7 @@ void Server::handleCommand_ClientReady(NetworkPacket* pkt)
 	if (m_shutdown_timer > 0.0f) {
 		std::wstringstream ws;
 		ws << L"*** Server shutting down in "
-				<< duration_to_string(round(m_shutdown_timer)).c_str() << ".";
+				<< duration_to_string(myround(m_shutdown_timer)).c_str() << ".";
 		SendChatMessage(pkt->getPeerId(), ws.str());
 	}
 }
diff --git a/src/server.cpp b/src/server.cpp
@@ -1047,7 +1047,7 @@ void Server::AsyncRunStep(bool initial_step)
 					std::wstringstream ws;
 
 					ws << L"*** Server shutting down in "
-						<< duration_to_string(round(m_shutdown_timer - dtime)).c_str()
+						<< duration_to_string(myround(m_shutdown_timer - dtime)).c_str()
 						<< ".";
 
 					infostream << wide_to_utf8(ws.str()).c_str() << std::endl;
@@ -3502,7 +3502,7 @@ void Server::requestShutdown(const std::string &msg, bool reconnect, float delay
 		std::wstringstream ws;
 
 		ws << L"*** Server shutting down in "
-				<< duration_to_string(round(m_shutdown_timer)).c_str()
+				<< duration_to_string(myround(m_shutdown_timer)).c_str()
 				<< ".";
 
 		infostream << wide_to_utf8(ws.str()).c_str() << std::endl;
diff --git a/src/util/string.h b/src/util/string.h
@@ -616,9 +616,9 @@ inline const char *bool_to_cstr(bool val)
 
 inline const std::string duration_to_string(int sec)
 {
-	int min = floor(sec / 60);
+	int min = sec / 60;
 	sec %= 60;
-	int hour = floor(min / 60);
+	int hour = min / 60;
 	min %= 60;
 
 	std::stringstream ss;

Original file line number	Diff line number	Diff line change
`@@ -726,7 +726,7 @@ void Server::handleCommand_ClientReady(NetworkPacket* pkt)`
`726`	`726`	`if (m_shutdown_timer > 0.0f) {`
`727`	`727`	`std::wstringstream ws;`
`728`	`728`	`ws << L"*** Server shutting down in "`
`729`		`- << duration_to_string(round(m_shutdown_timer)).c_str() << ".";`
	`729`	`+ << duration_to_string(myround(m_shutdown_timer)).c_str() << ".";`
`730`	`730`	`SendChatMessage(pkt->getPeerId(), ws.str());`
`731`	`731`	`}`
`732`	`732`	`}`