mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Enable ADL (GetOffsetForWalking) for automap

pull/2418/head
obligaron 5 years ago committed by Anders Jenbo
parent
f5406e7ce1
commit
dae9d7eff5
1 changed files with 21 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      Source/automap.cpp

33
Source/automap.cpp
Unescape View File

@ -207,7 +207,7 @@ void DrawAutomapTile(const Surface &out, Point center, uint16_t automapType)
} }
} }
void SearchAutomapItem(const Surface &out) void SearchAutomapItem(const Surface &out, const Displacement &myPlayerOffset)
{ {
auto &myPlayer = Players[MyPlayerId]; auto &myPlayer = Players[MyPlayerId];
Point tile = myPlayer.position.tile; Point tile = myPlayer.position.tile;
@ -234,8 +234,8 @@ void SearchAutomapItem(const Surface &out)
int py = j - 2 * AutomapOffset.deltaY - ViewY; int py = j - 2 * AutomapOffset.deltaY - ViewY;
Point screen = { Point screen = {
(ScrollInfo.offset.deltaX * AutoMapScale / 100 / 2) + (px - py) * AmLine16 + gnScreenWidth / 2, (myPlayerOffset.deltaX * AutoMapScale / 100 / 2) + (px - py) * AmLine16 + gnScreenWidth / 2,
(ScrollInfo.offset.deltaY * AutoMapScale / 100 / 2) + (px + py) * AmLine8 + (gnScreenHeight - PANEL_HEIGHT) / 2 (myPlayerOffset.deltaY * AutoMapScale / 100 / 2) + (px + py) * AmLine8 + (gnScreenHeight - PANEL_HEIGHT) / 2
}; };
if (CanPanelsCoverView()) { if (CanPanelsCoverView()) {
@ -253,7 +253,7 @@ void SearchAutomapItem(const Surface &out)
/** /**
* @brief Renders an arrow on the automap, centered on and facing the direction of the player. * @brief Renders an arrow on the automap, centered on and facing the direction of the player.
*/ */
void DrawAutomapPlr(const Surface &out, int playerId) void DrawAutomapPlr(const Surface &out, const Displacement &myPlayerOffset, int playerId)
{ {
int playerColor = MapColorsPlayer + (8 * playerId) % 128; int playerColor = MapColorsPlayer + (8 * playerId) % 128;
@ -270,9 +270,13 @@ void DrawAutomapPlr(const Surface &out, int playerId)
int px = tile.x - 2 * AutomapOffset.deltaX - ViewX; int px = tile.x - 2 * AutomapOffset.deltaX - ViewX;
int py = tile.y - 2 * AutomapOffset.deltaY - ViewY; int py = tile.y - 2 * AutomapOffset.deltaY - ViewY;
Displacement playerOffset = player.position.offset;
if (player.IsWalking())
playerOffset = GetOffsetForWalking(player.AnimInfo, player._pdir);
Point base = { Point base = {
(player.position.offset.deltaX * AutoMapScale / 100 / 2) + (ScrollInfo.offset.deltaX * AutoMapScale / 100 / 2) + (px - py) * AmLine16 + gnScreenWidth / 2, (playerOffset.deltaX * AutoMapScale / 100 / 2) + (myPlayerOffset.deltaX * AutoMapScale / 100 / 2) + (px - py) * AmLine16 + gnScreenWidth / 2,
(player.position.offset.deltaY * AutoMapScale / 100 / 2) + (ScrollInfo.offset.deltaY * AutoMapScale / 100 / 2) + (px + py) * AmLine8 + (gnScreenHeight - PANEL_HEIGHT) / 2 (playerOffset.deltaY * AutoMapScale / 100 / 2) + (myPlayerOffset.deltaY * AutoMapScale / 100 / 2) + (px + py) * AmLine8 + (gnScreenHeight - PANEL_HEIGHT) / 2
}; };
if (CanPanelsCoverView()) { if (CanPanelsCoverView()) {
@ -552,13 +556,18 @@ void DrawAutomap(const Surface &out)
Automap += AutomapOffset; Automap += AutomapOffset;
const auto &myPlayer = Players[MyPlayerId];
Displacement myPlayerOffset = ScrollInfo.offset;
if (myPlayer.IsWalking())
myPlayerOffset = GetOffsetForWalking(myPlayer.AnimInfo, myPlayer._pdir, true);
int d = (AutoMapScale * 64) / 100; int d = (AutoMapScale * 64) / 100;
int cells = 2 * (gnScreenWidth / 2 / d) + 1; int cells = 2 * (gnScreenWidth / 2 / d) + 1;
if (((gnScreenWidth / 2) % d) != 0) if (((gnScreenWidth / 2) % d) != 0)
cells++; cells++;
if (((gnScreenWidth / 2) % d) >= (AutoMapScale * 32) / 100) if (((gnScreenWidth / 2) % d) >= (AutoMapScale * 32) / 100)
cells++; cells++;
if ((ScrollInfo.offset.deltaX + ScrollInfo.offset.deltaY) != 0) if ((myPlayerOffset.deltaX + myPlayerOffset.deltaY) != 0)
cells++; cells++;
Point screen { Point screen {
@ -581,8 +590,8 @@ void DrawAutomap(const Surface &out)
screen.y -= AmLine8; screen.y -= AmLine8;
} }
screen.x += AutoMapScale * ScrollInfo.offset.deltaX / 100 / 2; screen.x += AutoMapScale * myPlayerOffset.deltaX / 100 / 2;
screen.y += AutoMapScale * ScrollInfo.offset.deltaY / 100 / 2; screen.y += AutoMapScale * myPlayerOffset.deltaY / 100 / 2;
if (CanPanelsCoverView()) { if (CanPanelsCoverView()) {
if (invflag || sbookflag) { if (invflag || sbookflag) {
@ -618,13 +627,13 @@ void DrawAutomap(const Surface &out)
for (int playerId = 0; playerId < MAX_PLRS; playerId++) { for (int playerId = 0; playerId < MAX_PLRS; playerId++) {
auto &player = Players[playerId]; auto &player = Players[playerId];
if (player.plrlevel == Players[MyPlayerId].plrlevel && player.plractive && !player._pLvlChanging) { if (player.plrlevel == myPlayer.plrlevel && player.plractive && !player._pLvlChanging) {
DrawAutomapPlr(out, playerId); DrawAutomapPlr(out, myPlayerOffset, playerId);
} }
} }
if (AutoMapShowItems) if (AutoMapShowItems)
SearchAutomapItem(out); SearchAutomapItem(out, myPlayerOffset);
DrawAutomapText(out); DrawAutomapText(out);
} }

Write Preview
Loading…
Cancel
Save