Added object class, and added quest listing

1 files changed, 6 insertions, 2 deletions

diff --git a/main.cpp b/main.cpp
index aa77fc2..61aa3ae 100644
--- a/main.cpp
+++ b/main.cpp
@@ -549,7 +549,9 @@ void mainLoop(void){
 	}else if(!(debugDiv%10)){
 		debugY = player->loc.y;
 	}	
+
 	render();	// Call the render loop
+	
 }
 
 extern bool fadeEnable;
@@ -1041,8 +1043,10 @@ void logic(){
 
 					if(SDL_GetMouseState(NULL, NULL) & SDL_BUTTON(SDL_BUTTON_RIGHT)){
 
-						n->interact();
-						Mix_PlayChannel( -1, horn, 0);	// Audio feedback
+						if(!ui::dialogBoxExists){
+							n->interact();
+							Mix_PlayChannel( -1, horn, 0);	// Audio feedback
+						}
 
 					}
 				}