From 4a42abd5f983d5281803952e6912760d95fba436 Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Sat, 6 Dec 2003 08:14:30 +0000
Subject: cleanup

svn-id: r11515
---
 scumm/smush/codec47.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'scumm')

diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp
index d68392efb6..1d906ede82 100644
--- a/scumm/smush/codec47.cpp
+++ b/scumm/smush/codec47.cpp
@@ -384,7 +384,6 @@ void Codec47Decoder::level2(byte *d_dst) {
 			d_dst += _d_pitch;
 		}
 	} else if (code == 0xFF) {
-		byte *tmp_dst = d_dst;
 		level3(d_dst);
 		d_dst += 2;
 		level3(d_dst);
@@ -392,7 +391,6 @@ void Codec47Decoder::level2(byte *d_dst) {
 		level3(d_dst);
 		d_dst += 2;
 		level3(d_dst);
-		d_dst = tmp_dst;
 	} else if (code == 0xFE) {
 		byte t = *_d_src++;
 		for (i = 0; i < 4; i++) {
@@ -400,7 +398,7 @@ void Codec47Decoder::level2(byte *d_dst) {
 			d_dst += _d_pitch;
 		}
 	} else if (code == 0xFD) {
-		byte *tmp_ptr = _tableSmall + (*_d_src++ << 7);
+		byte *tmp_ptr = _tableSmall + *_d_src++ * 128;
 		int32 l = tmp_ptr[96];
 		byte val = *_d_src++;
 		int16 *tmp_ptr2 = (int16 *)tmp_ptr;
@@ -443,7 +441,6 @@ void Codec47Decoder::level1(byte *d_dst) {
 			d_dst += _d_pitch;
 		}
 	} else if (code == 0xFF) {
-		byte *tmp_dst = d_dst;
 		level2(d_dst);
 		d_dst += 4;
 		level2(d_dst);
@@ -451,7 +448,6 @@ void Codec47Decoder::level1(byte *d_dst) {
 		level2(d_dst);
 		d_dst += 4;
 		level2(d_dst);
-		d_dst = tmp_dst;
 	} else if (code == 0xFE) {
 		byte t = *_d_src++;
 		for (i = 0; i < 8; i++) {
@@ -461,7 +457,7 @@ void Codec47Decoder::level1(byte *d_dst) {
 		}
 	} else if (code == 0xFD) {
 		tmp = *_d_src++;
-		byte *tmp_ptr = _tableBig + (tmp << 2) + (tmp << 7) + (tmp << 8);
+		byte *tmp_ptr = _tableBig + tmp * 388;
 		byte l = tmp_ptr[384];
 		byte val = *_d_src++;
 		int16 *tmp_ptr2 = (int16 *)tmp_ptr;
-- 
cgit v1.2.3