From e20f65e5ea3eac8420fc5b54e5ad64d538b98148 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 5 Jan 2017 02:06:50 -0800
Subject: CRYO: Get rid of sound's locked and forcewait, remove some dead code,
 renaming

---
 engines/cryo/video.cpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'engines/cryo/video.cpp')

diff --git a/engines/cryo/video.cpp b/engines/cryo/video.cpp
index c2b35829e9..7d783e96c1 100644
--- a/engines/cryo/video.cpp
+++ b/engines/cryo/video.cpp
@@ -490,14 +490,23 @@ bool HnmPlayer::nextElement() {
 			_frameNum++;
 			selectBuffers();
 			decompLempelZiv(_dataPtr + 4, _newFrameBuffer);
+#if 0
 			switch (_header._width) {
-				//			case 320: CLBlitter_RawCopy320ASM(_newFrameBuffer, _oldFrameBuffer, _header._height); break;
-				//			case 480: CLBlitter_RawCopy480ASM(_newFrameBuffer, _oldFrameBuffer, _header._height); break;
-				//			case 640: CLBlitter_RawCopy640ASM(_newFrameBuffer, _oldFrameBuffer, _header._height); break;
-				//			default: memcpy(_oldFrameBuffer, _newFrameBuffer, _header._width * _header._height);
-			default:
-				memcpy(_oldFrameBuffer, _newFrameBuffer, _header._bufferSize);  //TODO strange buffer size here
+			case 320:
+				CLBlitter_RawCopy320ASM(_newFrameBuffer, _oldFrameBuffer, _header._height);
+				break;
+			case 480:
+				CLBlitter_RawCopy480ASM(_newFrameBuffer, _oldFrameBuffer, _header._height);
+				break;
+			case 640:
+				CLBlitter_RawCopy640ASM(_newFrameBuffer, _oldFrameBuffer, _header._height);
+				break;
+			default: 
+				memcpy(_oldFrameBuffer, _newFrameBuffer, _header._width * _header._height);
 			}
+#else
+			memcpy(_oldFrameBuffer, _newFrameBuffer, _header._bufferSize);  //TODO strange buffer size here
+#endif
 			if (!(h6 & 1))
 				desentrelace();
 			else {
-- 
cgit v1.2.3