From 095293277dbca80e91c4f25b05923b7cb3a79396 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 4 May 2016 08:48:24 -0400
Subject: fade fixes

---
 src/entities.cpp | 2 +-
 src/ui.cpp       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/entities.cpp b/src/entities.cpp
index 216d9ef..5198c01 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -546,7 +546,7 @@ COMMONAIFUNC:
 				} while ((oxml = oxml->NextSiblingElement()));
 
 				// run the dialog stuff
-				ui::dialogBox(name, optstr, false, exml->GetText() + 1);
+				ui::dialogBox(name, optstr, false, exml->GetText() + 2);
 				ui::waitForDialog();
 
 				if (ui::dialogOptChosen)
diff --git a/src/ui.cpp b/src/ui.cpp
index 2348375..c75e3ff 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -76,7 +76,7 @@ extern void mainLoop(void);
 static bool fadeEnable = false;
 static bool fadeWhite  = false;
 static bool fadeFast   = false;
-static unsigned int fadeIntensity = 0;
+static int fadeIntensity = 0;
 
 bool inBattle = false;
 Mix_Chunk *battleStart;
@@ -865,10 +865,10 @@ namespace ui {
 			return;
 		}
 
-		/*if (!typeOutDone) {
+		if (!typeOutDone) {
 			typeOutDone = true;
 			return;
-		}*/
+		}
 
 		for(i=0;i<dialogOptText.size();i++) {
 			if (mouse.x > dialogOptText[i].second.x &&
-- 
cgit v1.2.3