From ffa32a2eca7f2af68bc89cdd9027f3ee6d75b6c4 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 3 Aug 2003 18:23:54 +0000
Subject: o5_getStringWidth was missing getResultPos() (thanks to _Q for
 pointing this out)

svn-id: r9441
---
 scumm/script_v5.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index a7dad1f64a..635dd71296 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -834,12 +834,15 @@ void Scumm_v5::o5_drawObject() {
 
 void Scumm_v5::o5_getStringWidth() {
 	// TODO - not sure if this is correct... needs testing
-	int a = getVarOrDirectByte(0x80);
-	byte *ptr = getResourceAddress(rtString, a);
-	int width = 0;
+	int string, width = 0;
+	byte *ptr;
 	
-	if (ptr)
-		width = _charset->getStringWidth(0, ptr);
+	getResultPos();
+	string = getVarOrDirectByte(0x80);
+	ptr = getResourceAddress(rtString, string);
+	assert(ptr);
+
+	width = _charset->getStringWidth(0, ptr);
 	
 	setResult(width);
 	warning("o5_getStringWidth, result %d", width);
-- 
cgit v1.2.3