sword improvements, page threading

1 files changed, 11 insertions, 8 deletions

diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index 351cf0f..ce514a4 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -219,16 +219,19 @@ CONT:
 }
 
 void commonPageFunc( Mob *callee ){
-	static bool lock = false;
-
-	if ( !lock ) {
-		lock = true;
+	//static bool lock = false;
 
+	/*if ( !lock ) {
+		lock = true;*/
+	if ( !ui::dialogBoxExists ) {
+		std::cout<<"begin\n";
 		ui::drawPage( callee->heyid );
-		ui::waitForDialog();
+		while( ui::pageExists() );
+		std::cout<<"done\n";
+		//ui::waitForDialog();
 
-		callee->alive = false;
-		lock = false;
+		callee->health = 0;
+		//lock = false;
 	}
 }
 
@@ -267,7 +270,7 @@ void commonTriggerFunc(Mob *callee){
 
 		ui::toggleBlackFast();
 
-		callee->alive = false;
+		callee->health = 0;
 		lock = false;
 	}
 }