[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.80,1.81 bomp.cpp,2.7,2.8

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv31722

Modified Files:
	akos.cpp bomp.cpp 
Log Message:
use default scale table for bomb codec

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- akos.cpp	16 Jun 2003 15:11:24 -0000	1.80
+++ akos.cpp	19 Jun 2003 12:41:28 -0000	1.81
@@ -408,9 +408,9 @@
 }
 
 #ifdef __PALM_OS__
-const byte *default_scale_table;
+byte *default_scale_table;
 #else
-const byte default_scale_table[768] = {
+byte default_scale_table[768] = {
 	0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
 	0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
 	0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,

Index: bomp.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bomp.cpp,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -d -r2.7 -r2.8
--- bomp.cpp	7 Jun 2003 00:49:35 -0000	2.7
+++ bomp.cpp	19 Jun 2003 12:41:28 -0000	2.8
@@ -328,75 +328,6 @@
 	}
 }
 
-
-static byte _bompScaleTable[] = {
-    0, 128,  64, 192,  32, 160,  96, 224,
-   16, 144,  80, 208,  48, 176, 112, 240,
-    8, 136,  72, 200,  40, 168, 104, 232,
-   24, 152,  88, 216,  56, 184, 120, 248,
-    4, 132,  68, 196,  36, 164, 100, 228,
-   20, 148,  84, 212,  52, 180, 116, 244,
-   12, 140,  76, 204,  44, 172, 108, 236,
-   28, 156,  92, 220,  60, 188, 124, 252,
-    2, 130,  66, 194,  34, 162,  98, 226,
-   18, 146,  82, 210,  50, 178, 114, 242,
-   10, 138,  74, 202,  42, 170, 106, 234,
-   26, 154,  90, 218,  58, 186, 122, 250,
-    6, 134,  70, 198,  38, 166, 102, 230,
-   22, 150,  86, 214,  54, 182, 118, 246,
-   14, 142,  78, 206,  46, 174, 110, 238,
-   30, 158,  94, 222,  62, 190, 126, 254,
-    1, 129,  65, 193,  33, 161,  97, 225,
-   17, 145,  81, 209,  49, 177, 113, 241,
-    9, 137,  73, 201,  41, 169, 105, 233,
-   25, 153,  89, 217,  57, 185, 121, 249,
-    5, 133,  69, 197,  37, 165, 101, 229,
-   21, 149,  85, 213,  53, 181, 117, 245,
-   13, 141,  77, 205,  45, 173, 109, 237,
-   29, 157,  93, 221,  61, 189, 125, 253,
-    3, 131,  67, 195,  35, 163,  99, 227,
-   19, 147,  83, 211,  51, 179, 115, 243,
-   11, 139,  75, 203,  43, 171, 107, 235,
-   27, 155,  91, 219,  59, 187, 123, 251,
-    7, 135,  71, 199,  39, 167, 103, 231,
-   23, 151,  87, 215,  55, 183, 119, 247,
-   15, 143,  79, 207,  47, 175, 111, 239,
-   31, 159,  95, 223,  63, 191, 127, 255,
-
-    0, 128,  64, 192,  32, 160,  96, 224,
-   16, 144,  80, 208,  48, 176, 112, 240,
-    8, 136,  72, 200,  40, 168, 104, 232,
-   24, 152,  88, 216,  56, 184, 120, 248,
-    4, 132,  68, 196,  36, 164, 100, 228,
-   20, 148,  84, 212,  52, 180, 116, 244,
-   12, 140,  76, 204,  44, 172, 108, 236,
-   28, 156,  92, 220,  60, 188, 124, 252,
-    2, 130,  66, 194,  34, 162,  98, 226,
-   18, 146,  82, 210,  50, 178, 114, 242,
-   10, 138,  74, 202,  42, 170, 106, 234,
-   26, 154,  90, 218,  58, 186, 122, 250,
-    6, 134,  70, 198,  38, 166, 102, 230,
-   22, 150,  86, 214,  54, 182, 118, 246,
-   14, 142,  78, 206,  46, 174, 110, 238,
-   30, 158,  94, 222,  62, 190, 126, 254,
-    1, 129,  65, 193,  33, 161,  97, 225,
-   17, 145,  81, 209,  49, 177, 113, 241,
-    9, 137,  73, 201,  41, 169, 105, 233,
-   25, 153,  89, 217,  57, 185, 121, 249,
-    5, 133,  69, 197,  37, 165, 101, 229,
-   21, 149,  85, 213,  53, 181, 117, 245,
-   13, 141,  77, 205,  45, 173, 109, 237,
-   29, 157,  93, 221,  61, 189, 125, 253,
-    3, 131,  67, 195,  35, 163,  99, 227,
-   19, 147,  83, 211,  51, 179, 115, 243,
-   11, 139,  75, 203,  43, 171, 107, 235,
-   27, 155,  91, 219,  59, 187, 123, 251,
-    7, 135,  71, 199,  39, 167, 103, 231,
-   23, 151,  87, 215,  55, 183, 119, 247,
-   15, 143,  79, 207,  47, 175, 111, 239,
-   31, 159,  95, 223,  63, 191, 127, 255,
-};
-
 static byte _bompBitsTable[] = {
 	8, 7, 7, 6, 7, 6, 6, 5, 7, 6, 6, 5, 6, 5, 5, 4,
 	7, 6, 6, 5, 6, 5, 5, 4, 6, 5, 5, 4, 5, 4, 4, 3,
@@ -416,12 +347,14 @@
 	4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0,
 };
 
-int32 setupBompScale(byte * scaling, int32 size, byte scale) {
+extern byte default_scale_table[768];
+
+int32 setupBompScale(byte *scaling, int32 size, byte scale) {
 	uint32 tmp = (256 - (size >> 1));
 	int32 count = (size + 7) >> 3;
-	assert(tmp < sizeof(_bompScaleTable));
-	byte * tmp_ptr = _bompScaleTable + tmp;
-	byte * tmp_scaling = scaling;
+	assert(tmp < sizeof(default_scale_table));
+	byte *tmp_ptr = default_scale_table + tmp;
+	byte *tmp_scaling = scaling;
 	byte a = 0;
 
 	while ((count--) != 0) {