aboutsummaryrefslogtreecommitdiff
path: root/scumm/costume.cpp
diff options
context:
space:
mode:
authorMax Horn2005-05-15 10:02:13 +0000
committerMax Horn2005-05-15 10:02:13 +0000
commite5bbfe8df9e3fb291d840a3cbcdc947185bfd3fa (patch)
tree39eec7a269a702635a1f5fe5709f4e273eddda00 /scumm/costume.cpp
parent75ffec581ff8eaf040bfc6292e034528923352e4 (diff)
downloadscummvm-rg350-e5bbfe8df9e3fb291d840a3cbcdc947185bfd3fa.tar.gz
scummvm-rg350-e5bbfe8df9e3fb291d840a3cbcdc947185bfd3fa.tar.bz2
scummvm-rg350-e5bbfe8df9e3fb291d840a3cbcdc947185bfd3fa.zip
Renamed costume scale tables; merged the old costume renderer's scale table with the small scale AKOS scale table (they were identical)
svn-id: r18103
Diffstat (limited to 'scumm/costume.cpp')
-rw-r--r--scumm/costume.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp
index ee5c257b99..03d87455a8 100644
--- a/scumm/costume.cpp
+++ b/scumm/costume.cpp
@@ -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)