Added monitoring for text layouter bad indices

GrognardsFromHell · May 13, 2016 · 19759d8 · 19759d8
1 parent 708d7e1
commit 19759d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/TemplePlus/fonts/fonts_layout.cpp b/TemplePlus/fonts/fonts_layout.cpp
@@ -176,7 +176,11 @@ void TextLayouter::LayoutAndDraw(gsl::cstring_span<> text, const TigFont& font,
 			if (style.flags & 0x10) {
 				x += (extentsWidth - lineWidth) / 2;
 			}
-			if(lastIdx >= wordInfo.firstIdx)
+			if ((int)wordInfo.firstIdx < 0 || (int)lastIdx < 0){
+				int dummy = 1;
+				logger->error("Bad firstIdx at LayoutAndDraw! {}, {}", (int)wordInfo.firstIdx, (int)lastIdx);
+			} 
+			else if(lastIdx >= wordInfo.firstIdx)
 				mRenderer.RenderRun(
 					text.subspan(wordInfo.firstIdx, lastIdx - wordInfo.firstIdx),
 					x,

diff --git a/tpdata/co8fixes.dat b/tpdata/co8fixes.dat
diff --git a/tpdata/tpgamefiles.dat b/tpdata/tpgamefiles.dat
diff --git a/tpdata/tpmes/combat.mes b/tpdata/tpmes/combat.mes
@@ -11,13 +11,12 @@
 {208}{Shaken}
 {209}{Frightened}
 {210}{Ethereal}
-{211}{You are already dead.}
-{212}{You have 3 seconds to live.}
+{211}{You have 3 seconds to live.}
 {212}{3.}
 {213}{2.}
 {214}{1.}
 {215}{Your death is at hand!}
-
+{216}{You are already dead.}
 
 {5105}{Disable Attacks of Opportunity}
 {5106}{Divine Might}