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

Renamed costume scale tables; merged the old costume renderer's scale table with the small scale AKOS scale table (they were identical)

Browse source 
svn-id: r18103
This commit is contained in:
Max Horn 2005-05-15 10:02:13 +00:00
parent 75ffec581f
commit e5bbfe8df9
7 changed files with 31 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

49
backends/PalmOS/Src/builder/scumm/bl_akos.c
View file

@ -1,47 +1,8 @@
#include <PalmOS.h>
#include "b_globals.h"
static void addAkos_oldScaleTable() {
UInt8 oldScaleTable[256] = {
0xFF, 0xFD, 0x7D, 0xBD, 0x3D, 0xDD, 0x5D, 0x9D,
0x1D, 0xED, 0x6D, 0xAD, 0x2D, 0xCD, 0x4D, 0x8D,
0x0D, 0xF5, 0x75, 0xB5, 0x35, 0xD5, 0x55, 0x95,
0x15, 0xE5, 0x65, 0xA5, 0x25, 0xC5, 0x45, 0x85,
0x05, 0xF9, 0x79, 0xB9, 0x39, 0xD9, 0x59, 0x99,
0x19, 0xE9, 0x69, 0xA9, 0x29, 0xC9, 0x49, 0x89,
0x09, 0xF1, 0x71, 0xB1, 0x31, 0xD1, 0x51, 0x91,
0x11, 0xE1, 0x61, 0xA1, 0x21, 0xC1, 0x41, 0x81,
0x01, 0xFB, 0x7B, 0xBB, 0x3B, 0xDB, 0x5B, 0x9B,
0x1B, 0xEB, 0x6B, 0xAB, 0x2B, 0xCB, 0x4B, 0x8B,
0x0B, 0xF3, 0x73, 0xB3, 0x33, 0xD3, 0x53, 0x93,
0x13, 0xE3, 0x63, 0xA3, 0x23, 0xC3, 0x43, 0x83,
0x03, 0xF7, 0x77, 0xB7, 0x37, 0xD7, 0x57, 0x97,
0x17, 0xE7, 0x67, 0xA7, 0x27, 0xC7, 0x47, 0x87,
0x07, 0xEF, 0x6F, 0xAF, 0x2F, 0xCF, 0x4F, 0x8F,
0x0F, 0xDF, 0x5F, 0x9F, 0x1F, 0xBF, 0x3F, 0x7F,
0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE
};
writeRecord(oldScaleTable, sizeof(oldScaleTable), GBVARS_OLDSCALETABLE_INDEX , GBVARS_SCUMM);
}
static void addAkos_defaultScaleTable() {
UInt8 defaultScaleTable[768] = {
static void addAkos_bigCostumeScaleTable() {
UInt8 bigCostumeScaleTable[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,
@ -141,7 +102,7 @@ static void addAkos_defaultScaleTable() {
0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF,
};
writeRecord(defaultScaleTable, sizeof(defaultScaleTable), GBVARS_DEFAULTSCALETABLE_INDEX , GBVARS_SCUMM);
writeRecord(bigCostumeScaleTable, sizeof(bigCostumeScaleTable), GBVARS_bigCostumeScaleTable_INDEX , GBVARS_SCUMM);
}
///////////////////////////////////////////////////////////////////
@ -150,7 +111,5 @@ static void addAkos_defaultScaleTable() {
///////////////////////////////////////////////////////////////////
void addAkos() {
addAkos_oldScaleTable();
addAkos_defaultScaleTable();
addAkos_bigCostumeScaleTable();
}

10
backends/PalmOS/Src/builder/scumm/bl_costume.c
View file

@ -2,8 +2,8 @@
#include "b_globals.h"
static void addCostume_cost_scaleTable() {
byte cost_scaleTable[256] = {
static void addCostume_smallCostumeScaleTable() {
byte smallCostumeScaleTable[256] = {
0xFF, 0xFD, 0x7D, 0xBD, 0x3D, 0xDD, 0x5D, 0x9D,
0x1D, 0xED, 0x6D, 0xAD, 0x2D, 0xCD, 0x4D, 0x8D,
0x0D, 0xF5, 0x75, 0xB5, 0x35, 0xD5, 0x55, 0x95,
@ -37,9 +37,9 @@ static void addCostume_cost_scaleTable() {
0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE
};
writeRecord(cost_scaleTable, sizeof(cost_scaleTable), GBVARS_COSTSCALETABLE_INDEX , GBVARS_SCUMM);
writeRecord(smallCostumeScaleTable, sizeof(smallCostumeScaleTable), GBVARS_COSTSCALETABLE_INDEX , GBVARS_SCUMM);
}
void addCostume() {
addCostume_cost_scaleTable();
}
addCostume_smallCostumeScaleTable();
}

48
scumm/akos.cpp
View file

@ -592,45 +592,9 @@ void AkosRenderer::codec1_genericDecode(Codec1 &v1) {
}
#ifdef __PALM_OS__
const byte *oldScaleTable;
const byte *defaultScaleTable;
const byte *bigCostumeScaleTable;
#else
const byte oldScaleTable[256] = {
0xFF, 0xFD, 0x7D, 0xBD, 0x3D, 0xDD, 0x5D, 0x9D,
0x1D, 0xED, 0x6D, 0xAD, 0x2D, 0xCD, 0x4D, 0x8D,
0x0D, 0xF5, 0x75, 0xB5, 0x35, 0xD5, 0x55, 0x95,
0x15, 0xE5, 0x65, 0xA5, 0x25, 0xC5, 0x45, 0x85,
0x05, 0xF9, 0x79, 0xB9, 0x39, 0xD9, 0x59, 0x99,
0x19, 0xE9, 0x69, 0xA9, 0x29, 0xC9, 0x49, 0x89,
0x09, 0xF1, 0x71, 0xB1, 0x31, 0xD1, 0x51, 0x91,
0x11, 0xE1, 0x61, 0xA1, 0x21, 0xC1, 0x41, 0x81,
0x01, 0xFB, 0x7B, 0xBB, 0x3B, 0xDB, 0x5B, 0x9B,
0x1B, 0xEB, 0x6B, 0xAB, 0x2B, 0xCB, 0x4B, 0x8B,
0x0B, 0xF3, 0x73, 0xB3, 0x33, 0xD3, 0x53, 0x93,
0x13, 0xE3, 0x63, 0xA3, 0x23, 0xC3, 0x43, 0x83,
0x03, 0xF7, 0x77, 0xB7, 0x37, 0xD7, 0x57, 0x97,
0x17, 0xE7, 0x67, 0xA7, 0x27, 0xC7, 0x47, 0x87,
0x07, 0xEF, 0x6F, 0xAF, 0x2F, 0xCF, 0x4F, 0x8F,
0x0F, 0xDF, 0x5F, 0x9F, 0x1F, 0xBF, 0x3F, 0x7F,
0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE
};
const byte defaultScaleTable[768] = {
const byte bigCostumeScaleTable[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,
@ -745,7 +709,7 @@ byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) {
const int scaletableSize = (_vm->_heversion >= 61) ? 128 : 384;
/* implement custom scale table */
v1.scaletable = (_vm->_heversion >= 61) ? oldScaleTable : defaultScaleTable;
v1.scaletable = (_vm->_heversion >= 61) ? smallCostumeScaleTable : bigCostumeScaleTable;
if (_vm->VAR_CUSTOMSCALETABLE != 0xFF && _vm->res.isResourceLoaded(rtString, _vm->VAR(_vm->VAR_CUSTOMSCALETABLE))) {
v1.scaletable = _vm->getStringAddressVar(_vm->VAR_CUSTOMSCALETABLE);
}
@ -1818,13 +1782,11 @@ void ScummEngine_v7::akos_processQueue() {
#include "scumm_globals.h"
_GINIT(Akos)
_GSETPTR(Scumm::defaultScaleTable, GBVARS_DEFAULTSCALETABLE_INDEX, byte, GBVARS_SCUMM)
_GSETPTR(Scumm::oldScaleTable, GBVARS_OLDSCALETABLE_INDEX, byte, GBVARS_SCUMM)
_GSETPTR(Scumm::bigCostumeScaleTable, GBVARS_bigCostumeScaleTable_INDEX, byte, GBVARS_SCUMM)
_GEND
_GRELEASE(Akos)
_GRELEASEPTR(GBVARS_DEFAULTSCALETABLE_INDEX, GBVARS_SCUMM)
_GRELEASEPTR(GBVARS_OLDSCALETABLE_INDEX, GBVARS_SCUMM)
_GRELEASEPTR(GBVARS_bigCostumeScaleTable_INDEX, GBVARS_SCUMM)
_GEND
#endif

6
scumm/akos.h
View file

@ -27,12 +27,6 @@
namespace Scumm {
#ifdef __PALM_OS__
extern const byte *defaultScaleTable;
#else
extern const byte defaultScaleTable[768];
#endif
struct CostumeData;
struct AkosHeader;
struct AkosOffset;

12
scumm/base-costume.h
View file

@ -42,6 +42,18 @@ struct CostumeInfo {
#pragma END_PACK_STRUCTS
#endif
#ifdef __PALM_OS__
extern const byte *smallCostumeScaleTable;
extern const byte *bigCostumeScaleTable;
#else
extern const byte smallCostumeScaleTable[256];
extern const byte bigCostumeScaleTable[768];
#endif
class Actor;
class ScummEngine;
struct VirtScreen;

2
scumm/bomp.cpp
View file

@ -360,7 +360,7 @@ int32 setupBompScale(byte *scaling, int32 size, byte scale) {
count = (256 - size / 2);
assert(0 <= count && count < 768);
tmp_ptr = defaultScaleTable + count;
tmp_ptr = bigCostumeScaleTable + count;
count = (size + 7) / 8;
while (count--) {

8
scumm/costume.cpp
View file

@ -37,9 +37,9 @@ namespace Scumm {
const byte revBitMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
#ifdef __PALM_OS__
const byte *cost_scaleTable;
const byte *smallCostumeScaleTable;
#else
const byte cost_scaleTable[256] = {
const byte smallCostumeScaleTable[256] = {
0xFF, 0xFD, 0x7D, 0xBD, 0x3D, 0xDD, 0x5D, 0x9D,
0x1D, 0xED, 0x6D, 0xAD, 0x2D, 0xCD, 0x4D, 0x8D,
0x0D, 0xF5, 0x75, 0xB5, 0x35, 0xD5, 0x55, 0x95,
@ -100,7 +100,7 @@ byte ClassicCostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) {
CHECK_HEAP
v1.scaletable = cost_scaleTable;
v1.scaletable = smallCostumeScaleTable;
if (_loaded._numColors == 32) {
v1.mask = 7;
@ -1016,7 +1016,7 @@ byte NESCostumeLoader::increaseAnim(Actor *a, int slot) {
#include "scumm_globals.h"
_GINIT(Costume)
_GSETPTR(Scumm::cost_scaleTable, GBVARS_COSTSCALETABLE_INDEX, byte, GBVARS_SCUMM)
_GSETPTR(Scumm::smallCostumeScaleTable, GBVARS_COSTSCALETABLE_INDEX, byte, GBVARS_SCUMM)
_GEND
_GRELEASE(Costume)