Remove unused unlock draw surface functions

svn-id: r21323

5 files changed, 3 insertions, 32 deletions

diff --git a/engines/simon/charset.cpp b/engines/simon/charset.cpp
index 05ed2c0351..990b9104c6 100644
--- a/engines/simon/charset.cpp
+++ b/engines/simon/charset.cpp
@@ -1242,8 +1242,6 @@ void SimonEngine::video_putchar_drawchar(FillOrCopyStruct *fcs, uint x, uint y,
 		dst += _dxSurfacePitch;
 	} while (--h);
 
-	dx_unlock_2();
-
 	_lockWord &= ~0x8000;
 }
 
diff --git a/engines/simon/icons.cpp b/engines/simon/icons.cpp
index d9f7692e81..aca4d0f9cf 100644
--- a/engines/simon/icons.cpp
+++ b/engines/simon/icons.cpp
@@ -191,7 +191,6 @@ void SimonEngine::draw_icon_c(FillOrCopyStruct *fcs, uint icon, uint x, uint y)
 		decompress_icon(dst, src, 20, 10, 0xD0, _dxSurfacePitch);
 	}
 
-	dx_unlock_2();
 	_lockWord &= ~0x8000;
 }
 
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp
index c81cc90ec2..f392cfc508 100644
--- a/engines/simon/simon.cpp
+++ b/engines/simon/simon.cpp
@@ -1971,8 +1971,6 @@ void SimonEngine::f10_key() {
 				dst[b+7] = color;
 				b += _dxSurfacePitch;
 				dst[b+4] = color;
-
-				dx_unlock_attached();
 			}
 		} while (ha++, --count);
 
@@ -2756,13 +2754,9 @@ void SimonEngine::timer_vga_sprites_helper() {
 	src = _scrollImage + x * 4;
 	decodeStripA(dst, src + READ_BE_UINT32(src), _scrollHeight);
 
-	dx_unlock_2();
-
-
 	memcpy(_sdl_buf_attached, _sdl_buf, _screenWidth * _screenHeight);
 	dx_copy_from_attached_to_3(_scrollHeight);
 
-
 	_scrollX += _scrollFlag;
 
 	vcWriteVar(251, _scrollX);
@@ -3115,7 +3109,6 @@ void SimonEngine::video_erase(FillOrCopyStruct *fcs) {
 		dst += _dxSurfacePitch;
 	} while (--h);
 
-	dx_unlock_2();
 	_lockWord &= ~0x8000;
 }
 
@@ -3292,8 +3285,6 @@ void SimonEngine::video_toggle_colors(HitArea * ha, byte a, byte b, byte c, byte
 		src += _dxSurfacePitch;
 	} while (--h);
 
-
-	dx_unlock_2();
 	_lockWord &= ~0x8000;
 }
 
@@ -3804,8 +3795,6 @@ void SimonEngine::dx_copy_rgn_from_3_to_2(uint b, uint r, uint y, uint x) {
 		dst += _dxSurfacePitch;
 		src += _dxSurfacePitch;
 	}
-
-	dx_unlock_2();
 }
 
 void SimonEngine::dx_clear_surfaces(uint num_lines) {
@@ -4186,26 +4175,20 @@ byte *SimonEngine::dx_lock_2() {
 	return _sdl_buf;
 }
 
-void SimonEngine::dx_unlock_2() {
-}
-
 byte *SimonEngine::dx_lock_attached() {
 	_dxSurfacePitch = _screenWidth;
 	return _dxUse3Or4ForLock ? _sdl_buf_3 : _sdl_buf_attached;
 }
 
-void SimonEngine::dx_unlock_attached() {
+byte *SimonEngine::dx_lock_scaled() {
+	_dxSurfacePitch = _screenWidth;
+	return _sdl_buf_scaled;
 }
 
 void SimonEngine::set_volume(int volume) {
 	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, volume);
 }
 
-byte *SimonEngine::dx_lock_scaled() {
-	_dxSurfacePitch = _screenWidth;
-	return _sdl_buf_scaled;
-}
-
 byte SimonEngine::getByte() {
 	return *_codePtr++;
 }
diff --git a/engines/simon/simon.h b/engines/simon/simon.h
index 0c2636b612..bb7ab1b0b6 100644
--- a/engines/simon/simon.h
+++ b/engines/simon/simon.h
@@ -815,11 +815,7 @@ protected:
 	void dx_copy_rgn_from_3_to_2(uint b, uint r, uint y, uint x);
 
 	byte *dx_lock_2();
-	void dx_unlock_2();
-
 	byte *dx_lock_attached();
-	void dx_unlock_attached();
-
 	byte *dx_lock_scaled();
 
 	byte *read_vga_from_datfile_2(uint id, uint type);
diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp
index ec08feaeea..32b6924c22 100644
--- a/engines/simon/vga.cpp
+++ b/engines/simon/vga.cpp
@@ -756,8 +756,6 @@ void SimonEngine::vc10_draw() {
 			src += 4;
 		}
 
-		dx_unlock_attached();
-
 		return;
 	}
 
@@ -783,9 +781,6 @@ void SimonEngine::vc10_draw() {
 	} else {
 		drawImages(&state);
 	}
-
-	dx_unlock_2();
-	dx_unlock_attached();
 }
 
 bool SimonEngine::drawImages_clip(VC10_state *state) {