Fixed some stuff

2 files changed, 9 insertions, 6 deletions

diff --git a/src/entities.cpp b/src/entities.cpp
index c90650e..d5d9af2 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -37,7 +37,7 @@ const char *randomDialog[RAND_DIALOG_COUNT] = {
 	"You know, if anyone ever asked me who I wanted to be when I grow up, I would say Abby Ross.",
 	"I want to have the wallpaper in our house changed. It doesn\'t really fit the environment.",
 	"Frig.",
-	"The sine of theta equals the opposite over the hypotenuese.",
+	"The sine of theta equals the opposite over the hdaypotenuese.",
 	"Did you know the developers spelt brazier as brazzier.",
 	"What's a bagel? I don't know because I'm mormon"
 };
@@ -263,7 +263,7 @@ Object::Object() {
 	canMove = false;
 
 	maxHealth = health = 1;
-	
+
 	inv = NULL;
 }
 
diff --git a/src/gametime.cpp b/src/gametime.cpp
index 598cd4f..1005d84 100644
--- a/src/gametime.cpp
+++ b/src/gametime.cpp
@@ -3,11 +3,13 @@
 #include <common.hpp>
 
 static unsigned int tickCount = 0;
-static unsigned int deltaTime = 1;
+static float deltaTime = 1;
 
 // millisecond timers
 static unsigned int currentTime = 0;
-static unsigned int prevTime, prevPrevTime;
+static unsigned int prevTime;
+
+static float accum = 0.0f;
 
 namespace game {
     namespace time {
@@ -41,8 +43,9 @@ namespace game {
         }
 
         bool tickHasPassed(void) {
-            if (prevPrevTime + MSEC_PER_TICK <= currentTime) {
-        		prevPrevTime = currentTime;
+            accum += deltaTime;
+            if (accum > MSEC_PER_TICK) {
+        		accum = 0.0f;
                 return true;
         	}