Browse Source

Remove DIR_OMNI

pull/2679/head
Anders Jenbo 5 years ago
parent
commit
df636c0afc
  1. 3
      Source/automap.cpp
  2. 6
      Source/controls/plrctrls.cpp
  3. 1
      Source/engine/direction.hpp
  4. 6
      Source/missiles.cpp
  5. 2
      Source/monster.cpp

3
Source/automap.cpp

@ -363,8 +363,7 @@ void DrawAutomapPlr(const Surface &out, const Displacement &myPlayerOffset, int
DrawHorizontalLine(out, { point.x - (AmLine8 + 1), point.y }, AmLine8 + 1, playerColor);
DrawMapLineSteepNW(out, point, AmLine4, playerColor);
} break;
case DIR_S:
case DIR_OMNI: {
case DIR_S: {
const Point point { base.x, base.y + AmLine16 };
DrawVerticalLine(out, { point.x, point.y - AmLine16 }, AmLine16, playerColor);
DrawMapLineSteepSW(out, { point.x + AmLine4, point.y - 2 * AmLine4 }, AmLine4, playerColor);

6
Source/controls/plrctrls.cpp

@ -1013,9 +1013,9 @@ void SpellBookMove(AxisDirection dir)
const Direction FaceDir[3][3] = {
// NONE UP DOWN
{ DIR_OMNI, DIR_N, DIR_S }, // NONE
{ DIR_W, DIR_NW, DIR_SW }, // LEFT
{ DIR_E, DIR_NE, DIR_SE }, // RIGHT
{ DIR_S, DIR_N, DIR_S }, // NONE
{ DIR_W, DIR_NW, DIR_SW }, // LEFT
{ DIR_E, DIR_NE, DIR_SE }, // RIGHT
};
/**

1
Source/engine/direction.hpp

@ -13,7 +13,6 @@ enum Direction : std::uint8_t {
DIR_NE,
DIR_E,
DIR_SE,
DIR_OMNI,
};
} // namespace devilution

6
Source/missiles.cpp

@ -3118,7 +3118,7 @@ void MI_Firebolt(int i)
AddMissile(missile.position.tile, { i, 0 }, missile._mimfnum, MIS_MISEXP3, missile._micaster, missile._misource, 0, 0);
break;
case MIS_BONESPIRIT:
SetMissDir(missile, DIR_OMNI);
SetMissDir(missile, 8);
missile._mirange = 7;
missile._miDelFlag = false;
PutMissile(missile);
@ -4430,7 +4430,7 @@ void MI_Bonespirit(int i)
missile._mirange--;
int dam = missile._midam;
int id = missile._misource;
if (missile._mimfnum == DIR_OMNI) {
if (missile._mimfnum == 8) {
ChangeLight(missile._mlid, missile.position.tile, missile._miAnimFrame);
if (missile._mirange == 0) {
missile._miDelFlag = true;
@ -4464,7 +4464,7 @@ void MI_Bonespirit(int i)
ChangeLight(missile._mlid, c, 8);
}
if (missile._mirange == 0) {
SetMissDir(missile, DIR_OMNI);
SetMissDir(missile, 8);
missile.position.velocity = {};
missile._mirange = 7;
}

2
Source/monster.cpp

@ -4197,8 +4197,6 @@ void M_WalkDir(int i, Direction md)
case DIR_NW:
StartWalk(i, -MWVel[mwi][1], -MWVel[mwi][0], -1, 0, DIR_NW);
break;
case DIR_OMNI:
break;
}
}

Loading…
Cancel
Save