aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/cge/bitmap.cpp17
-rw-r--r--engines/cge/cge.cpp10
-rw-r--r--engines/cge/cge.h18
-rw-r--r--engines/cge/cge_main.cpp54
-rw-r--r--engines/cge/cge_main.h94
-rw-r--r--engines/cge/config.cpp2
-rw-r--r--engines/cge/events.cpp2
-rw-r--r--engines/cge/snail.cpp20
-rw-r--r--engines/cge/snail.h9
-rw-r--r--engines/cge/startup.cpp2
-rw-r--r--engines/cge/talk.h4
-rw-r--r--engines/cge/text.cpp6
-rw-r--r--engines/cge/text.h2
-rw-r--r--engines/cge/vga13h.cpp24
-rw-r--r--engines/cge/vga13h.h9
-rw-r--r--engines/cge/walk.cpp14
-rw-r--r--engines/cge/walk.h2
17 files changed, 133 insertions, 156 deletions
diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp
index 8f335fed60..023e95a8f1 100644
--- a/engines/cge/bitmap.cpp
+++ b/engines/cge/bitmap.cpp
@@ -31,6 +31,7 @@
#include "cge/vol.h"
#include "cge/cfile.h"
#include "cge/vga13h.h"
+#include "cge/cge_main.h"
#include "common/system.h"
#include "common/debug.h"
#include "common/debug-channels.h"
@@ -108,7 +109,7 @@ Bitmap::Bitmap(uint16 w, uint16 h, uint8 fill)
*(uint16 *) v = kBmpCPY | dsiz; // data chunk hader
memset(v + 2, fill, dsiz); // data bytes
- *(uint16 *)(v + lsiz - 2) = kBmpSKP | ((SCR_WID / 4) - dsiz); // gap
+ *(uint16 *)(v + lsiz - 2) = kBmpSKP | ((kScrWidth / 4) - dsiz); // gap
// Replicate lines
byte *destP;
@@ -122,7 +123,7 @@ Bitmap::Bitmap(uint16 w, uint16 h, uint8 fill)
Common::copy(v, v + psiz, destP);
HideDesc *b = (HideDesc *)(v + 4 * psiz);
- b->_skip = (SCR_WID - _w) >> 2;
+ b->_skip = (kScrWidth - _w) >> 2;
b->_hide = _w >> 2;
// Replicate across the entire table
@@ -257,9 +258,9 @@ BMP_PTR Bitmap::code() {
}
bm += _w;
- if (_w < SCR_WID) {
+ if (_w < kScrWidth) {
if (skip) {
- cnt += (SCR_WID - j + 3) / 4;
+ cnt += (kScrWidth - j + 3) / 4;
} else {
cnt |= kBmpCPY;
if (_v)
@@ -268,7 +269,7 @@ BMP_PTR Bitmap::code() {
cp = (uint16 *) im;
im += 2;
skip = true;
- cnt = (SCR_WID - j + 3) / 4;
+ cnt = (kScrWidth - j + 3) / 4;
}
}
}
@@ -298,14 +299,14 @@ BMP_PTR Bitmap::code() {
cnt = 0;
for (i = 0; i < _h; i++) {
if (_b[i]._skip == 0xFFFF) { // whole line is skipped
- _b[i]._skip = (cnt + SCR_WID) >> 2;
+ _b[i]._skip = (cnt + kScrWidth) >> 2;
cnt = 0;
} else {
uint16 s = _b[i]._skip & ~3;
uint16 h = (_b[i]._hide + 3) & ~3;
_b[i]._skip = (cnt + s) >> 2;
_b[i]._hide = (h - s) >> 2;
- cnt = SCR_WID - h;
+ cnt = kScrWidth - h;
}
}
@@ -324,7 +325,7 @@ bool Bitmap::solidAt(int16 x, int16 y) {
m = _v;
r = static_cast<uint16>(x) % 4;
- n0 = (SCR_WID * y + x) / 4, n = 0;
+ n0 = (kScrWidth * y + x) / 4, n = 0;
while (r) {
uint16 w, t;
diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index a3478b14f8..58c32dd575 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -85,15 +85,15 @@ void CGEEngine::setup() {
_heart = new Heart;
_sys = new System(this);
_pocLight = new PocLight(this);
- for (int i = 0; i < POCKET_NX; i++) {
+ for (int i = 0; i < kPocketNX; i++) {
_pocket[i] = new Sprite(this, NULL);
_pocket[i]->_flags._kill = false;
}
_sprite = new Sprite(this, NULL);
_horzLine = new HorizLine(this);
- _infoLine = new InfoLine(this, INFO_W);
+ _infoLine = new InfoLine(this, kInfoW);
_cavLight = new CavLight(this);
- _debugLine = new InfoLine(this, SCR_WID);
+ _debugLine = new InfoLine(this, kScrWidth);
_snail = new Snail(this, false);
_snail_ = new Snail(this, true);
@@ -104,7 +104,7 @@ void CGEEngine::setup() {
_music = true;
_mini = new byte[MINI_EMM_SIZE];
- for (int i = 0; i < POCKET_NX; i++)
+ for (int i = 0; i < kPocketNX; i++)
_pocref[i] = -1;
_volume[0] = 0;
_volume[1] = 0;
@@ -165,7 +165,7 @@ CGEEngine::~CGEEngine() {
delete _pocLight;
delete _keyboard;
delete _mouse;
- for (int i = 0; i < POCKET_NX; i++)
+ for (int i = 0; i < kPocketNX; i++)
delete _pocket[i];
delete _snail;
delete _snail_;
diff --git a/engines/cge/cge.h b/engines/cge/cge.h
index 5bc97d6eff..255dadfac6 100644
--- a/engines/cge/cge.h
+++ b/engines/cge/cge.h
@@ -35,13 +35,21 @@
#include "cge/console.h"
#include "cge/bitmap.h"
-#define CGE_SAVEGAME_VERSION 1
-
namespace CGE {
class Console;
class Sprite;
+#define CGE_SAVEGAME_VERSION 1
+#define kPocketX 174
+#define kPocketY 176
+#define kPocketDX 18
+#define kPocketDY 22
+#define kPocketNX 8
+#define kPocketNY 1
+#define kPocketSX 8
+#define kPocketSY 3
+
// our engine debug channels
enum {
kCGEDebugBitmap = 1 << 0,
@@ -58,10 +66,6 @@ enum CallbackType {
kSnSelect, kSndSetVolume
};
-#define POCKET_NX 8
-
-#define CGE_SAVEGAME_VERSION 1
-
struct SavegameHeader {
uint8 version;
Common::String saveName;
@@ -100,7 +104,7 @@ public:
bool _jbw;
int _pocPtr;
bool _music;
- int _pocref[POCKET_NX];
+ int _pocref[kPocketNX];
uint8 _volume[2];
int _maxCaveArr[5];
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 3ebec73030..22e38618cb 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -57,7 +57,7 @@ namespace CGE {
#define STACK_SIZ 2048
#define SVGCHKSUM (1956 + _now + _oldLev + _game + _music + _demoText)
-#define SVG0NAME ("{{INIT}}" SVG_EXT)
+#define SVG0NAME ("{{INIT}}" kSvgExt)
#define SVG0FILE INI_FILE
uint16 _stklen = (STACK_SIZ * 2);
@@ -69,7 +69,7 @@ Sprite *_pocLight;
EventManager *_eventManager;
Keyboard *_keyboard;
Mouse *_mouse;
-Sprite *_pocket[POCKET_NX];
+Sprite *_pocket[kPocketNX];
Sprite *_sprite;
Sprite *_miniCave;
Sprite *_shadow;
@@ -127,7 +127,7 @@ void CGEEngine::syncHeader(Common::Serializer &s) {
s.syncAsByte(_barriers[i]._horz);
s.syncAsByte(_barriers[i]._vert);
}
- for (i = 0; i < POCKET_NX; ++i)
+ for (i = 0; i < kPocketNX; ++i)
s.syncAsUint16LE(_pocref[i]);
if (s.isSaving()) {
@@ -291,7 +291,7 @@ void CGEEngine::writeSavegameHeader(Common::OutSaveFile *out, SavegameHeader &he
// Create a thumbnail and save it
Graphics::Surface *thumb = new Graphics::Surface();
Graphics::Surface *s = _vga->_page[0];
- ::createThumbnail(thumb, (const byte *)s->pixels, SCR_WID, SCR_HIG, thumbPalette);
+ ::createThumbnail(thumb, (const byte *)s->pixels, kScrWidth, kScrHeight, thumbPalette);
Graphics::saveThumbnail(*out, *thumb);
delete thumb;
@@ -312,7 +312,7 @@ void CGEEngine::syncGame(Common::SeekableReadStream *readStream, Common::WriteSt
Common::Serializer s(readStream, writeStream);
if (s.isSaving()) {
- for (i = 0; i < POCKET_NX; i++) {
+ for (i = 0; i < kPocketNX; i++) {
register Sprite *s = _pocket[i];
_pocref[i] = (s) ? s->_ref : -1;
}
@@ -355,7 +355,7 @@ void CGEEngine::syncGame(Common::SeekableReadStream *readStream, Common::WriteSt
_vga->_spareQ->append(spr);
}
- for (i = 0; i < POCKET_NX; i++) {
+ for (i = 0; i < kPocketNX; i++) {
register int r = _pocref[i];
delete _pocket[i];
_pocket[i] = (r < 0) ? NULL : _vga->_spareQ->locate(r);
@@ -701,7 +701,7 @@ void CGEEngine::switchCave(int cav) {
}
System::System(CGEEngine *vm) : Sprite(vm, NULL), _vm(vm) {
- _funDel = HEROFUN0;
+ _funDel = kHeroFun0;
setPal();
tick();
}
@@ -717,7 +717,7 @@ void System::setPal() {
}
void System::funTouch() {
- uint16 n = (PAIN) ? HEROFUN1 : HEROFUN0;
+ uint16 n = (PAIN) ? kHeroFun1 : kHeroFun0;
if (_talk == NULL || n > _funDel)
_funDel = n;
}
@@ -836,8 +836,8 @@ void System::touch(uint16 mask, int x, int y) {
return;
int cav = 0;
_infoLine->update(NULL);
- if (y >= WORLD_HIG) {
- if (x < BUTTON_X) { // select cave?
+ if (y >= kWorldHeight ) {
+ if (x < kButtonX) { // select cave?
if (y >= CAVE_Y && y < CAVE_Y + CAVE_NY * CAVE_DY &&
x >= CAVE_X && x < CAVE_X + CAVE_NX * CAVE_DX && !_vm->_game) {
cav = ((y - CAVE_Y) / CAVE_DY) * CAVE_NX + (x - CAVE_X) / CAVE_DX + 1;
@@ -847,9 +847,9 @@ void System::touch(uint16 mask, int x, int y) {
cav = 0;
}
} else if (mask & L_UP) {
- if (y >= POCKET_Y && y < POCKET_Y + POCKET_NY * POCKET_DY &&
- x >= POCKET_X && x < POCKET_X + POCKET_NX * POCKET_DX) {
- int n = ((y - POCKET_Y) / POCKET_DY) * POCKET_NX + (x - POCKET_X) / POCKET_DX;
+ if (y >= kPocketY && y < kPocketY + kPocketNY * kPocketDY &&
+ x >= kPocketX && x < kPocketX + kPocketNX * kPocketDX) {
+ int n = ((y - kPocketY) / kPocketDY) * kPocketNX + (x - kPocketX) / kPocketDX;
_vm->selectPocket(n);
}
}
@@ -889,7 +889,7 @@ void System::tick() {
else if (Startup::_core >= CORE_MID) {
int n = new_random(100);
if (n > 96)
- _vm->heroCover(6 + (_hero->_x + _hero->_w / 2 < SCR_WID / 2));
+ _vm->heroCover(6 + (_hero->_x + _hero->_w / 2 < kScrWidth / 2));
else {
if (n > 90)
_vm->heroCover(5);
@@ -904,7 +904,7 @@ void System::tick() {
}
funTouch();
}
- _time = SYSTIMERATE;
+ _time = kSystemRate;
}
void CGEEngine::switchColorMode() {
@@ -1106,7 +1106,7 @@ void CGEEngine::optionTouch(int opt, uint16 mask) {
else if (mask & R_UP)
if (!Mixer::_appear) {
Mixer::_appear = true;
- new Mixer(this, BUTTON_X, BUTTON_Y);
+ new Mixer(this, kButtonX, kButtonY);
}
break;
case 3 :
@@ -1137,7 +1137,7 @@ void Sprite::touch(uint16 mask, int x, int y) {
if ((mask & R_UP) && _snail->idle()) {
Sprite *ps = (_pocLight->_seqPtr) ? _pocket[_vm->_pocPtr] : NULL;
if (ps) {
- if (_flags._kept || _hero->distance(this) < MAX_DISTANCE) {
+ if (_flags._kept || _hero->distance(this) < kDistMax) {
if (works(ps)) {
_vm->feedSnail(ps, kTake);
} else
@@ -1149,7 +1149,7 @@ void Sprite::touch(uint16 mask, int x, int y) {
if (_flags._kept)
mask |= L_UP;
else {
- if (_hero->distance(this) < MAX_DISTANCE) {
+ if (_hero->distance(this) < kDistMax) {
///
if (_flags._port) {
if (_vm->findPocket(NULL) < 0)
@@ -1177,7 +1177,7 @@ void Sprite::touch(uint16 mask, int x, int y) {
if ((mask & L_UP) && _snail->idle()) {
if (_flags._kept) {
int n;
- for (n = 0; n < POCKET_NX; n++) {
+ for (n = 0; n < kPocketNX; n++) {
if (_pocket[n] == this) {
_vm->selectPocket(n);
break;
@@ -1200,7 +1200,7 @@ void CGEEngine::loadSprite(const char *fname, int ref, int cav, int col = 0, int
static const char *Type[] = { "DEAD", "AUTO", "WALK", "NEWTON", "LISSAJOUS",
"FLY", NULL
};
- char line[LINE_MAX];
+ char line[kLineMax];
int shpcnt = 0;
int type = 0; // DEAD
@@ -1345,7 +1345,7 @@ void CGEEngine::loadSprite(const char *fname, int ref, int cav, int col = 0, int
void CGEEngine::loadScript(const char *fname) {
- char line[LINE_MAX];
+ char line[kLineMax];
char *SpN;
int SpI, SpA, SpX, SpY, SpZ;
bool BkG = false;
@@ -1483,7 +1483,7 @@ void CGEEngine::loadUser() {
error("Creating setup savegames not supported");
}
}
- loadScript(progName(IN0_EXT));
+ loadScript(progName(kIn0Ext));
}
@@ -1538,7 +1538,7 @@ void CGEEngine::runGame() {
uint8 *ptr = (uint8 *) &*_mini;
if (ptr != NULL) {
- loadSprite("MINI", -1, 0, MINI_X, MINI_Y);
+ loadSprite("MINI", -1, 0, kMiniX, kMiniY);
expandSprite(_miniCave = _sprite); // NULL is ok
if (_miniCave) {
_miniCave->_flags._kill = false;
@@ -1567,7 +1567,7 @@ void CGEEngine::runGame() {
}
}
- _infoLine->gotoxy(INFO_X, INFO_Y);
+ _infoLine->gotoxy(kInfoX, kInfoY);
_infoLine->_flags._tran = true;
_infoLine->update(NULL);
_vga->_showQ->insert(_infoLine);
@@ -1579,7 +1579,7 @@ void CGEEngine::runGame() {
_horzLine->_z = 126;
_vga->_showQ->insert(_horzLine);
- _mouse->_busy = _vga->_spareQ->locate(BUSY_REF);
+ _mouse->_busy = _vga->_spareQ->locate(kBusyRef);
if (_mouse->_busy)
expandSprite(_mouse->_busy);
@@ -1688,7 +1688,7 @@ bool CGEEngine::showTitle(const char *name) {
if (Startup::_mode < 2) {
if (_isDemo) {
- strcpy(_usrFnam, progName(SVG_EXT));
+ strcpy(_usrFnam, progName(kSvgExt));
usr_ok = true;
} else {
//-----------------------------------------
@@ -1792,7 +1792,7 @@ void CGEEngine::cge_main() {
movie("X03");
} else {
if (Startup::_mode < 2)
- movie(LGO_EXT);
+ movie(kLgoExt);
if (showTitle("WELCOME")) {
if ((!_isDemo) && (Startup::_mode == 1))
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h
index 103c718759..68c6f1f1dc 100644
--- a/engines/cge/cge_main.h
+++ b/engines/cge/cge_main.h
@@ -33,34 +33,6 @@
#include "cge/events.h"
namespace CGE {
-
-#define TSEQ 96
-#define HTALK (TSEQ + 4)
-#define TOO_FAR (TSEQ + 5)
-#define NO_WAY (TSEQ + 5)
-#define POC_FUL (TSEQ + 5)
-#define OFF_USE (TSEQ + 6)
-#define EXIT_OK_TEXT 40
-#define NOMUSIC_TEXT 98
-#define BADSVG_TEXT 99
-#define OFF_USE_COUNT 600
-#define OFF_USE_TEXT 601
-#define NO_WAY_TEXT 671
-#define TOO_FAR_TEXT 681
-#define POC_FUL_TEXT 691
-#define A_C_D_TEXT 777
-#define GETNAME_PROMPT 50
-#define GETNAME_TITLE 51
-#define QUIT_TITLE 200
-#define QUIT_TEXT 201
-#define NOQUIT_TEXT 202
-#define DEMO_TEXT 300
-#define NOSOUND_TEXT 310
-#define PAN_HIG 40
-#define WORLD_HIG (SCR_HIG - PAN_HIG)
-#define INFO_X 177
-#define INFO_Y 164
-#define INFO_W 140
#define CAVE_X 4
#define CAVE_Y 166
#define CAVE_SX 0
@@ -77,33 +49,51 @@ namespace CGE {
#define CAVE_NX 8
#define CAVE_NY 3
#endif
-
-#define BUTTON_X 151
-#define BUTTON_Y 164
-#define BUTTON_DX 19
-#define BUTTON_DY 11
-#define BUTTON_NX 1
-#define BUTTON_NY 3
-#define MINI_X 86
-#define MINI_Y 162
-#define LINE_MAX 512
-#define USER_MAX 100
-#define SHP_MAX 1024
-#define STD_DELAY 3
-#define LEV_MAX 5
#define CAVE_MAX (CAVE_NX * CAVE_NY)
-#define MAX_DISTANCE 3
-#define INI_EXT ".INI"
-#define IN0_EXT ".IN0"
-#define LGO_EXT ".LGO"
-#define SVG_EXT ".SVG"
-#define WALKSIDE 10
-#define BUSY_REF 500
-#define SYSTIMERATE 6 // 12 Hz
-#define HEROFUN0 (40 * 12)
-#define HEROFUN1 ( 2 * 12)
#define PAIN (_vm->_flag[0])
+#define kInfoX 177
+#define kInfoY 164
+#define kInfoW 140
+#define kButtonX 151
+#define kButtonY 164
+#define kMiniX 86
+#define kMiniY 162
+#define kLineMax 512
+#define kDistMax 3
+#define kIn0Ext ".IN0"
+#define kLgoExt ".LGO"
+#define kSvgExt ".SVG"
+#define kWalkSide 10
+#define kBusyRef 500
+#define kSystemRate 6 // 12 Hz
+#define kHeroFun0 (40 * 12)
+#define kHeroFun1 ( 2 * 12)
+#define GETNAME_PROMPT 50
+#define GETNAME_TITLE 51
+#define TSEQ 96
+#define NOMUSIC_TEXT 98
+#define BADSVG_TEXT 99
+#define HTALK (TSEQ + 4)
+#define TOO_FAR (TSEQ + 5)
+#define NO_WAY (TSEQ + 5)
+#define POC_FUL (TSEQ + 5)
+#define OFF_USE (TSEQ + 6)
+#define QUIT_TITLE 200
+#define QUIT_TEXT 201
+#define NOQUIT_TEXT 202
+#define DEMO_TEXT 300
+#define NOSOUND_TEXT 310
+#define OFF_USE_COUNT 600
+#define OFF_USE_TEXT 601
+#define NO_WAY_TEXT 671
+#define TOO_FAR_TEXT 681
+#define POC_FUL_TEXT 691
+#define A_C_D_TEXT 777
+#define kPanHeight 40
+#define kScrWidth 320
+#define kScrHeight 200
+#define kWorldHeight (kScrHeight - kPanHeight)
class System : public Sprite {
int _lum;
diff --git a/engines/cge/config.cpp b/engines/cge/config.cpp
index 2649afc241..964b029b59 100644
--- a/engines/cge/config.cpp
+++ b/engines/cge/config.cpp
@@ -43,7 +43,7 @@ void CGEEngine::snSelect() {
inf(_text->getText(_hlp));
_talk->gotoxy(_talk->_x, kFontHigh / 2);
- (new Vmenu(this, _cho, SCR_WID / 2, _talk->_y + _talk->_h + kTextVMargin + kFontHigh))->setName(_text->getText(MENU_TEXT));
+ (new Vmenu(this, _cho, kScrWidth / 2, _talk->_y + _talk->_h + kTextVMargin + kFontHigh))->setName(_text->getText(MENU_TEXT));
}
} // End of namespace CGE
diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp
index eba043cdc8..aa71782f77 100644
--- a/engines/cge/events.cpp
+++ b/engines/cge/events.cpp
@@ -169,7 +169,7 @@ Mouse::Mouse(CGEEngine *vm) : Sprite(vm, NULL), _busy(NULL), _hold(NULL), _hx(0)
MC[2] = NULL;
setShapeList(MC);
- gotoxy(SCR_WID/2, SCR_HIG/2);
+ gotoxy(kScrWidth/2, kScrHeight/2);
_z = 127;
step(1);
}
diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp
index c4b4b383d0..e9ae494811 100644
--- a/engines/cge/snail.cpp
+++ b/engines/cge/snail.cpp
@@ -107,11 +107,11 @@ void CGEEngine::snGame(Sprite *spr, int num) {
SNPOST(SNPAUSE, -1, 72, NULL); // chwilk‘...
SNPOST(SNSEQ, -1, 0, dup[1]); // odstaw Go
- SNPOST(SNSETXY, -1, 203 + SCR_WID * 49, dup[1]);
+ SNPOST(SNSETXY, -1, 203 + kScrWidth * 49, dup[1]);
SNPOST(SNSETZ, -1, 7, dup[1]);
SNPOST(SNSEQ, -1, 0, dup[2]); // odstaw J†
- SNPOST(SNSETXY, -1, 182 + SCR_WID * 62, dup[2]);
+ SNPOST(SNSETXY, -1, 182 + kScrWidth * 62, dup[2]);
SNPOST(SNSETZ, -1, 9, dup[2]);
_game = 0;
return;
@@ -274,7 +274,7 @@ void CGEEngine::contractSprite(Sprite *spr) {
int CGEEngine::findPocket(Sprite *spr) {
debugC(1, kCGEDebugEngine, "CGEEngine::findPocket(spr)");
- for (int i = 0; i < POCKET_NX; i++)
+ for (int i = 0; i < kPocketNX; i++)
if (_pocket[i] == spr)
return i;
return -1;
@@ -295,7 +295,7 @@ void CGEEngine::selectPocket(int n) {
_pocLight->step(1);
}
}
- _pocLight->gotoxy(POCKET_X + _pocPtr * POCKET_DX + POCKET_SX, POCKET_Y + POCKET_SY);
+ _pocLight->gotoxy(kPocketX + _pocPtr * kPocketDX + kPocketSX, kPocketY + kPocketSY);
}
void CGEEngine::pocFul() {
@@ -688,7 +688,7 @@ void CGEEngine::snSetXY(Sprite *spr, uint16 xy) {
debugC(1, kCGEDebugEngine, "CGEEngine::snSetXY(spr, %d)", xy);
if (spr)
- spr->gotoxy(xy % SCR_WID, xy / SCR_WID);
+ spr->gotoxy(xy % kScrWidth, xy / kScrWidth);
}
void CGEEngine::snRelX(Sprite *spr, int x) {
@@ -806,7 +806,7 @@ void CGEEngine::snSound(Sprite *spr, int wav, int cnt) {
if (wav == -1)
_sound.stop();
else
- _sound.play(_fx[wav], (spr) ? ((spr->_x + spr->_w / 2) / (SCR_WID / 16)) : 8, cnt);
+ _sound.play(_fx[wav], (spr) ? ((spr->_x + spr->_w / 2) / (kScrWidth / 16)) : 8, cnt);
}
}
@@ -820,8 +820,8 @@ void CGEEngine::snKeep(Sprite *spr, int stp) {
_pocket[_pocPtr] = spr;
spr->_cave = 0;
spr->_flags._kept = true;
- spr->gotoxy(POCKET_X + POCKET_DX * _pocPtr + POCKET_DX / 2 - spr->_w / 2,
- POCKET_Y + POCKET_DY / 2 - spr->_h / 2);
+ spr->gotoxy(kPocketX + kPocketDX * _pocPtr + kPocketDX / 2 - spr->_w / 2,
+ kPocketY + kPocketDY / 2 - spr->_h / 2);
if (stp >= 0)
spr->step(stp);
}
@@ -1008,13 +1008,13 @@ void Snail::runCom() {
if (spr == _hero && spr->seqTest(-1))
spr->step(HTALK);
_text->say(_text->getText(snc->_val), spr);
- _sys->_funDel = HEROFUN0;
+ _sys->_funDel = kHeroFun0;
}
break;
case SNINF :
if (_talkEnable) {
_vm->inf(_text->getText(snc->_val));
- _sys->_funDel = HEROFUN0;
+ _sys->_funDel = kHeroFun0;
}
break;
case SNTIME :
diff --git a/engines/cge/snail.h b/engines/cge/snail.h
index e8578e2b3d..b8b4dc68ff 100644
--- a/engines/cge/snail.h
+++ b/engines/cge/snail.h
@@ -33,15 +33,6 @@
namespace CGE {
-#define POCKET_X 174
-#define POCKET_Y 176
-#define POCKET_DX 18
-#define POCKET_DY 22
-#define POCKET_NY 1
-
-#define POCKET_SX 8
-#define POCKET_SY 3
-
#define SNINSERT(c, r, v, p) _snail->insCom(c, r, v, p)
#define SNPOST(c, r, v, p) _snail->addCom(c, r, v, p)
#define SNPOST2(c, r, v, p) _snail->addCom2(c, r, v, p)
diff --git a/engines/cge/startup.cpp b/engines/cge/startup.cpp
index 37c6b4f62e..aca58a91ba 100644
--- a/engines/cge/startup.cpp
+++ b/engines/cge/startup.cpp
@@ -157,7 +157,7 @@ Startup::Startup() {
const char *usrPath(const char *nam) {
- static char buf[MAXPATH] = ".\\", *p = buf + 2;
+ static char buf[kPathMax] = ".\\", *p = buf + 2;
#if defined(CD)
if (DriveCD(0)) {
bool ok = false;
diff --git a/engines/cge/talk.h b/engines/cge/talk.h
index e8136271f6..5eab6672e3 100644
--- a/engines/cge/talk.h
+++ b/engines/cge/talk.h
@@ -49,10 +49,10 @@ namespace CGE {
-#define MAXPATH 128
+#define kPathMax 128
class Font {
- char _path[MAXPATH];
+ char _path[kPathMax];
void load();
public:
// static uint8 _wid[256];
diff --git a/engines/cge/text.cpp b/engines/cge/text.cpp
index 1ed640be8a..dd75ea3681 100644
--- a/engines/cge/text.cpp
+++ b/engines/cge/text.cpp
@@ -86,7 +86,7 @@ void Text::preload(int from, int upto) {
INI_FILE tf = _fileName;
if (!tf._error) {
Han *CacheLim = _cache + _size;
- char line[LINE_MAX + 1];
+ char line[kLineMax + 1];
int n;
while ((n = tf.read((uint8 *)line)) != 0) {
@@ -128,7 +128,7 @@ char *Text::load(int idx, int ref) {
INI_FILE tf = _fileName;
if (!tf._error) {
Han *p = &_cache[idx];
- char line[LINE_MAX + 1];
+ char line[kLineMax + 1];
int n;
while ((n = tf.read((uint8 *)line)) != 0) {
@@ -187,7 +187,7 @@ void Text::say(const char *txt, Sprite *spr) {
uint16 sw = spike->_w;
if (east) {
- if (x + sw + kTextRoundCorner + 5 >= SCR_WID)
+ if (x + sw + kTextRoundCorner + 5 >= kScrWidth)
east = false;
} else {
if (x <= 5 + kTextRoundCorner + sw)
diff --git a/engines/cge/text.h b/engines/cge/text.h
index cf917ece61..196bfc4edb 100644
--- a/engines/cge/text.h
+++ b/engines/cge/text.h
@@ -57,7 +57,7 @@ class Text {
char *_txt;
} *_cache;
int _size;
- char _fileName[MAXPATH];
+ char _fileName[kPathMax];
char *load(int idx, int ref);
int find(int ref);
public:
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index 6093681292..24c83f12ee 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -508,7 +508,7 @@ Sprite *Sprite::expand() {
error("No core");
if (*_file) {
static const char *Comd[] = { "Name", "Phase", "Seq", "Near", "Take", NULL };
- char line[LINE_MAX], fname[MAXPATH];
+ char line[kLineMax], fname[kPathMax];
BMP_PTR *shplist = new BMP_PTR[_shpCnt + 1];
Seq *seq = NULL;
int shpcnt = 0,
@@ -713,18 +713,18 @@ void Sprite::killXlat() {
void Sprite::gotoxy(int x, int y) {
int xo = _x, yo = _y;
- if (_x < SCR_WID) {
+ if (_x < kScrWidth) {
if (x < 0)
x = 0;
- if (x + _w > SCR_WID)
- x = (SCR_WID - _w);
+ if (x + _w > kScrWidth)
+ x = (kScrWidth - _w);
_x = x;
}
- if (_h < SCR_HIG) {
+ if (_h < kScrHeight) {
if (y < 0)
y = 0;
- if (y + _h > SCR_HIG)
- y = (SCR_HIG - _h);
+ if (y + _h > kScrHeight)
+ y = (kScrHeight - _h);
_y = y;
}
if (_next)
@@ -736,7 +736,7 @@ void Sprite::gotoxy(int x, int y) {
void Sprite::center() {
- gotoxy((SCR_WID - _w) / 2, (SCR_HIG - _h) / 2);
+ gotoxy((kScrWidth - _w) / 2, (kScrHeight - _h) / 2);
}
@@ -1195,14 +1195,14 @@ void Vga::update() {
_setPal = false;
}
- g_system->copyRectToScreen((const byte *)Vga::_page[0]->getBasePtr(0, 0), SCR_WID, 0, 0, SCR_WID, SCR_HIG);
+ g_system->copyRectToScreen((const byte *)Vga::_page[0]->getBasePtr(0, 0), kScrWidth, 0, 0, kScrWidth, kScrHeight);
g_system->updateScreen();
}
void Vga::clear(uint8 color) {
for (int paneNum = 0; paneNum < 4; ++paneNum)
- _page[paneNum]->fillRect(Common::Rect(0, 0, SCR_WID, SCR_HIG), color);
+ _page[paneNum]->fillRect(Common::Rect(0, 0, kScrWidth, kScrHeight), color);
}
@@ -1216,7 +1216,7 @@ void Bitmap::xShow(int16 x, int16 y) {
debugC(4, kCGEDebugBitmap, "Bitmap::xShow(%d, %d)", x, y);
const byte *srcP = (const byte *)_v;
- byte *destEndP = (byte *)Vga::_page[1]->pixels + (SCR_WID * SCR_HIG);
+ byte *destEndP = (byte *)Vga::_page[1]->pixels + (kScrWidth * kScrHeight);
byte *lookupTable = _m;
// Loop through processing data for each plane. The game originally ran in plane mapped mode, where a
@@ -1269,7 +1269,7 @@ void Bitmap::show(int16 x, int16 y) {
debugC(5, kCGEDebugBitmap, "Bitmap::show(%d, %d)", x, y);
const byte *srcP = (const byte *)_v;
- byte *destEndP = (byte *)Vga::_page[1]->pixels + (SCR_WID * SCR_HIG);
+ byte *destEndP = (byte *)Vga::_page[1]->pixels + (kScrWidth * kScrHeight);
// Loop through processing data for each plane. The game originally ran in plane mapped mode, where a
// given plane holds each fourth pixel sequentially. So to handle an entire picture, each plane's data
diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h
index 13bfce4189..4884ae104e 100644
--- a/engines/cge/vga13h.h
+++ b/engines/cge/vga13h.h
@@ -48,15 +48,6 @@ namespace CGE {
#define TEXT_MODE 0x03
#define M13H 0x13
-#ifndef SCR_WID
-#define SCR_WID 320
-#endif
-
-#ifndef SCR_HIG
-#define SCR_HIG 200
-#endif
-
-
#define LIGHT 0xFF
#define DARK 207
#define DGRAY 225 /*219*/
diff --git a/engines/cge/walk.cpp b/engines/cge/walk.cpp
index b35864f16e..f07ed4ece2 100644
--- a/engines/cge/walk.cpp
+++ b/engines/cge/walk.cpp
@@ -130,8 +130,8 @@ void WALK::tick() {
}
step();
if ((Dir == WW && _x <= 0) ||
- (Dir == EE && _x + _w >= SCR_WID) ||
- (Dir == SS && _y + _w >= WORLD_HIG - 2))
+ (Dir == EE && _x + _w >= kScrWidth) ||
+ (Dir == SS && _y + _w >= kWorldHeight - 2))
park();
else {
signed char x; // dummy var
@@ -143,9 +143,9 @@ void WALK::tick() {
int WALK::distance(Sprite *spr) {
int dx, dz;
- dx = spr->_x - (_x + _w - WALKSIDE);
+ dx = spr->_x - (_x + _w - kWalkSide);
if (dx < 0)
- dx = (_x + WALKSIDE) - (spr->_x + spr->_w);
+ dx = (_x + kWalkSide) - (spr->_x + spr->_w);
if (dx < 0)
dx = 0;
@@ -208,11 +208,11 @@ void WALK::findWay(Sprite *spr) {
int x = spr->_x;
int z = spr->_z;
if (spr->_flags._east)
- x += spr->_w + _w / 2 - WALKSIDE;
+ x += spr->_w + _w / 2 - kWalkSide;
else
- x -= _w / 2 - WALKSIDE;
+ x -= _w / 2 - kWalkSide;
findWay(Cluster((x / MAP_XGRID),
- ((z < MAP_ZCNT - MAX_DISTANCE) ? (z + 1)
+ ((z < MAP_ZCNT - kDistMax) ? (z + 1)
: (z - 1))));
}
}
diff --git a/engines/cge/walk.h b/engines/cge/walk.h
index eb29d9b462..52f372c363 100644
--- a/engines/cge/walk.h
+++ b/engines/cge/walk.h
@@ -38,7 +38,7 @@ namespace CGE {
#define MAP_ZCNT 20
#define MAP_TOP 80
#define MAP_HIG 80
-#define MAP_XGRID (SCR_WID / MAP_XCNT)
+#define MAP_XGRID (kScrWidth / MAP_XCNT)
#define MAP_ZGRID (MAP_HIG / MAP_ZCNT)
#define MAX_FIND_LEVEL 3
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-08 14:37:02 +0000