[Scummvm-cvs-logs] SF.net SVN: scummvm: [21756] scummvm/trunk/engines/simon

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Mon Apr 10 01:29:03 CEST 2006


Revision: 21756
Author:   eriktorbjorn
Date:     2006-04-10 01:28:29 -0700 (Mon, 10 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21756&view=rev

Log Message:
-----------
Merged o_restoreIconArray() into o1_restoreIconArray().

Modified Paths:
--------------
    scummvm/trunk/engines/simon/items.cpp
    scummvm/trunk/engines/simon/simon.h
Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-10 08:22:03 UTC (rev 21755)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-10 08:28:29 UTC (rev 21756)
@@ -1190,7 +1190,10 @@
 
 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_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;

Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-04-10 08:22:03 UTC (rev 21755)
+++ scummvm/trunk/engines/simon/simon.h	2006-04-10 08:28:29 UTC (rev 21756)
@@ -574,7 +574,6 @@
 	void o_waitForSync(uint a);
 	void skipSpeech();
 	void o_sync(uint a);
-	void o_restoreIconArray(uint a);
 	void o_freezeBottom();
 	void killAllTimers();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list