From 1d9cd5ad7de22349cbdd31b78aa60a0824f1bf5b Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 10 Apr 2006 08:28:29 +0000
Subject: Merged o_restoreIconArray() into o1_restoreIconArray().

svn-id: r21756
---
 engines/simon/items.cpp | 14 ++++----------
 engines/simon/simon.h   |  1 -
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp
index afeb9f4938..843a39552e 100644
--- a/engines/simon/items.cpp
+++ b/engines/simon/items.cpp
@@ -1190,7 +1190,10 @@ void SimonEngine::o1_copysf() {
 
 void SimonEngine::o1_restoreIcons() {
 	// 137
-	o_restoreIconArray(getVarOrByte());
+	uint num = getVarOrByte();
+	WindowBlock *window = _windowArray[num & 7];
+	if (window->iconPtr)
+		drawIconArray(num, window->iconPtr->itemRef, window->iconPtr->line, window->iconPtr->classMask);
 }
 
 void SimonEngine::o1_freezeZones() {
@@ -1954,15 +1957,6 @@ void SimonEngine::o_waitForMark(uint i) {
 	}
 }
 
-void SimonEngine::o_restoreIconArray(uint num) {
-	WindowBlock *window;
-
-	window = _windowArray[num & 7];
-	if (window->iconPtr == NULL)
-		return;
-	drawIconArray(num, window->iconPtr->itemRef, window->iconPtr->line, window->iconPtr->classMask);
-}
-
 void SimonEngine::o_freezeBottom() {
 	_vgaBufStart = _vgaBufFreeStart;
 	_vgaFileBufOrg = _vgaBufFreeStart;
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index a8e2d959fd..64b91378f9 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -574,7 +574,6 @@ protected:
 	void o_waitForSync(uint a);
 	void skipSpeech();
 	void o_sync(uint a);
-	void o_restoreIconArray(uint a);
 	void o_freezeBottom();
 	void killAllTimers();
 
-- 
cgit v1.2.3