Merged o_lockZone() and o_unlockZone() into o1_lockZones() and o1_unlockZones()

svn-id: r21749

2 files changed, 3 insertions, 13 deletions

diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp
index 865f5cc6c8..e9160f908d 100644
--- a/engines/simon/items.cpp
+++ b/engines/simon/items.cpp
@@ -1319,12 +1319,13 @@ void SimonEngine::o1_b2NotZero() {
 
 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 @@ void SimonEngine::o_unfreezeBottom() {
 	_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;
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index c4afffbdd4..fdde41a313 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -584,8 +584,6 @@ protected:
 	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();