Merchants kinda work...

1 files changed, 14 insertions, 10 deletions

diff --git a/main.cpp b/main.cpp
index 97f788c..cb28bcc 100644
--- a/main.cpp
+++ b/main.cpp
@@ -124,6 +124,10 @@ GLuint shaderProgram;
 GLuint colorIndex;
 GLuint mouseTex;
 
+bool uiLoop = false;
+std::mutex mtx;
+std::condition_variable cv;
+
 /*
  *	loops is used for texture animation. It is believed to be passed to entity
  *	draw functions, although it may be externally referenced instead.
@@ -131,6 +135,8 @@ GLuint mouseTex;
 
 unsigned int loops = 0;	// Used for texture animation
 
+ThreadPool pool(10);
+
 /*
  *	initEverything
  *
@@ -469,14 +475,16 @@ void mainLoop(void){
 	 */
 
 	prev = currentWorld;
-	ui::handleEvents();
-	
+	pool.Enqueue(ui::handleEvents);
+	//ui::handleEvents();
+
 	if(prev != currentWorld){
 		currentWorld->bgmPlay(prev);
 		ui::dialogBoxExists = false;
 	}
 	
 	if(prevPrevTime + MSEC_PER_TICK <= currentTime){
+		//pool.Enqueue(logic);
 		logic();
 		prevPrevTime = currentTime;
 	}
@@ -485,6 +493,9 @@ void mainLoop(void){
 	 * Update player and entity coordinates.
 	 */
 	
+	/*pool.Enqueue([](){
+		currentWorld->update(player,deltaTime);
+	});*/
 	currentWorld->update(player,deltaTime);
 	
 	/*
@@ -646,7 +657,7 @@ void render(){
 				offset.y+SCREEN_HEIGHT/2);
 	}else if(ui::fontSize != 16)
 		ui::setFontSize(16);
-	
+
 	/*
 	 * Draw UI elements. This includes the player's health bar and the dialog box.
 	 */
@@ -764,19 +775,12 @@ void logic(){
 			 *	that the NPC doesn't move when it talks to the player.
 			 */
 
-/*<<<<<<< HEAD
-			if(n->canMove) n->wander((rand() % 120 + 30));
-
-			if(!player->inv->usingi) n->hit = false;
-			if(player->inv->usingi && !n->hit && player->inv->detectCollision(vec2{n->loc.x, n->loc.y},vec2{n->loc.x+n->width,n->loc.y+n->height})){
-=======*/
 			if(n->canMove)
 				n->wander((rand() % 120 + 30));
 			
 			/*if(!player->inv->usingi) n->hit = false;
 			
 			if(player->inv->usingi && !n->hit && player->inv->detectCollision((vec2){n->loc.x, n->loc.y},(vec2){n->loc.x+n->width,n->loc.y+n->height})){
->>>>>>> 7ab072caaaec09720ad79cfed5738e89bc60c44f
 				n->health -= 25;
 				n->hit = true;
 				for(int r = 0; r < (rand()%5);r++)