summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-01-18 11:25:16 +0100
committerMattes D <github@xoft.cz>2015-01-18 11:25:16 +0100
commit83ed6a2c1b4da2e4a3467090e56eebb2d3e48a30 (patch)
treefca3508dbe493151a78eb3096fbbcc16db8178fd /src
parentMerge pull request #1702 from mc-server/chrono (diff)
downloadcuberite-83ed6a2c1b4da2e4a3467090e56eebb2d3e48a30.tar
cuberite-83ed6a2c1b4da2e4a3467090e56eebb2d3e48a30.tar.gz
cuberite-83ed6a2c1b4da2e4a3467090e56eebb2d3e48a30.tar.bz2
cuberite-83ed6a2c1b4da2e4a3467090e56eebb2d3e48a30.tar.lz
cuberite-83ed6a2c1b4da2e4a3467090e56eebb2d3e48a30.tar.xz
cuberite-83ed6a2c1b4da2e4a3467090e56eebb2d3e48a30.tar.zst
cuberite-83ed6a2c1b4da2e4a3467090e56eebb2d3e48a30.zip
Diffstat (limited to 'src')
-rw-r--r--src/Simulator/FireSimulator.cpp2
-rw-r--r--src/World.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp
index 0439ebdca..8456ed11d 100644
--- a/src/Simulator/FireSimulator.cpp
+++ b/src/Simulator/FireSimulator.cpp
@@ -92,7 +92,7 @@ void cFireSimulator::SimulateChunk(std::chrono::milliseconds a_Dt, int a_ChunkX,
{
cCoordWithIntList & Data = a_Chunk->GetFireSimulatorData();
- int NumMSecs = a_Dt.count();
+ int NumMSecs = static_cast<int>(a_Dt.count());
for (cCoordWithIntList::iterator itr = Data.begin(); itr != Data.end();)
{
int x = itr->x;
diff --git a/src/World.cpp b/src/World.cpp
index 46488d58b..eb76abc2c 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -905,14 +905,14 @@ void cWorld::Tick(std::chrono::milliseconds a_Dt, std::chrono::milliseconds a_La
m_ChunkMap->Tick(a_Dt);
- TickClients(a_Dt.count());
+ TickClients(static_cast<float>(a_Dt.count()));
TickQueuedBlocks();
TickQueuedTasks();
TickScheduledTasks();
- GetSimulatorManager()->Simulate(a_Dt.count());
+ GetSimulatorManager()->Simulate(static_cast<float>(a_Dt.count()));
- TickWeather(a_Dt.count());
+ TickWeather(static_cast<float>(a_Dt.count()));
m_ChunkMap->FastSetQueuedBlocks();