From dd9f4d9f99097f0ae96abaa958e426fb396c7d66 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Thu, 6 Apr 2006 08:43:20 +0000
Subject: Remove duplicate code in last commit and minor fixes for FF

svn-id: r21639
---
 engines/simon/simon.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/simon/simon.cpp')

diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index dde392d131..d41de44243 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -286,7 +286,7 @@ SimonEngine::SimonEngine(OSystem *syst)
 	_iOverflow = 0;
 	_hitAreaObjectItem = 0;
 	_lastHitArea = 0;
-	_lastHitArea2Ptr = 0;
+	_lastNameOn = 0;
 	_lastHitArea3 = 0;
 	_leftButtonDown = 0;
 	_hitAreaSubjectItem = 0;
@@ -1603,9 +1603,9 @@ void SimonEngine::setup_cond_c_helper() {
 	_lastHitArea = 0;
 	_hitAreaObjectItem = NULL;
 
-	last = _lastHitArea2Ptr;
-	defocusHitarea();
-	_lastHitArea2Ptr = last;
+	last = _lastNameOn;
+	clearName();
+	_lastNameOn = last;
 
 	for (;;) {
 		_lastHitArea = NULL;
@@ -1646,7 +1646,7 @@ void SimonEngine::setup_cond_c_helper() {
 out_of_here:
 	_lastHitArea3 = 0;
 	_lastHitArea = 0;
-	_lastHitArea2Ptr = NULL;
+	_lastNameOn = NULL;
 	_mouseCursor = 0;
 	_noRightClick = 0;
 }
-- 
cgit v1.2.3