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

kirben at users.sourceforge.net kirben at users.sourceforge.net
Wed Mar 15 19:21:01 CET 2006


Revision: 21323
Author:   kirben
Date:     2006-03-15 19:19:55 -0800 (Wed, 15 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21323&view=rev

Log Message:
-----------
Remove unused unlock draw surface functions

Modified Paths:
--------------
    scummvm/trunk/engines/simon/charset.cpp
    scummvm/trunk/engines/simon/icons.cpp
    scummvm/trunk/engines/simon/simon.cpp
    scummvm/trunk/engines/simon/simon.h
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/charset.cpp
===================================================================
--- scummvm/trunk/engines/simon/charset.cpp	2006-03-16 03:15:05 UTC (rev 21322)
+++ scummvm/trunk/engines/simon/charset.cpp	2006-03-16 03:19:55 UTC (rev 21323)
@@ -1242,8 +1242,6 @@
 		dst += _dxSurfacePitch;
 	} while (--h);
 
-	dx_unlock_2();
-
 	_lockWord &= ~0x8000;
 }
 

Modified: scummvm/trunk/engines/simon/icons.cpp
===================================================================
--- scummvm/trunk/engines/simon/icons.cpp	2006-03-16 03:15:05 UTC (rev 21322)
+++ scummvm/trunk/engines/simon/icons.cpp	2006-03-16 03:19:55 UTC (rev 21323)
@@ -191,7 +191,6 @@
 		decompress_icon(dst, src, 20, 10, 0xD0, _dxSurfacePitch);
 	}
 
-	dx_unlock_2();
 	_lockWord &= ~0x8000;
 }
 

Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-03-16 03:15:05 UTC (rev 21322)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-03-16 03:19:55 UTC (rev 21323)
@@ -1971,8 +1971,6 @@
 				dst[b+7] = color;
 				b += _dxSurfacePitch;
 				dst[b+4] = color;
-
-				dx_unlock_attached();
 			}
 		} while (ha++, --count);
 
@@ -2756,13 +2754,9 @@
 	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 @@
 		dst += _dxSurfacePitch;
 	} while (--h);
 
-	dx_unlock_2();
 	_lockWord &= ~0x8000;
 }
 
@@ -3292,8 +3285,6 @@
 		src += _dxSurfacePitch;
 	} while (--h);
 
-
-	dx_unlock_2();
 	_lockWord &= ~0x8000;
 }
 
@@ -3804,8 +3795,6 @@
 		dst += _dxSurfacePitch;
 		src += _dxSurfacePitch;
 	}
-
-	dx_unlock_2();
 }
 
 void SimonEngine::dx_clear_surfaces(uint num_lines) {
@@ -4186,26 +4175,20 @@
 	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++;
 }

Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-03-16 03:15:05 UTC (rev 21322)
+++ scummvm/trunk/engines/simon/simon.h	2006-03-16 03:19:55 UTC (rev 21323)
@@ -815,11 +815,7 @@
 	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);

Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-03-16 03:15:05 UTC (rev 21322)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-03-16 03:19:55 UTC (rev 21323)
@@ -756,8 +756,6 @@
 			src += 4;
 		}
 
-		dx_unlock_attached();
-
 		return;
 	}
 
@@ -783,9 +781,6 @@
 	} else {
 		drawImages(&state);
 	}
-
-	dx_unlock_2();
-	dx_unlock_attached();
 }
 
 bool SimonEngine::drawImages_clip(VC10_state *state) {


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