aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scumm/akos.cpp30
-rw-r--r--scumm/base-costume.h4
-rw-r--r--scumm/charset.cpp4
-rw-r--r--scumm/costume.cpp32
-rw-r--r--scumm/input.cpp4
-rw-r--r--scumm/player_v2.cpp4
-rw-r--r--scumm/player_v2a.cpp6
7 files changed, 42 insertions, 42 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index 7f34482afe..40ed93a3c1 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -250,7 +250,7 @@ void AkosCostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
}
if (!found) {
error("Sequence not found in actor 0x%X costume %d", a, a->_costume);
- }
+ }
}
}
@@ -276,7 +276,7 @@ void AkosCostumeLoader::costumeDecodeData(Actor *a, int frame, uint usemask) {
error("Sequence not found in actor 0x%X costume %d", a, a->_costume);
}
}
- }
+ }
break;
}
} else {
@@ -312,7 +312,7 @@ void AkosRenderer::setPalette(byte *new_palette) {
if (_vm->_heversion == 70) {
for (i = 0; i < size; i++)
palette[i] = _vm->_HEV7ActorPalette[palette[i]];
- }
+ }
if (size == 256) {
byte color = new_palette[0];
@@ -548,7 +548,7 @@ void AkosRenderer::codec1_genericDecode(Codec1 &v1) {
if (color && !masked && !skip_column) {
pcolor = palette[color];
if (_shadow_mode == 1) {
- if (pcolor == 13)
+ if (pcolor == 13)
pcolor = _shadow_table[*dst];
} else if (_shadow_mode == 2) {
error("codec1_spec2"); // TODO
@@ -591,7 +591,7 @@ void AkosRenderer::codec1_genericDecode(Codec1 &v1) {
} while (1);
}
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
const byte *bigCostumeScaleTable;
#else
const byte bigCostumeScaleTable[768] = {
@@ -919,7 +919,7 @@ byte AkosRenderer::codec1(int xmoveCur, int ymoveCur) {
v1.destptr = (byte *)_out.pixels + v1.y * _out.pitch + v1.x;
codec1_genericDecode(v1);
-
+
return drawFlag;
}
@@ -983,7 +983,7 @@ byte AkosRenderer::codec5(int xmoveCur, int ymoveCur) {
_vm->drawBomp(bdd, !_mirror);
_vm->_bompActorPalettePtr = NULL;
-
+
return 0;
}
@@ -1020,7 +1020,7 @@ void AkosRenderer::akos16DecodeLine(byte *buf, int32 numbytes, int32 dir) {
*buf = akos16.color;
buf += dir;
}
-
+
if (akos16.unk5 == 0) {
AKOS16_FILL_BITS()
bits = akos16.bits & 3;
@@ -1075,7 +1075,7 @@ void AkosRenderer::akos16Decompress(byte *dest, int32 pitch, const byte *src, in
}
maskpitch = _numStrips;
-
+
maskptr = _vm->getMaskBuffer(maskLeft, maskTop, zBuf);
assert(t_height > 0);
@@ -1104,7 +1104,7 @@ byte AkosRenderer::codec16(int xmoveCur, int ymoveCur) {
error("codec16: _actorHitMode not yet implemented");
return 0;
}
-
+
if (!_mirror) {
clip.left = (_actorX - xmoveCur - _width) + 1;
} else {
@@ -1249,7 +1249,7 @@ byte AkosRenderer::codec32(int xmoveCur, int ymoveCur) {
if (diff > 0) {
src.bottom -= diff;
dst.bottom -= diff;
- }
+ }
if (dst.isValidRect() == false)
return 0;
@@ -1352,7 +1352,7 @@ bool ScummEngine::akos_increaseAnim(Actor *a, int chan, const byte *aksq, const
curpos += 3;
break;
case AKC_SoundStuff:
- if (_heversion >= 61)
+ if (_heversion >= 61)
curpos += 6;
else
curpos += 8;
@@ -1780,15 +1780,15 @@ void ScummEngine_v7::akos_processQueue() {
} // End of namespace Scumm
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
#include "scumm_globals.h"
_GINIT(Akos)
-_GSETPTR(Scumm::bigCostumeScaleTable, GBVARS_bigCostumeScaleTable_INDEX, byte, GBVARS_SCUMM)
+_GSETPTR(Scumm::bigCostumeScaleTable, GBVARS_BIGSCALETABLE_INDEX, byte, GBVARS_SCUMM)
_GEND
_GRELEASE(Akos)
-_GRELEASEPTR(GBVARS_bigCostumeScaleTable_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_BIGSCALETABLE_INDEX, GBVARS_SCUMM)
_GEND
#endif
diff --git a/scumm/base-costume.h b/scumm/base-costume.h
index e84433888b..b459ef86ac 100644
--- a/scumm/base-costume.h
+++ b/scumm/base-costume.h
@@ -44,7 +44,7 @@ struct CostumeInfo {
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
extern const byte *smallCostumeScaleTable;
extern const byte *bigCostumeScaleTable;
#else
@@ -164,4 +164,4 @@ protected:
} // End of namespace Scumm
-#endif
+#endif \ No newline at end of file
diff --git a/scumm/charset.cpp b/scumm/charset.cpp
index 03d99a8a87..84b591ad20 100644
--- a/scumm/charset.cpp
+++ b/scumm/charset.cpp
@@ -438,7 +438,7 @@ loc_avoid_ks_fe:
setCurID(oldID);
}
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
static byte *englishCharsetDataV2;
static byte *germanCharsetDataV2;
static byte *frenchCharsetDataV2;
@@ -1809,7 +1809,7 @@ void CharsetRendererNES::drawBits1(const Graphics::Surface &s, byte *dst, const
} // End of namespace Scumm
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
#include "scumm_globals.h"
_GINIT(Charset)
diff --git a/scumm/costume.cpp b/scumm/costume.cpp
index 25eee95183..f39e41ac18 100644
--- a/scumm/costume.cpp
+++ b/scumm/costume.cpp
@@ -27,14 +27,14 @@
#include "scumm/sound.h"
#include "scumm/util.h"
-#if defined(__PALM_OS__)
+#if defined(PALMOS_68K)
#include "arm/native.h"
#include "arm/macros.h"
#endif
namespace Scumm {
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
const byte *smallCostumeScaleTable;
#else
const byte smallCostumeScaleTable[256] = {
@@ -78,7 +78,7 @@ static const int v1MMNESLookup[25] = {
0x02, 0x00, 0x07, 0x0C, 0x04,
0x09, 0x0A, 0x12, 0x0B, 0x14,
0x0D, 0x11, 0x0F, 0x0E, 0x10,
- 0x17, 0x00, 0x01, 0x05, 0x16
+ 0x17, 0x00, 0x01, 0x05, 0x16
};
@@ -92,7 +92,7 @@ byte ClassicCostumeRenderer::mainRoutine(int xmoveCur, int ymoveCur) {
int step;
Codec1 v1;
-
+
const int scaletableSize = 128;
const bool newAmiCost = (_vm->_version == 5) && (_vm->_platform == Common::kPlatformAmiga);
@@ -383,7 +383,7 @@ void ClassicCostumeRenderer::procC64(Codec1 &v1, int actor) {
while (len--) {
if (!rep)
color = *src++;
-
+
if (0 <= y && y < _out.h && 0 <= v1.x && v1.x < _out.w) {
if (!_mirror) {
LINE(0, 0); LINE(2, 2); LINE(4, 4); LINE(6, 6);
@@ -414,7 +414,7 @@ void ClassicCostumeRenderer::procC64(Codec1 &v1, int actor) {
#undef MASK_AT
void ClassicCostumeRenderer::proc3(Codec1 &v1) {
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
ARM_START(CostumeProc3Type)
ARM_INIT(SCUMM_PROC3)
ARM_ADDP(v1)
@@ -467,7 +467,7 @@ void ClassicCostumeRenderer::proc3(Codec1 &v1) {
do {
if (_scaleY == 255 || *scaleytab++ < _scaleY) {
masked = (y < 0 || y >= _out.h) || (v1.mask_ptr && (mask[0] & maskbit));
-
+
if (color && !masked) {
if (_shadow_mode & 0x20) {
pcolor = _shadow_table[*dst];
@@ -534,7 +534,7 @@ void ClassicCostumeRenderer::proc3_ami(Codec1 &v1) {
do {
if (_scaleY == 255 || v1.scaletable[_scaleIndexY] < _scaleY) {
masked = (y < 0 || y >= _out.h) || (v1.mask_ptr && (mask[0] & maskbit));
-
+
if (color && v1.x >= 0 && v1.x < _out.w && !masked) {
*dst = _palette[color];
}
@@ -608,8 +608,8 @@ void ClassicCostumeLoader::loadCostume(int id) {
error("Costume %d with format 0x%X is invalid", id, _format);
}
-
- // In GF_OLD_BUNDLE games, there is no actual palette, just a single color byte.
+
+ // In GF_OLD_BUNDLE games, there is no actual palette, just a single color byte.
// Don't forget, these games were designed around a fixed 16 color HW palette :-)
// In addition, all offsets are shifted by 2; we accomodate that via a separate
// _baseptr value (instead of adding tons of if's throughout the code).
@@ -729,7 +729,7 @@ byte ClassicCostumeRenderer::drawLimb(const Actor *a, int limb) {
// Determine the position the limb is at
i = cost.curpos[limb] & 0x7FFF;
-
+
// Get the frame pointer for that limb
frameptr = _loaded._baseptr + READ_LE_UINT16(_loaded._frameOffsets + limb * 2);
@@ -914,12 +914,12 @@ byte ClassicCostumeLoader::increaseAnim(Actor *a, int slot) {
i = a->_cost.curpos[slot] & 0x7FFF;
end = a->_cost.end[slot];
code = _animCmds[i] & 0x7F;
-
+
if (_vm->_version <= 3) {
if (_animCmds[i] & 0x80)
a->_cost.soundCounter++;
}
-
+
do {
if (!highflag) {
if (i++ >= end)
@@ -1044,15 +1044,15 @@ byte C64CostumeLoader::increaseAnim(Actor *a, int slot) {
} // End of namespace Scumm
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
#include "scumm_globals.h"
_GINIT(Costume)
-_GSETPTR(Scumm::smallCostumeScaleTable, GBVARS_COSTSCALETABLE_INDEX, byte, GBVARS_SCUMM)
+_GSETPTR(Scumm::smallCostumeScaleTable, GBVARS_SMALLSCALETABLE_INDEX, byte, GBVARS_SCUMM)
_GEND
_GRELEASE(Costume)
-_GRELEASEPTR(GBVARS_COSTSCALETABLE_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_SMALLSCALETABLE_INDEX, GBVARS_SCUMM)
_GEND
#endif
diff --git a/scumm/input.cpp b/scumm/input.cpp
index 2b5871fdcf..5e1b56aacb 100644
--- a/scumm/input.cpp
+++ b/scumm/input.cpp
@@ -150,7 +150,7 @@ void ScummEngine::parseEvents() {
case OSystem::EVENT_LBUTTONDOWN:
_leftBtnPressed |= msClicked|msDown;
-#if defined(_WIN32_WCE) || defined(__PALM_OS__)
+#if defined(_WIN32_WCE) || defined(PALMOS_MODE)
_mouse.x = event.mouse.x;
_mouse.y = event.mouse.y;
@@ -164,7 +164,7 @@ void ScummEngine::parseEvents() {
case OSystem::EVENT_RBUTTONDOWN:
_rightBtnPressed |= msClicked|msDown;
-#if defined(_WIN32_WCE) || defined(__PALM_OS__)
+#if defined(_WIN32_WCE) || defined(PALMOS_MODE)
_mouse.x = event.mouse.x;
_mouse.y = event.mouse.y;
diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp
index 0d70944915..53c5821adf 100644
--- a/scumm/player_v2.cpp
+++ b/scumm/player_v2.cpp
@@ -41,7 +41,7 @@ namespace Scumm {
#define FB_WNOISE 0x12000 /* feedback for white noise */
#define FB_PNOISE 0x08000 /* feedback for periodic noise */
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
const uint8 *note_lengths;
static const uint16 *hull_offsets;
static const int16 *hulls;
@@ -976,7 +976,7 @@ void Player_V2::mutex_down() {
} // End of namespace Scumm
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
#include "scumm_globals.h"
_GINIT(PlayerV2)
diff --git a/scumm/player_v2a.cpp b/scumm/player_v2a.cpp
index 042ef2e3a4..015993d589 100644
--- a/scumm/player_v2a.cpp
+++ b/scumm/player_v2a.cpp
@@ -29,7 +29,7 @@ namespace Scumm {
#define BASE_FREQUENCY 3579545
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
static uint32 *CRCtable = NULL;
#else
static uint32 CRCtable[256];
@@ -1306,7 +1306,7 @@ Player_V2A::Player_V2A(ScummEngine *scumm) {
int i;
_vm = scumm;
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
if (!CRCtable) CRCtable = (uint32 *)calloc(256, sizeof(uint32));
#endif
InitCRC();
@@ -1322,7 +1322,7 @@ Player_V2A::Player_V2A(ScummEngine *scumm) {
Player_V2A::~Player_V2A() {
delete _mod;
-#ifdef __PALM_OS__
+#ifdef PALMOS_68K
free(CRCtable);
#endif
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-13 13:02:06 +0000