aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/hdb/ai-bots.cpp32
-rw-r--r--engines/hdb/ai-init.cpp111
-rw-r--r--engines/hdb/ai.h23
-rw-r--r--engines/hdb/gfx.h23
4 files changed, 94 insertions, 95 deletions
diff --git a/engines/hdb/ai-bots.cpp b/engines/hdb/ai-bots.cpp
index 7836bbf74e..aa80e859cf 100644
--- a/engines/hdb/ai-bots.cpp
+++ b/engines/hdb/ai-bots.cpp
@@ -1290,16 +1290,16 @@ void aiDiverterDraw(AIEntity *e, int mx, int my) {
case DIR_UP:
if (e->tileY == e->value1 && e->int2) { // going down or right?
for (i = e->value1 + 1; i < e->value2; i++)
- onScreen += g_hdb->_gfx->_gfxLaserbeamUD[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
- onScreen += g_hdb->_gfx->_gfxLaserbeamUDTop[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamUD[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamUDTop[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
if (onScreen) {
g_hdb->_sound->playSoundEx(SND_LASER_LOOP, kLaserChannel, true);
warning("STUB: Set Laser onScreen to true");
}
} else {
for (i = e->value1 + 1; i < e->value2; i++)
- onScreen += g_hdb->_gfx->_gfxLaserbeamLR[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
- onScreen += g_hdb->_gfx->_gfxLaserbeamLRLeft[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamLR[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamLRLeft[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
if (onScreen) {
g_hdb->_sound->playSoundEx(SND_LASER_LOOP, kLaserChannel, true);
warning("STUB: Set Laser onScreen to true");
@@ -1309,16 +1309,16 @@ void aiDiverterDraw(AIEntity *e, int mx, int my) {
case DIR_DOWN:
if (e->tileY == e->value1 && e->int2) { // going down or left?
for (i = e->value1 + 1; i < e->value2; i++)
- onScreen += g_hdb->_gfx->_gfxLaserbeamUD[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
- onScreen += g_hdb->_gfx->_gfxLaserbeamUDTop[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamUD[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamUDTop[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
if (onScreen) {
g_hdb->_sound->playSoundEx(SND_LASER_LOOP, kLaserChannel, true);
warning("STUB: Set Laser onscreen to true");
}
} else {
for (i = e->value1 - 1; i > e->value2; i--)
- onScreen += g_hdb->_gfx->_gfxLaserbeamLR[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
- onScreen += g_hdb->_gfx->_gfxLaserbeamLRRight[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamLR[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamLRRight[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
if (onScreen) {
g_hdb->_sound->playSoundEx(SND_LASER_LOOP, kLaserChannel, true);
warning("STUB: Set Laser onscreen to true");
@@ -1328,16 +1328,16 @@ void aiDiverterDraw(AIEntity *e, int mx, int my) {
case DIR_LEFT:
if (e->tileY == e->value1 && e->int2) { // going up or left?
for (i = e->value1 - 1; i > e->value2; i--)
- onScreen += g_hdb->_gfx->_gfxLaserbeamUD[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
- onScreen += g_hdb->_gfx->_gfxLaserbeamUDBottom[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamUD[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamUDBottom[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
if (onScreen) {
g_hdb->_sound->playSoundEx(SND_LASER_LOOP, kLaserChannel, true);
warning("STUB: Set Laser onscreen to true");
}
} else {
for (i = e->value1 - 1; i > e->value2; i--)
- onScreen += g_hdb->_gfx->_gfxLaserbeamLR[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
- onScreen += g_hdb->_gfx->_gfxLaserbeamLRRight[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamLR[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamLRRight[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
if (onScreen) {
g_hdb->_sound->playSoundEx(SND_LASER_LOOP, kLaserChannel, true);
warning("STUB: Set Laser onscreen to true");
@@ -1347,16 +1347,16 @@ void aiDiverterDraw(AIEntity *e, int mx, int my) {
case DIR_RIGHT:
if (e->tileY == e->value1 && e->int2) { // going up or right?
for (i = e->value1 - 1; i > e->value2; i--)
- onScreen += g_hdb->_gfx->_gfxLaserbeamUD[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
- onScreen += g_hdb->_gfx->_gfxLaserbeamUDBottom[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamUD[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamUDBottom[frame]->drawMasked(e->x - mx, i * kTileHeight - my);
if (onScreen) {
g_hdb->_sound->playSoundEx(SND_LASER_LOOP, kLaserChannel, true);
warning("STUB: Set Laser onscreen to true");
}
} else {
for (i = e->value1 + 1; i < e->value2; i++)
- onScreen += g_hdb->_gfx->_gfxLaserbeamLR[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
- onScreen += g_hdb->_gfx->_gfxLaserbeamLRLeft[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamLR[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
+ onScreen += g_hdb->_ai->_gfxLaserbeamLRLeft[frame]->drawMasked(i * kTileWidth - mx, e->y - my);
if (onScreen) {
g_hdb->_sound->playSoundEx(SND_LASER_LOOP, kLaserChannel, true);
warning("STUB: Set Laser onscreen to true");
diff --git a/engines/hdb/ai-init.cpp b/engines/hdb/ai-init.cpp
index 29b5ec1377..c19037ff8d 100644
--- a/engines/hdb/ai-init.cpp
+++ b/engines/hdb/ai-init.cpp
@@ -773,19 +773,18 @@ bool AI::init() {
_kcHolderBlackOn = g_hdb->_gfx->getTileIndex("t32_kcholder_black_on");
// icepuff snowball
- g_hdb->_gfx->_icepSnowballGfxDown = g_hdb->_gfx->_icepSnowballGfxLeft =
- g_hdb->_gfx->_icepSnowballGfxRight = NULL;
+ _icepSnowballGfxDown = _icepSnowballGfxLeft =
+ _icepSnowballGfxRight = NULL;
// Frogglick
- g_hdb->_gfx->_tileFroglickMiddleUD = g_hdb->_gfx->_tileFroglickMiddleLR = NULL;
- g_hdb->_gfx->_tileFroglickWiggleLeft[0] = g_hdb->_gfx->_tileFroglickWiggleRight[0] = NULL;
+ _tileFroglickMiddleUD = _tileFroglickMiddleLR = NULL;
+ _tileFroglickWiggleLeft[0] = _tileFroglickWiggleRight[0] = NULL;
// Dragon
- g_hdb->_gfx->_gfxDragonAsleep = NULL;
+ _gfxDragonAsleep = NULL;
// laser beam
- g_hdb->_gfx->_gfxLaserbeamUD[0] = g_hdb->_gfx->_gfxLaserbeamUD[1] =
- g_hdb->_gfx->_gfxLaserbeamLR[0] = g_hdb->_gfx->_gfxLaserbeamLR[1] = NULL;
+ _gfxLaserbeamUD[0] = _gfxLaserbeamUD[1] = _gfxLaserbeamLR[0] = _gfxLaserbeamLR[1] = NULL;
_dummyPlayer.type = AI_GUY;
_dummyLaser.type = AI_LASERBEAM;
@@ -850,77 +849,77 @@ void AI::restartSystem() {
memset(_clubRightGfx, NULL, kMaxAnimFrames * sizeof(Tile *));
int i;
- if (g_hdb->_gfx->_icepSnowballGfxDown) {
- g_hdb->_gfx->_icepSnowballGfxDown->free();
- g_hdb->_gfx->_icepSnowballGfxDown = NULL;
+ if (_icepSnowballGfxDown) {
+ _icepSnowballGfxDown->free();
+ _icepSnowballGfxDown = NULL;
}
- if (g_hdb->_gfx->_icepSnowballGfxLeft) {
- g_hdb->_gfx->_icepSnowballGfxLeft->free();
- g_hdb->_gfx->_icepSnowballGfxLeft = NULL;
+ if (_icepSnowballGfxLeft) {
+ _icepSnowballGfxLeft->free();
+ _icepSnowballGfxLeft = NULL;
}
- if (g_hdb->_gfx->_icepSnowballGfxRight) {
- g_hdb->_gfx->_icepSnowballGfxRight->free();
- g_hdb->_gfx->_icepSnowballGfxRight = NULL;
+ if (_icepSnowballGfxRight) {
+ _icepSnowballGfxRight->free();
+ _icepSnowballGfxRight = NULL;
}
- if (g_hdb->_gfx->_tileFroglickMiddleUD) {
- g_hdb->_gfx->_tileFroglickMiddleUD->free();
- g_hdb->_gfx->_tileFroglickMiddleUD = NULL;
+ if (_tileFroglickMiddleUD) {
+ _tileFroglickMiddleUD->free();
+ _tileFroglickMiddleUD = NULL;
}
- if (g_hdb->_gfx->_tileFroglickWiggleUD[0]) {
+ if (_tileFroglickWiggleUD[0]) {
for (i = 0; i < 3; i++) {
- g_hdb->_gfx->_tileFroglickWiggleUD[i]->free();
- g_hdb->_gfx->_tileFroglickWiggleUD[i] = NULL;
+ _tileFroglickWiggleUD[i]->free();
+ _tileFroglickWiggleUD[i] = NULL;
}
}
- if (g_hdb->_gfx->_tileFroglickMiddleLR) {
- g_hdb->_gfx->_tileFroglickMiddleLR->free();
- g_hdb->_gfx->_tileFroglickMiddleLR = NULL;
+ if (_tileFroglickMiddleLR) {
+ _tileFroglickMiddleLR->free();
+ _tileFroglickMiddleLR = NULL;
}
- if (g_hdb->_gfx->_tileFroglickWiggleLeft[0]) {
+ if (_tileFroglickWiggleLeft[0]) {
for (i = 0; i < 3; i++) {
- g_hdb->_gfx->_tileFroglickWiggleLeft[i]->free();
- g_hdb->_gfx->_tileFroglickWiggleLeft[i] = NULL;
+ _tileFroglickWiggleLeft[i]->free();
+ _tileFroglickWiggleLeft[i] = NULL;
}
}
- if (g_hdb->_gfx->_tileFroglickWiggleRight[0]) {
+ if (_tileFroglickWiggleRight[0]) {
for (i = 0; i < 3; i++) {
- g_hdb->_gfx->_tileFroglickWiggleRight[i]->free();
- g_hdb->_gfx->_tileFroglickWiggleRight[i] = NULL;
+ _tileFroglickWiggleRight[i]->free();
+ _tileFroglickWiggleRight[i] = NULL;
}
}
// dragon! see ya!
- if (g_hdb->_gfx->_gfxDragonAsleep) {
- g_hdb->_gfx->_gfxDragonAsleep->free();
- g_hdb->_gfx->_gfxDragonAsleep = NULL;
- g_hdb->_gfx->_gfxDragonFlap[0]->free();
- g_hdb->_gfx->_gfxDragonFlap[1]->free();
- g_hdb->_gfx->_gfxDragonFlap[0] = g_hdb->_gfx->_gfxDragonFlap[1] = NULL;
- g_hdb->_gfx->_gfxDragonBreathe[0]->free();
- g_hdb->_gfx->_gfxDragonBreathe[1]->free();
- g_hdb->_gfx->_gfxDragonBreathe[2]->free();
- g_hdb->_gfx->_gfxDragonBreathe[0] = g_hdb->_gfx->_gfxDragonBreathe[1] =
- g_hdb->_gfx->_gfxDragonBreathe[2] = NULL;
+ if (_gfxDragonAsleep) {
+ _gfxDragonAsleep->free();
+ _gfxDragonAsleep = NULL;
+ _gfxDragonFlap[0]->free();
+ _gfxDragonFlap[1]->free();
+ _gfxDragonFlap[0] = _gfxDragonFlap[1] = NULL;
+ _gfxDragonBreathe[0]->free();
+ _gfxDragonBreathe[1]->free();
+ _gfxDragonBreathe[2]->free();
+ _gfxDragonBreathe[0] = _gfxDragonBreathe[1] =
+ _gfxDragonBreathe[2] = NULL;
}
// laser beams
- if (g_hdb->_gfx->_gfxLaserbeamUD[0]) {
+ if (_gfxLaserbeamUD[0]) {
for (i = 0; i < 4; i++) {
- g_hdb->_gfx->_gfxLaserbeamUD[i]->free();
- g_hdb->_gfx->_gfxLaserbeamUDTop[i]->free();
- g_hdb->_gfx->_gfxLaserbeamUDBottom[i]->free();
- g_hdb->_gfx->_gfxLaserbeamLR[i]->free();
- g_hdb->_gfx->_gfxLaserbeamLRLeft[i]->free();
- g_hdb->_gfx->_gfxLaserbeamLRRight[i]->free();
-
- g_hdb->_gfx->_gfxLaserbeamUD[i] = NULL;
- g_hdb->_gfx->_gfxLaserbeamUDTop[i] = NULL;
- g_hdb->_gfx->_gfxLaserbeamUDBottom[i] = NULL;
- g_hdb->_gfx->_gfxLaserbeamLR[i] = NULL;
- g_hdb->_gfx->_gfxLaserbeamLRLeft[i] = NULL;
- g_hdb->_gfx->_gfxLaserbeamLRRight[i] = NULL;
+ _gfxLaserbeamUD[i]->free();
+ _gfxLaserbeamUDTop[i]->free();
+ _gfxLaserbeamUDBottom[i]->free();
+ _gfxLaserbeamLR[i]->free();
+ _gfxLaserbeamLRLeft[i]->free();
+ _gfxLaserbeamLRRight[i]->free();
+
+ _gfxLaserbeamUD[i] = NULL;
+ _gfxLaserbeamUDTop[i] = NULL;
+ _gfxLaserbeamUDBottom[i] = NULL;
+ _gfxLaserbeamLR[i] = NULL;
+ _gfxLaserbeamLRLeft[i] = NULL;
+ _gfxLaserbeamLRRight[i] = NULL;
}
}
diff --git a/engines/hdb/ai.h b/engines/hdb/ai.h
index 38501803f9..f37bb81579 100644
--- a/engines/hdb/ai.h
+++ b/engines/hdb/ai.h
@@ -1229,6 +1229,29 @@ public:
int _stunAnim;
uint32 _stunTimer;
+ // Bots Gfx
+
+ Picture *_icepSnowballGfxDown; // ICEPUFF's snowball moving down
+ Picture *_icepSnowballGfxLeft; // ICEPUFF's snowball moving left
+ Picture *_icepSnowballGfxRight; // ICEPUFF's snowball moving right
+
+ Tile *_tileFroglickMiddleUD;
+ Tile *_tileFroglickWiggleUD[3];
+ Tile *_tileFroglickMiddleLR;
+ Tile *_tileFroglickWiggleLeft[3];
+ Tile *_tileFroglickWiggleRight[3];
+
+ Picture *_gfxDragonAsleep;
+ Picture *_gfxDragonFlap[2];
+ Picture *_gfxDragonBreathe[3];
+
+ Tile *_gfxLaserbeamUD[4];
+ Tile *_gfxLaserbeamUDTop[4];
+ Tile *_gfxLaserbeamUDBottom[4];
+ Tile *_gfxLaserbeamLR[4];
+ Tile *_gfxLaserbeamLRLeft[4];
+ Tile *_gfxLaserbeamLRRight[4];
+
private:
// Action Functions
diff --git a/engines/hdb/gfx.h b/engines/hdb/gfx.h
index dbd3786f28..83af1e49da 100644
--- a/engines/hdb/gfx.h
+++ b/engines/hdb/gfx.h
@@ -148,29 +148,6 @@ public:
void setCursor(int x, int y);
void getCursor(int *x, int *y);
- // Some Gfx
-
- Picture *_icepSnowballGfxDown; // ICEPUFF's snowball moving down
- Picture *_icepSnowballGfxLeft; // ICEPUFF's snowball moving left
- Picture *_icepSnowballGfxRight; // ICEPUFF's snowball moving right
-
- Tile *_tileFroglickMiddleUD;
- Tile *_tileFroglickWiggleUD[3];
- Tile *_tileFroglickMiddleLR;
- Tile *_tileFroglickWiggleLeft[3];
- Tile *_tileFroglickWiggleRight[3];
-
- Picture *_gfxDragonAsleep;
- Picture *_gfxDragonFlap[2];
- Picture *_gfxDragonBreathe[3];
-
- Tile *_gfxLaserbeamUD[4];
- Tile *_gfxLaserbeamUDTop[4];
- Tile *_gfxLaserbeamUDBottom[4];
- Tile *_gfxLaserbeamLR[4];
- Tile *_gfxLaserbeamLRLeft[4];
- Tile *_gfxLaserbeamLRRight[4];
-
private:
int _numTiles;
TileLookup *_tLookupArray;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 19:51:56 +0000