Fixed some stuff

5 files changed, 38 insertions, 31 deletions

diff --git a/Makefile b/Makefile
index eb38b52..d742643 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,7 @@ $(EXEC): $(CXXOUTDIR)/$(CXXOBJ) main.cpp
 	@echo "  CXX/LD  main"
 	@$(CXX) $(CXXFLAGS) $(CXXINC) $(CXXWARN) -o $(EXEC) main.cpp out/*.o $(LIBS)
 	@rm -rf xml/*.dat
+	@rm -rf storyXML/*.dat
 
 $(CXXOUTDIR)/%.o: $(CXXSRCDIR)/%.cpp
 	@echo "  CXX    " $<
diff --git a/include/common.hpp b/include/common.hpp
index 3712f62..e607c12 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -32,10 +32,10 @@ typedef unsigned int uint;
 #endif
 
 // the number of ticks that should occur in one second
-constexpr const unsigned int TICKS_PER_SEC = 20;
+const unsigned int TICKS_PER_SEC = 20;
 
 // the number of milliseconds inbetween each tick
-constexpr const float MSEC_PER_TICK = 1000.0f / TICKS_PER_SEC;
+const float MSEC_PER_TICK = 1000.0f / TICKS_PER_SEC;
 
 // segfault-debugging output
 //#define SEGFAULT
diff --git a/main.cpp b/main.cpp
index 6de7c03..4db0579 100644
--- a/main.cpp
+++ b/main.cpp
@@ -132,7 +132,7 @@ int main(int argc, char *argv[]){
 
 	// 'basic' OpenGL setup
 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-	SDL_GL_SetSwapInterval(0); // v-sync
+	SDL_GL_SetSwapInterval(1); // v-sync
 	SDL_ShowCursor(SDL_DISABLE); // hide the mouse
 	glViewport(0, 0, game::SCREEN_WIDTH, game::SCREEN_HEIGHT);
 	glEnable(GL_BLEND);
@@ -224,8 +224,12 @@ int main(int argc, char *argv[]){
 
 	// the main loop, in all of its gloriousness..
 	gameRunning = true;
-	while (gameRunning)
+	std::thread([&]{while (gameRunning)
 		mainLoop();
+	}).detach();
+
+	while(gameRunning)
+		render();
 
     // free library resources
     Mix_HaltMusic();
@@ -262,33 +266,32 @@ void mainLoop(void){
 
 	game::time::mainLoopHandler();
 
-	if (currentMenu)
-		goto MENU;
-
-	// handle keypresses - currentWorld could change here
-	prev = currentWorld;
-	ui::handleEvents();
+	if (currentMenu) {
+		return;
+	} else {
+		// handle keypresses - currentWorld could change here
+		prev = currentWorld;
+		ui::handleEvents();
 
-	if(prev != currentWorld){
-		currentWorld->bgmPlay(prev);
-		ui::dialogBoxExists = false;
-	}
+		if(prev != currentWorld){
+			currentWorld->bgmPlay(prev);
+			ui::dialogBoxExists = false;
+		}
 
-	if (game::time::tickHasPassed())
-		logic();
+		if (game::time::tickHasPassed())
+			logic();
 
-	currentWorld->update(player, game::time::getDeltaTime());
-	currentWorld->detect(player);
+		currentWorld->update(player, game::time::getDeltaTime());
+		currentWorld->detect(player);
 
-	if (++debugDiv == 20) {
-		debugDiv=0;
+		if (++debugDiv == 20) {
+			debugDiv=0;
 
-		fps = 1000 / game::time::getDeltaTime();
-		if (!(debugDiv % 10))
-			debugY = player->loc.y;
+			fps = 1000 / game::time::getDeltaTime();
+			if (!(debugDiv % 10))
+				debugY = player->loc.y;
+		}
 	}
-MENU:
-	render();
 }
 
 void render() {
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;
         	}