aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/xeen/interface_map.cpp250
-rw-r--r--engines/xeen/resources.cpp13
-rw-r--r--engines/xeen/resources.h6
3 files changed, 264 insertions, 5 deletions
diff --git a/engines/xeen/interface_map.cpp b/engines/xeen/interface_map.cpp
index 42bc079797..9c3d7b7192 100644
--- a/engines/xeen/interface_map.cpp
+++ b/engines/xeen/interface_map.cpp
@@ -2379,7 +2379,6 @@ void InterfaceMap::setIndoorsMonsters() {
Map &map = *_vm->_map;
Common::Point mazePos = _vm->_party->_mazePosition;
Direction dir = _vm->_party->_mazeDirection;
- const int INDOOR_MONSTERS_Y[4] = { 2, 34, 53, 59 };
combat.clear();
for (uint monsterIdx = 0; monsterIdx < map._mobData._monsters.size(); ++monsterIdx) {
@@ -3105,6 +3104,255 @@ void InterfaceMap::setIndoorsWallPics() {
}
void InterfaceMap::setOutdoorsMonsters() {
+ Combat &combat = *_vm->_combat;
+ Map &map = *_vm->_map;
+ Party &party = *_vm->_party;
+ Direction dir = party._mazeDirection;
+ Common::Point pt = party._mazePosition;
+
+ for (uint idx = 0; idx < map._mobData._monsters.size(); ++idx) {
+ MazeMonster &monster = map._mobData._monsters[idx];
+
+ if (monster._position.x == (pt.x + SCREEN_POSITIONING_X[dir][2]) &&
+ monster._position.y == (pt.y + SCREEN_POSITIONING_Y[dir][2])) {
+ monster._isAttacking = true;
+ if (combat._attackMonsters[0] == -1) {
+ _outdoorList[118]._frame = idx;
+ combat._attackMonsters[0] = idx;
+ } else if (combat._attackMonsters[1] == -1) {
+ _outdoorList[112]._frame = idx;
+ combat._attackMonsters[1] = idx;
+ } else if (combat._attackMonsters[2] == -1) {
+ _outdoorList[115]._frame = idx;
+ combat._attackMonsters[2] = idx;
+ }
+ }
+
+ if (monster._position.x == (pt.x + SCREEN_POSITIONING_X[dir][7]) &&
+ monster._position.y == (pt.y + SCREEN_POSITIONING_Y[dir][7])) {
+ monster._isAttacking = true;
+ if (combat._attackMonsters[3] == -1) {
+ _outdoorList[94]._frame = idx;
+ combat._attackMonsters[3] = idx;
+ } else if (combat._attackMonsters[4] == -1) {
+ _outdoorList[92]._frame = idx;
+ combat._attackMonsters[4] = idx;
+ } else if (combat._attackMonsters[5] == -1) {
+ _outdoorList[93]._frame = idx;
+ combat._attackMonsters[5] = idx;
+ }
+ }
+
+ if (monster._position.x == (pt.x + SCREEN_POSITIONING_X[dir][5]) &&
+ monster._position.y == (pt.y + SCREEN_POSITIONING_Y[dir][5])) {
+ monster._isAttacking = true;
+ if (combat._attackMonsters[12] == -1) {
+ _outdoorList[90]._frame = idx;
+ combat._attackMonsters[12] = idx;
+ }
+ }
+
+ if (monster._position.x == (pt.x + SCREEN_POSITIONING_X[dir][9]) &&
+ monster._position.y == (pt.y + SCREEN_POSITIONING_Y[dir][9])) {
+ monster._isAttacking = true;
+ if (combat._attackMonsters[13] == -1) {
+ _outdoorList[91]._frame = idx;
+ combat._attackMonsters[13] = idx;
+ }
+ }
+
+ if (monster._position.x == (pt.x + SCREEN_POSITIONING_X[dir][14]) &&
+ monster._position.y == (pt.y + SCREEN_POSITIONING_Y[dir][14])) {
+ monster._isAttacking = true;
+ if (combat._attackMonsters[6] == -1) {
+ _outdoorList[75]._frame = idx;
+ combat._attackMonsters[6] = idx;
+ } else if (combat._attackMonsters[7] == -1) {
+ _outdoorList[73]._frame = idx;
+ combat._attackMonsters[7] = idx;
+ } else if (combat._attackMonsters[8] == -1) {
+ _outdoorList[74]._frame = idx;
+ combat._attackMonsters[8] = idx;
+ }
+ }
+
+ if (monster._position.x == (pt.x + SCREEN_POSITIONING_X[dir][12]) &&
+ monster._position.y == (pt.y + SCREEN_POSITIONING_Y[dir][12])) {
+ monster._isAttacking = true;
+ if (combat._attackMonsters[14] == -1) {
+ _outdoorList[69]._frame = idx;
+ combat._attackMonsters[14] = idx;
+ } else if (combat._attackMonsters[20] == -1) {
+ _outdoorList[70]._frame = idx;
+ combat._attackMonsters[20] = idx;
+ }
+ }
+
+ if (monster._position.x == (pt.x + SCREEN_POSITIONING_X[dir][16]) &&
+ monster._position.y == (pt.y + SCREEN_POSITIONING_Y[dir][16])) {
+ monster._isAttacking = true;
+ if (combat._attackMonsters[15] == -1) {
+ _outdoorList[71]._frame = idx;
+ combat._attackMonsters[15] = idx;
+ } else if (combat._attackMonsters[21] == -1) {
+ _outdoorList[72]._frame = idx;
+ combat._attackMonsters[21] = idx;
+ }
+ }
+
+ if (monster._position.x == (pt.x + SCREEN_POSITIONING_X[dir][27]) &&
+ monster._position.y == (pt.y + SCREEN_POSITIONING_Y[dir][27])) {
+ monster._isAttacking = true;
+ if (combat._attackMonsters[9] == -1) {
+ _outdoorList[52]._frame = idx;
+ combat._attackMonsters[9] = idx;
+ } else if (combat._attackMonsters[10] == -1) {
+ _outdoorList[50]._frame = idx;
+ combat._attackMonsters[10] = idx;
+ } else if (combat._attackMonsters[11] == -1) {
+ _outdoorList[51]._frame = idx;
+ combat._attackMonsters[11] = idx;
+ }
+ }
+
+ if (monster._position.x == (pt.x + SCREEN_POSITIONING_X[dir][25]) &&
+ monster._position.y == (pt.y + SCREEN_POSITIONING_Y[dir][25])) {
+ monster._isAttacking = true;
+ if (combat._attackMonsters[16] == -1) {
+ _outdoorList[44]._frame = idx;
+ combat._attackMonsters[16] = idx;
+ } else if (combat._attackMonsters[22] == -1) {
+ _outdoorList[42]._frame = idx;
+ combat._attackMonsters[22] = idx;
+ } else if (combat._attackMonsters[24] == -1) {
+ _outdoorList[43]._frame = idx;
+ combat._attackMonsters[24] = idx;
+ }
+ }
+
+ if (monster._position.x == (pt.x + SCREEN_POSITIONING_X[dir][23]) &&
+ monster._position.y == (pt.y + SCREEN_POSITIONING_Y[dir][23])) {
+ monster._isAttacking = true;
+ if (combat._attackMonsters[18] == -1) {
+ _outdoorList[48]._frame = idx;
+ combat._attackMonsters[18] = idx;
+ }
+ }
+
+ if (monster._position.x == (pt.x + SCREEN_POSITIONING_X[dir][29]) &&
+ monster._position.y == (pt.y + SCREEN_POSITIONING_Y[dir][29])) {
+ monster._isAttacking = true;
+ if (combat._attackMonsters[17] == -1) {
+ _outdoorList[47]._frame = idx;
+ combat._attackMonsters[17] = idx;
+ } else if (combat._attackMonsters[23] == -1) {
+ _outdoorList[45]._frame = idx;
+ combat._attackMonsters[23] = idx;
+ } else if (combat._attackMonsters[25] == -1) {
+ _outdoorList[46]._frame = idx;
+ combat._attackMonsters[25] = idx;
+ }
+ }
+
+ if (monster._position.x == (pt.x + SCREEN_POSITIONING_X[dir][31]) &&
+ monster._position.y == (pt.y + SCREEN_POSITIONING_Y[dir][31])) {
+ monster._isAttacking = true;
+ if (combat._attackMonsters[19] == -1) {
+ _outdoorList[49]._frame = idx;
+ combat._attackMonsters[19] = idx;
+ }
+ }
+ }
+
+ _outdoorList[115]._x = 58;
+ _outdoorList[93]._x = 25;
+ _outdoorList[74]._x = 9;
+ _outdoorList[51]._x = -1;
+ _outdoorList[43]._x = -26;
+ _outdoorList[46]._x = 23;
+ _outdoorList[48]._x = -58;
+ _outdoorList[49]._x = 40;
+ _outdoorList[69]._x = -65;
+ _outdoorList[70]._x = -85;
+ _outdoorList[71]._x = 49;
+ _outdoorList[72]._x = 65;
+ _outdoorList[90]._x = -112;
+ _outdoorList[91]._x = 98;
+
+ if (combat._attackMonsters[1] != -1 && combat._attackMonsters[2] == -1) {
+ _outdoorList[118]._x = 31;
+ _outdoorList[112]._x = -36;
+ } else {
+ _outdoorList[118]._x = -5;
+ _outdoorList[112]._x = -67;
+ }
+ if (combat._attackMonsters[4] != -1 && combat._attackMonsters[5] == -1) {
+ _outdoorList[94]._x = 8;
+ _outdoorList[92]._x = -23;
+ } else {
+ _outdoorList[94]._x = -7;
+ _outdoorList[92]._x = -38;
+ }
+ if (combat._attackMonsters[7] != -1 && combat._attackMonsters[8] == -1) {
+ _outdoorList[75]._x = 0;
+ _outdoorList[73]._x = -16;
+ } else {
+ _outdoorList[75]._x = -8;
+ _outdoorList[73]._x = -24;
+ }
+ if (combat._attackMonsters[10] != -1 && combat._attackMonsters[11] == -1) {
+ _outdoorList[52]._x = -5;
+ _outdoorList[50]._x = -13;
+ } else {
+ _outdoorList[52]._x = -9;
+ _outdoorList[50]._x = -17;
+ }
+ if (combat._attackMonsters[22] != -1 && combat._attackMonsters[24] == -1) {
+ _outdoorList[44]._x = -27;
+ _outdoorList[42]._x = -37;
+ } else {
+ _outdoorList[44]._x = -34;
+ _outdoorList[42]._x = -41;
+ }
+ if (combat._attackMonsters[23] != -1 && combat._attackMonsters[25] == -1) {
+ _outdoorList[47]._x = 20;
+ _outdoorList[45]._x = -12;
+ } else {
+ _outdoorList[47]._x = 16;
+ _outdoorList[45]._x = -16;
+ }
+
+ for (int idx = 0; idx < 26; ++idx) {
+ DrawStruct &ds = _outdoorList[OUTDOOR_MONSTER_INDEXES[idx]];
+
+ if (ds._frame != -1) {
+ ds._flags &= ~0xfff;
+
+ // TODO: Double-check.. this section looks *weird*
+ MazeMonster &monster = map._mobData._monsters[ds._frame];
+ MonsterStruct &monsterData = map._monsterData[monster._spriteId];
+
+ ds._frame = monster._frame;
+
+ if (monster._effect2) {
+ ds._flags = MONSTER_EFFECT_FLAGS[monster._effect2 - 1][monster._effect3];
+ }
+
+ if (monster._frame > 7) {
+ monster._frame -= 8;
+ ds._sprites = monster._attackSprites;
+ } else {
+ ds._sprites = monster._sprites;
+ }
+
+ ds._y = OUTDOOR_MONSTERS_Y[idx];
+
+ if (monsterData._flying) {
+ ds._x += COMBAT_FLOAT_X[_combatFloatCounter];
+ ds._y += COMBAT_FLOAT_Y[_combatFloatCounter];
+ }
+ }
+ }
// TODO
}
diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp
index b54779d0f4..803fea2e12 100644
--- a/engines/xeen/resources.cpp
+++ b/engines/xeen/resources.cpp
@@ -404,14 +404,21 @@ const int INDOOR_OBJECT_Y[2][12] = {
{ -65, -6, -6, -6, 36, 36, 36, 54, 54, 54, 54, 54 }
};
+const int INDOOR_MONSTERS_Y[4] = { 2, 34, 53, 59 };
+
const int OUTDOOR_OBJECT_X[2][12] = {
{ -5, -7, -112, 98, -8, -77, 61, -9, -43, 25, -74, 56 },
{ -35, -35, -142, 68, -35, -95, 19, -35, -62, -24, -98, 16 }
};
-const int OUTDOOR_OBJECT_Y[2][12] = {
- { 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 69 },
- { 70, 71, 72, 73, 74, 75, 90, 91, 92, 93, 94, 112 }
+const int OUTDOOR_MONSTER_INDEXES[26] = {
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 69, 70,
+ 71, 72, 73, 74, 75, 90, 91, 92, 93, 94, 112, 115, 118
+};
+
+const int OUTDOOR_MONSTERS_Y[26] = {
+ 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, 53, 53,
+ 53, 53, 53, 53, 53, 34, 34, 34, 34, 34, 2, 2, 2
};
const int DIRECTION_ANIM_POSITIONS[4][4] = {
diff --git a/engines/xeen/resources.h b/engines/xeen/resources.h
index 58ac4055b1..98c30f4f34 100644
--- a/engines/xeen/resources.h
+++ b/engines/xeen/resources.h
@@ -98,9 +98,13 @@ extern const int INDOOR_OBJECT_X[2][12];
extern const int INDOOR_OBJECT_Y[2][12];
+extern const int INDOOR_MONSTERS_Y[4];
+
extern const int OUTDOOR_OBJECT_X[2][12];
-extern const int OUTDOOR_OBJECT_Y[2][12];
+extern const int OUTDOOR_MONSTER_INDEXES[26];
+
+extern const int OUTDOOR_MONSTERS_Y[26];
extern const int DIRECTION_ANIM_POSITIONS[4][4];
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 11:28:53 +0000