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

[eriktorbjorn at users.sourceforge.net]

Revision: 21749
Author:   eriktorbjorn
Date:     2006-04-10 00:17:06 -0700 (Mon, 10 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21749&view=rev

Log Message:
-----------
Merged o_lockZone() and o_unlockZone() into o1_lockZones() and o1_unlockZones()

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 07:13:21 UTC (rev 21748)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-10 07:17:06 UTC (rev 21749)
@@ -1319,12 +1319,13 @@
 
 void SimonEngine::o1_lockZones() {
 	// 175: vga pointer op 1
-	o_lockZone();
+	_vgaBufStart = _vgaBufFreeStart;
 }
 
 void SimonEngine::o1_unlockZones() {
 	// 176: vga pointer op 2
-	o_unlockZone();
+	_vgaBufFreeStart = _vgaFileBufOrg;
+	_vgaBufStart = _vgaFileBufOrg;
 }
 
 void SimonEngine::o1_screenTextPObj() {
@@ -1955,15 +1956,6 @@
 	_vgaFileBufOrg = _vgaFileBufOrg2;
 }
 
-void SimonEngine::o_lockZone() {
-	_vgaBufStart = _vgaBufFreeStart;
-}
-
-void SimonEngine::o_unlockZone() {
-	_vgaBufFreeStart = _vgaFileBufOrg;
-	_vgaBufStart = _vgaFileBufOrg;
-}
-
 void SimonEngine::o_sync(uint a) {
 	uint16 id = to16Wrapper(a);
 	_lockWord |= 0x8000;

Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-04-10 07:13:21 UTC (rev 21748)
+++ scummvm/trunk/engines/simon/simon.h	2006-04-10 07:17:06 UTC (rev 21749)
@@ -584,8 +584,6 @@
 	uint getOffsetOfChild2Param(SubObject *child, uint prop);
 	void o_setTextColor(uint color);
 	void o_playSFX(uint a);
-	void o_lockZone();
-	void o_unlockZone();
 	void o_pathfind(int x, int y, uint var_1, uint var_2);
 	void o_mouseOn();
 	void o_mouseOff();


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