From 088cc0bff8cd39ddbe829867fd26cd5ba4a4aaba Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Tue, 1 Nov 2016 21:06:10 -0400
Subject: TITANIC: Fix loading of conversation log

---
 engines/titanic/pet_control/pet_text.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines/titanic')

diff --git a/engines/titanic/pet_control/pet_text.cpp b/engines/titanic/pet_control/pet_text.cpp
index 1aa9b804ff..78dceb7a31 100644
--- a/engines/titanic/pet_control/pet_text.cpp
+++ b/engines/titanic/pet_control/pet_text.cpp
@@ -87,7 +87,7 @@ CString CPetText::getColorText(byte r, byte g, byte b) {
 void CPetText::load(SimpleFile *file, int param) {
 	if (!param) {
 		uint numLines = file->readNumber();
-		uint charsPerLine = file->readNumber();
+		int charsPerLine = file->readNumber();
 		uint count = file->readNumber();
 		_bounds = file->readRect();
 		_unused1 = file->readNumber();
@@ -102,8 +102,9 @@ void CPetText::load(SimpleFile *file, int param) {
 		_hasBorder = file->readNumber() != 0;
 		_scrollTop = file->readNumber();
 
-		resize(numLines);
 		setMaxCharsPerLine(charsPerLine);
+		resize(numLines);
+		_lineCount = (count == 0) ? 0 : count - 1;
 
 		assert(_array.size() >= count);
 		for (uint idx = 0; idx < count; ++idx) {
-- 
cgit v1.2.3