diff options
| author | Strangerke | 2017-01-05 02:06:50 -0800 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-25 22:42:21 +0100 |
| commit | e20f65e5ea3eac8420fc5b54e5ad64d538b98148 (patch) | |
| tree | 3eb4dcfafeef5b3c151f91acc26093cf1e9b1895 /engines/cryo/video.cpp | |
| parent | ad0616688c1d00c053c8d6a0d0e1eb188cddf5da (diff) | |
| download | scummvm-rg350-e20f65e5ea3eac8420fc5b54e5ad64d538b98148.tar.gz scummvm-rg350-e20f65e5ea3eac8420fc5b54e5ad64d538b98148.tar.bz2 scummvm-rg350-e20f65e5ea3eac8420fc5b54e5ad64d538b98148.zip | |
CRYO: Get rid of sound's locked and forcewait, remove some dead code, renaming
Diffstat (limited to 'engines/cryo/video.cpp')
| -rw-r--r-- | engines/cryo/video.cpp | 21 |
1 files changed, 15 insertions, 6 deletions
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 { |