diff options
author | Stijn Buys <ingar@osirion.org> | 2011-05-11 14:48:17 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2011-05-11 14:48:17 +0000 |
commit | 1c63cbf204b1d2c667ce9f821ccb197d0ffb0ac3 (patch) | |
tree | c2d0ff7cc4a8a264657abd0ac99017a5b664ecd2 /src/core/entity.cc | |
parent | bb0f860989f84b901f80017ae0139a3fc0446dc1 (diff) |
Review of the main loop timer, converted timers from float to unsigned long,
corrected a number of timing bugs, improved client framerate stability.
Diffstat (limited to 'src/core/entity.cc')
-rw-r--r-- | src/core/entity.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc index 915dafe..6ce94a7 100644 --- a/src/core/entity.cc +++ b/src/core/entity.cc @@ -488,7 +488,7 @@ void Entity::remove_menu(std::string const &label) } -void Entity::frame(float seconds) +void Entity::frame(const unsigned long elapsed) { if (entity_collision_child_shapes.size() > 0) { btCompoundShape *compoundshape = static_cast<btCompoundShape *> (entity_collision_shape); @@ -782,9 +782,9 @@ void EntityDynamic::reset() set_dirty(); } -void EntityDynamic::frame(float seconds) +void EntityDynamic::frame(const unsigned long elapsed) { - Entity::frame(seconds); + Entity::frame(elapsed); if (entity_state == Docked) { return; @@ -1251,9 +1251,9 @@ void EntityControlable::action(btScalar seconds) } // osirion game frame (runs at osirion server framerate) -void EntityControlable::frame(float seconds) +void EntityControlable::frame(const unsigned long elapsed) { - EntityDynamic::frame(seconds); + EntityDynamic::frame(elapsed); // update zone keepalive bounding box if (owner() && (owner()->control() == this) && zone()) { |