thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

even more cleanup

Browse source 
svn-id: r6405
This commit is contained in:
Max Horn 2003-01-11 23:35:20 +00:00
parent 9179a54091
commit cde3a6e182
1 changed files with 48 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

112
scumm/smush/codec47.cpp
View file

@ -249,9 +249,7 @@ void Codec47Decoder::makeTables37(int32 param) {
*ptr = 0; *ptr = 0;
ptr += 388; ptr += 388;
} }
} } else if (param == 4) {
if (param == 4) {
table37_1 = &codec37_table[0]; table37_1 = &codec37_table[0];
table37_2 = &codec37_table[16]; table37_2 = &codec37_table[16];
ptr = smush_buf_small + 96; ptr = smush_buf_small + 96;
@ -264,6 +262,8 @@ void Codec47Decoder::makeTables37(int32 param) {
*ptr = 0; *ptr = 0;
ptr += 128; ptr += 128;
} }
} else {
error("makeTables37: unknown param %d", param);
} }
s = 0; s = 0;
@ -272,26 +272,24 @@ void Codec47Decoder::makeTables37(int32 param) {
tmp_table37_1_1 = table37_1; tmp_table37_1_1 = table37_1;
tmp_table37_2_1 = table37_2; tmp_table37_2_1 = table37_2;
count_1 = 16; count_1 = 16;
do { while (count_1--) {
tmp_table37_1_2 = table37_1; tmp_table37_1_2 = table37_1;
tmp_table37_2_2 = table37_2; tmp_table37_2_2 = table37_2;
count_2 = 16; count_2 = 16;
do { while(count_2--) {
tmp = *(tmp_table37_2_1); tmp = *(tmp_table37_2_1);
tmp_value1 = tmp; tmp_value1 = tmp;
if (tmp == 0) { if (tmp == 0) {
b1 = 0; b1 = 0;
} else if ((tmp - param) == -1) { } else if (param == tmp + 1) {
b1 = 1; b1 = 1;
} else { } else {
b1 = 2;
tmp = *(tmp_table37_1_1); tmp = *(tmp_table37_1_1);
if (tmp != 0) { if (tmp == 0) {
b1 = 0; b1 = 2;
tmp -= param; } else if (param == tmp + 1) {
if (tmp == -1)
b1 = 3; b1 = 3;
else } else {
b1 = 4; b1 = 4;
} }
} }
@ -299,17 +297,15 @@ void Codec47Decoder::makeTables37(int32 param) {
tmp_value2 = tmp; tmp_value2 = tmp;
if (tmp == 0) { if (tmp == 0) {
b2 = 0; b2 = 0;
} else if ((tmp - param) == -1) { } else if (param == tmp + 1) {
b2 = 1; b2 = 1;
} else { } else {
tmp = *(tmp_table37_1_2); tmp = *(tmp_table37_1_2);
if (tmp == 0) { if (tmp == 0) {
b2 = 2; b2 = 2;
} else { } else if (param == tmp + 1) {
tmp -= param;
if (tmp == -1)
b2 = 3; b2 = 3;
else } else {
b2 = 4; b2 = 4;
} }
} }
@ -347,66 +343,40 @@ void Codec47Decoder::makeTables37(int32 param) {
variable4 = value_table37_1_1; variable4 = value_table37_1_1;
tmp_a = tmp_value1; tmp_a = tmp_value1;
} }
tmp_c = param; table_ptr = &table[param * tmp_a + variable4];
tmp_d = variable4;
tmp_c *= tmp_a;
tmp_c += tmp_d;
table_ptr = &table[tmp_c];
*(table_ptr) = 1; *(table_ptr) = 1;
if ((b1 == 2 && b2 == 3) || if ((b1 == 2 && b2 == 3) || (b2 == 2 && b1 == 3) ||
(b2 == 2 && b1 == 3) || (b1 == 0 && b2 != 1) || (b2 == 0 && b1 != 1)) {
(b1 == 0 && b2 != 1) || if (tmp_a >= 0) {
(b2 == 0 && b1 != 1)) { d = tmp_a + 1;
if (tmp_a < 0) while (d--) {
continue; *table_ptr = 1;
tmp_c = param; table_ptr -= param;
tmp_c <<= 2;
do {
*(table_ptr) = 1;
table_ptr -= tmp_c / 4;
} while (--tmp_a >= 0);
continue;
} }
if ((b2 != 0 && b1 == 1) ||
(b1 != 0 && b2 == 1)) {
tmp_c = param;
if (tmp_c <= tmp_a)
continue;
tmp_c <<= 2;
tmp_d = param;
tmp_d -= tmp_a;
do {
*(table_ptr) = 1;
table_ptr += tmp_c / 4;
} while (--tmp_d != 0);
continue;
} }
} else if ((b2 != 0 && b1 == 1) || (b1 != 0 && b2 == 1)) {
if ((b1 == 0 && b2 == 1) || if (param > tmp_a) {
(b2 == 0 && b1 == 1) || d = param - tmp_a;
(b1 == 3 && b2 != 2) || while (d--) {
(b2 == 3 && b1 != 2)) { *table_ptr = 1;
tmp_c = param; table_ptr += param;
if (tmp_c <= variable4) }
continue; }
tmp_c -= variable4; } else if ((b1 == 0 && b2 == 1) || (b2 == 0 && b1 == 1) ||
d = tmp_c; (b1 == 3 && b2 != 2) || (b2 == 3 && b1 != 2)) {
do { if (param > variable4) {
d = param - variable4;
while(d--) {
*(table_ptr++) = 1; *(table_ptr++) = 1;
} while (--d != 0);
continue;
} }
}
if ((b1 == 2 && b2 != 3) || } else if ((b1 == 2 && b2 != 3) || (b2 == 2 && b1 != 3)) {
(b2 == 2 && b1 != 3)) {
if (variable4 >= 0) { if (variable4 >= 0) {
tmp_c = variable4 + 1; d = variable4 + 1;
d = tmp_c; while(d--) {
do {
*(table_ptr--) = 1; *(table_ptr--) = 1;
} while (--d != 0); }
} }
} }
} }
@ -441,10 +411,10 @@ void Codec47Decoder::makeTables37(int32 param) {
s += 388; s += 388;
tmp_table37_1_2++; tmp_table37_1_2++;
tmp_table37_2_2++; tmp_table37_2_2++;
} while (--count_2 != 0); }
tmp_table37_1_1++; tmp_table37_1_1++;
tmp_table37_2_1++; tmp_table37_2_1++;
} while (--count_1!= 0); }
} }
void Codec47Decoder::makeTables47(int32 width) { void Codec47Decoder::makeTables47(int32 width) {