diff options
author | Mattes D <github@xoft.cz> | 2015-01-18 11:21:36 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2015-01-18 11:21:36 +0100 |
commit | e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3 (patch) | |
tree | 75983459166f6ebebebcc5e4bfb9c551f4e3aedb /src/Entities/Minecart.h | |
parent | Merge pull request #1707 from UltraCoderRU/master (diff) | |
parent | Fixed type-conversion warnings. (diff) | |
download | cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.tar cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.tar.gz cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.tar.bz2 cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.tar.lz cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.tar.xz cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.tar.zst cuberite-e38f41d32fa970c9a1493f9ca0ff16ad3faf33d3.zip |
Diffstat (limited to 'src/Entities/Minecart.h')
-rw-r--r-- | src/Entities/Minecart.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h index f7d0d5dda..898776e71 100644 --- a/src/Entities/Minecart.h +++ b/src/Entities/Minecart.h @@ -38,7 +38,7 @@ public: // cEntity overrides: virtual void SpawnOn(cClientHandle & a_ClientHandle) override; - virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override; + virtual void HandlePhysics(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; virtual bool DoTakeDamage(TakeDamageInfo & TDI) override; virtual void Destroyed() override; @@ -56,7 +56,7 @@ protected: /** Handles physics on normal rails For each tick, slow down on flat rails, speed up or slow down on ascending/descending rails (depending on direction), and turn on curved rails */ - void HandleRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt); + void HandleRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::milliseconds a_Dt); /** Handles powered rail physics Each tick, speed up or slow down cart, depending on metadata of rail (powered or not) @@ -66,10 +66,10 @@ protected: /** Handles detector rail activation Activates detector rails when a minecart is on them. Calls HandleRailPhysics() for physics simulations */ - void HandleDetectorRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt); + void HandleDetectorRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::milliseconds a_Dt); /** Handles activator rails - placeholder for future implementation */ - void HandleActivatorRailPhysics(NIBBLETYPE a_RailMeta, float a_Dt); + void HandleActivatorRailPhysics(NIBBLETYPE a_RailMeta, std::chrono::milliseconds a_Dt); /** Snaps a mincecart to a rail's axis, resetting its speed For curved rails, it changes the cart's direction as well as snapping it to axis */ @@ -171,7 +171,7 @@ public: // cEntity overrides: virtual void OnRightClicked(cPlayer & a_Player) override; - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; + virtual void Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk) override; // Set functions. void SetIsFueled(bool a_IsFueled, int a_FueledTimeLeft = -1) {m_IsFueled = a_IsFueled; m_FueledTimeLeft = a_FueledTimeLeft;} |