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

Clean up automap.cpp

pull/1845/head
Anders Jenbo 5 years ago
parent
ff7fdd2848
commit
bfc510fb23
7 changed files with 113 additions and 102 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 187
      Source/automap.cpp
  2. 8
      Source/control.h
  3. 2
      Source/cursor.cpp
  4. 10
      Source/diablo.cpp
  5. 2
      Source/qol/monhealthbar.cpp
  6. 4
      Source/scrollrt.cpp
  7. 2
      Source/scrollrt.h

187
Source/automap.cpp
Unescape View File

@ -23,7 +23,7 @@ namespace {
/**
* Maps from tile_id to automap type.
*/
uint16_t AutomapTypes[256];
std::array<uint16_t, 256> AutomapTypes;
Point Automap;
@ -55,10 +55,10 @@ enum MapFlags : uint8_t {
void DrawSquare(const CelOutputBuffer &out, Point center, uint8_t color)
{
Point left { center.x - AmLine16, center.y };
Point top { center.x, center.y - AmLine8 };
Point right { center.x + AmLine16, center.y };
Point bottom { center.x, center.y + AmLine8 };
const Point left { center.x - AmLine16, center.y };
const Point top { center.x, center.y - AmLine8 };
const Point right { center.x + AmLine16, center.y };
const Point bottom { center.x, center.y + AmLine8 };
DrawLineTo(out, top, left, color);
DrawLineTo(out, top, right, color);
@ -68,20 +68,20 @@ void DrawSquare(const CelOutputBuffer &out, Point center, uint8_t color)
void DrawMapVerticalDoor(const CelOutputBuffer &out, Point center)
{
Point offest { center.x - AmLine32, center.y - AmLine16 };
const Point offset { center.x - AmLine16, center.y - AmLine8 };
DrawLineTo(out, { center.x, offest.y }, { center.x - AmLine8, offest.y + AmLine4 }, MapColorsDim);
DrawLineTo(out, { offest.x, center.y }, { offest.x + AmLine8, center.y - AmLine4 }, MapColorsDim);
DrawSquare(out, { center.x - AmLine16, center.y - AmLine8 }, MapColorsBright);
DrawLineTo(out, { center.x + AmLine16, offset.y }, { center.x + AmLine8, offset.y + AmLine4 }, MapColorsDim);
DrawLineTo(out, { offset.x, center.y + AmLine8 }, { offset.x + AmLine8, center.y + AmLine8 - AmLine4 }, MapColorsDim);
DrawSquare(out, center, MapColorsBright);
}
void DrawMapHorizontalDoor(const CelOutputBuffer &out, Point center)
{
Point offest { center.x + AmLine32, center.y - AmLine16 };
const Point offset { center.x + AmLine16, center.y - AmLine8 };
DrawLineTo(out, { center.x, offest.y }, { center.x + AmLine8, offest.y + AmLine4 }, MapColorsDim);
DrawLineTo(out, { offest.x, center.y }, { offest.x - AmLine8, center.y - AmLine4 }, MapColorsDim);
DrawSquare(out, { center.x + AmLine16, center.y - AmLine8 }, MapColorsBright);
DrawLineTo(out, { center.x - AmLine16, offset.y }, { center.x - AmLine16 + AmLine8, offset.y + AmLine4 }, MapColorsDim);
DrawLineTo(out, { offset.x, center.y + AmLine8 }, { offset.x - AmLine8, center.y + AmLine8 - AmLine4 }, MapColorsDim);
DrawSquare(out, center, MapColorsBright);
}
/**
@ -122,9 +122,9 @@ void DrawAutomapTile(const CelOutputBuffer &out, Point center, uint16_t automapT
bool drawCaveHorizontal = false;
bool drawCaveVertical = false;
switch (automapType & MapFlagsType) {
case 1: { // stand-alone column or other unpassable object
case 1: // stand-alone column or other unpassable object
DrawSquare(out, { center.x, center.y - AmLine8 }, MapColorsDim);
} break;
break;
case 2:
case 5:
drawVertical = true;
@ -159,7 +159,7 @@ void DrawAutomapTile(const CelOutputBuffer &out, Point center, uint16_t automapT
if (drawVertical) { // right-facing obstacle
if ((flags & MapFlagsMapVerticalDoor) != 0) { // two wall segments with a door in the middle
DrawMapVerticalDoor(out, center);
DrawMapVerticalDoor(out, { center.x - AmLine16, center.y - AmLine8 });
}
if ((flags & MapFlagsVerticalGrate) != 0) { // right-facing half-wall
DrawLineTo(out, { center.x - AmLine16, center.y - AmLine8 }, { center.x - AmLine32, center.y }, MapColorsDim);
@ -174,8 +174,8 @@ void DrawAutomapTile(const CelOutputBuffer &out, Point center, uint16_t automapT
}
if (drawHorizontal) { // left-facing obstacle
if ((flags & MapFlagsMapVerticalDoor) != 0) {
DrawMapHorizontalDoor(out, center);
if ((flags & MapFlagsMapHorizontalDoor) != 0) {
DrawMapHorizontalDoor(out, { center.x + AmLine16, center.y - AmLine8 });
}
if ((flags & MapFlagsHorizontalGrate) != 0) {
DrawLineTo(out, { center.x + AmLine16, center.y - AmLine8 }, { center.x + AmLine32, center.y }, MapColorsDim);
@ -184,7 +184,7 @@ void DrawAutomapTile(const CelOutputBuffer &out, Point center, uint16_t automapT
if ((flags & MapFlagsHorizontalArch) != 0) {
DrawSquare(out, { center.x, center.y - AmLine8 }, MapColorsDim);
}
if ((flags & (MapFlagsMapVerticalDoor | MapFlagsHorizontalGrate | MapFlagsHorizontalArch)) == 0) {
if ((flags & (MapFlagsMapHorizontalDoor | MapFlagsHorizontalGrate | MapFlagsHorizontalArch)) == 0) {
DrawLineTo(out, { center.x, center.y - AmLine16 }, { center.x + AmLine32, center.y }, MapColorsDim);
}
}
@ -192,15 +192,15 @@ void DrawAutomapTile(const CelOutputBuffer &out, Point center, uint16_t automapT
// For caves the horizontal/vertical flags are swapped
if (drawCaveHorizontal) {
if ((flags & MapFlagsMapVerticalDoor) != 0) {
DrawMapHorizontalDoor(out, { center.x - AmLine32, center.y + AmLine16 });
DrawMapHorizontalDoor(out, { center.x - AmLine16, center.y + AmLine8 });
} else {
DrawLineTo(out, { center.x, center.y + AmLine16 }, { center.x - AmLine32, center.y }, MapColorsDim);
}
}
if (drawCaveVertical) {
if ((flags & MapFlagsMapVerticalDoor) != 0) {
DrawMapVerticalDoor(out, { center.x + AmLine32, center.y + AmLine16 });
if ((flags & MapFlagsMapHorizontalDoor) != 0) {
DrawMapVerticalDoor(out, { center.x + AmLine16, center.y + AmLine8 });
} else {
DrawLineTo(out, { center.x, center.y + AmLine16 }, { center.x + AmLine32, center.y }, MapColorsDim);
}
@ -237,7 +237,7 @@ void SearchAutomapItem(const CelOutputBuffer &out)
(ScrollInfo.offset.y * AutoMapScale / 100 / 2) + (px + py) * AmLine8 + (gnScreenHeight - PANEL_HEIGHT) / 2
};
if (PANELS_COVER) {
if (CanPanelsCoverView()) {
if (invflag || sbookflag)
screen.x -= 160;
if (chrflag || questlog)
@ -273,7 +273,7 @@ void DrawAutomapPlr(const CelOutputBuffer &out, int playerId)
(plr[playerId].position.offset.y * AutoMapScale / 100 / 2) + (ScrollInfo.offset.y * AutoMapScale / 100 / 2) + (px + py) * AmLine8 + (gnScreenHeight - PANEL_HEIGHT) / 2
};
if (PANELS_COVER) {
if (CanPanelsCoverView()) {
if (invflag || sbookflag)
base.x -= gnScreenWidth / 4;
if (chrflag || questlog)
@ -371,6 +371,7 @@ uint16_t GetAutomapType(Point map, bool view)
}
}
}
return rv;
}
@ -379,36 +380,61 @@ uint16_t GetAutomapType(Point map, bool view)
*/
void DrawAutomapText(const CelOutputBuffer &out)
{
// TODO: Use the `out` buffer instead of the global one.
char desc[256];
int nextLine = 20;
if (gbIsMultiplayer) {
strcat(strcpy(desc, _("game: ")), szPlayerName);
PrintGameStr(out, 8, 20, desc, COL_GOLD);
nextLine = 35;
if (szPlayerDescript[0] != 0) {
if (strcasecmp("0.0.0.0", szPlayerName) != 0) {
strcat(strcpy(desc, _("game: ")), szPlayerName);
PrintGameStr(out, 8, nextLine, desc, COL_GOLD);
nextLine += 15;
}
if (szPlayerDescript[0] != '\0') {
strcat(strcpy(desc, _("password: ")), szPlayerDescript);
PrintGameStr(out, 8, 35, desc, COL_GOLD);
nextLine = 50;
PrintGameStr(out, 8, nextLine, desc, COL_GOLD);
nextLine += 15;
}
}
if (setlevel) {
PrintGameStr(out, 8, nextLine, _(quest_level_names[setlvlnum]), COL_GOLD);
} else if (currlevel != 0) {
if (currlevel < 17 || currlevel > 20) {
if (currlevel < 21 || currlevel > 24)
sprintf(desc, _("Level: %i"), currlevel);
else
sprintf(desc, _("Level: Crypt %i"), currlevel - 20);
} else {
return;
}
if (currlevel != 0) {
if (currlevel >= 17 && currlevel <= 20) {
sprintf(desc, _("Level: Nest %i"), currlevel - 16);
} else if (currlevel >= 21 && currlevel <= 24) {
sprintf(desc, _("Level: Crypt %i"), currlevel - 20);
} else {
sprintf(desc, _("Level: %i"), currlevel);
}
PrintGameStr(out, 8, nextLine, desc, COL_GOLD);
}
}
std::unique_ptr<BYTE[]> LoadAutomapData(uint32_t &dwTiles)
{
switch (leveltype) {
case DTYPE_CATHEDRAL:
if (currlevel < 21)
return LoadFileInMem("Levels\\L1Data\\L1.AMP", &dwTiles);
return LoadFileInMem("NLevels\\L5Data\\L5.AMP", &dwTiles);
case DTYPE_CATACOMBS:
return LoadFileInMem("Levels\\L2Data\\L2.AMP", &dwTiles);
case DTYPE_CAVES:
if (currlevel < 17)
return LoadFileInMem("Levels\\L3Data\\L3.AMP", &dwTiles);
return LoadFileInMem("NLevels\\L6Data\\L6.AMP", &dwTiles);
case DTYPE_HELL:
return LoadFileInMem("Levels\\L4Data\\L4.AMP", &dwTiles);
default:
return nullptr;
}
}
} // namespace
bool AutomapActive;
@ -434,44 +460,18 @@ void InitAutomapOnce()
void InitAutomap()
{
uint32_t dwTiles;
std::unique_ptr<BYTE[]> pAFile;
uint32_t tileCount = 0;
std::unique_ptr<BYTE[]> pAFile = LoadAutomapData(tileCount);
memset(AutomapTypes, 0, sizeof(AutomapTypes));
tileCount /= 2;
auto tileTypes = reinterpret_cast<uint16_t *>(pAFile.get());
switch (leveltype) {
case DTYPE_CATHEDRAL:
if (currlevel < 21)
pAFile = LoadFileInMem("Levels\\L1Data\\L1.AMP", &dwTiles);
else
pAFile = LoadFileInMem("NLevels\\L5Data\\L5.AMP", &dwTiles);
break;
case DTYPE_CATACOMBS:
pAFile = LoadFileInMem("Levels\\L2Data\\L2.AMP", &dwTiles);
break;
case DTYPE_CAVES:
if (currlevel < 17)
pAFile = LoadFileInMem("Levels\\L3Data\\L3.AMP", &dwTiles);
else
pAFile = LoadFileInMem("NLevels\\L6Data\\L6.AMP", &dwTiles);
break;
case DTYPE_HELL:
pAFile = LoadFileInMem("Levels\\L4Data\\L4.AMP", &dwTiles);
break;
default:
return;
}
dwTiles /= 2;
BYTE *pTmp = pAFile.get();
for (unsigned i = 1; i <= dwTiles; i++) {
uint8_t b1 = *pTmp++;
uint8_t b2 = *pTmp++;
AutomapTypes[i] = b1 + (b2 << 8);
for (unsigned i = 0; i < tileCount; i++) {
AutomapTypes[i + 1] = tileTypes[i];
}
pAFile = nullptr;
memset(AutomapView, 0, sizeof(AutomapView));
for (auto &column : dFlags)
@ -511,26 +511,28 @@ void AutomapRight()
void AutomapZoomIn()
{
if (AutoMapScale < 200) {
AutoMapScale += 5;
AmLine64 = (AutoMapScale * 64) / 100;
AmLine32 = AmLine64 / 2;
AmLine16 = AmLine32 / 2;
AmLine8 = AmLine16 / 2;
AmLine4 = AmLine8 / 2;
}
if (AutoMapScale >= 200)
return;
AutoMapScale += 5;
AmLine64 = (AutoMapScale * 64) / 100;
AmLine32 = AmLine64 / 2;
AmLine16 = AmLine32 / 2;
AmLine8 = AmLine16 / 2;
AmLine4 = AmLine8 / 2;
}
void AutomapZoomOut()
{
if (AutoMapScale > 50) {
AutoMapScale -= 5;
AmLine64 = (AutoMapScale * 64) / 100;
AmLine32 = AmLine64 / 2;
AmLine16 = AmLine32 / 2;
AmLine8 = AmLine16 / 2;
AmLine4 = AmLine8 / 2;
}
if (AutoMapScale <= 50)
return;
AutoMapScale -= 5;
AmLine64 = (AutoMapScale * 64) / 100;
AmLine32 = AmLine64 / 2;
AmLine16 = AmLine32 / 2;
AmLine8 = AmLine16 / 2;
AmLine4 = AmLine8 / 2;
}
void DrawAutomap(const CelOutputBuffer &out)
@ -584,7 +586,8 @@ void DrawAutomap(const CelOutputBuffer &out)
screen.x += AutoMapScale * ScrollInfo.offset.x / 100 / 2;
screen.y += AutoMapScale * ScrollInfo.offset.y / 100 / 2;
if (PANELS_COVER) {
if (CanPanelsCoverView()) {
if (invflag || sbookflag) {
screen.x -= gnScreenWidth / 4;
}
@ -616,19 +619,21 @@ void DrawAutomap(const CelOutputBuffer &out)
screen.y += AmLine32;
}
for (int playerId = 0; playerId < MAX_PLRS; playerId++) {
for (unsigned playerId = 0; playerId < MAX_PLRS; playerId++) {
if (plr[playerId].plrlevel == plr[myplr].plrlevel && plr[playerId].plractive && !plr[playerId]._pLvlChanging) {
DrawAutomapPlr(out, playerId);
}
}
if (AutoMapShowItems)
SearchAutomapItem(out);
DrawAutomapText(out);
}
void SetAutomapView(Point tile)
{
Point map { (tile.x - 16) / 2, (tile.y - 16) / 2 };
const Point map { (tile.x - 16) / 2, (tile.y - 16) / 2 };
if (map.x < 0 || map.x >= DMAXX || map.y < 0 || map.y >= DMAXY) {
return;

8
Source/control.h
Unescape View File

@ -68,6 +68,14 @@ extern int initialDropGoldValue;
extern bool panbtndown;
extern bool spselflag;
/**
* @brief Check if the UI can cover the game area entierly
*/
inline bool CanPanelsCoverView()
{
return gnScreenWidth <= PANEL_WIDTH && gnScreenHeight <= SPANEL_HEIGHT + PANEL_HEIGHT;
}
void DrawSpellList(const CelOutputBuffer &out);
void SetSpell();
void SetSpeedSpell(int slot);

2
Source/cursor.cpp
Unescape View File

@ -250,7 +250,7 @@ void CheckCursMove()
sx = MouseX;
sy = MouseY;
if (PANELS_COVER) {
if (CanPanelsCoverView()) {
if (chrflag || questlog) {
if (sx >= gnScreenWidth / 2) { /// BUGFIX: (sx >= gnScreenWidth / 2) (fixed)
sx -= gnScreenWidth / 4;

10
Source/diablo.cpp
Unescape View File

@ -1037,7 +1037,7 @@ static void ReleaseKey(int vkey)
static void ClosePanels()
{
if (PANELS_COVER) {
if (CanPanelsCoverView()) {
if (!chrflag && !questlog && (invflag || sbookflag) && MouseX < 480 && MouseY < PANEL_TOP) {
SetCursorPos(MouseX + 160, MouseY);
} else if (!invflag && !sbookflag && (chrflag || questlog) && MouseX > 160 && MouseY < PANEL_TOP) {
@ -1341,7 +1341,7 @@ static void PressChar(int32_t vkey)
case 'i':
if (stextflag == STORE_NONE) {
invflag = !invflag;
if (!chrflag && !questlog && PANELS_COVER) {
if (!chrflag && !questlog && CanPanelsCoverView()) {
if (!invflag) { // We closed the invetory
if (MouseX < 480 && MouseY < PANEL_TOP) {
SetCursorPos(MouseX + 160, MouseY);
@ -1359,7 +1359,7 @@ static void PressChar(int32_t vkey)
case 'c':
if (stextflag == STORE_NONE) {
chrflag = !chrflag;
if (!invflag && !sbookflag && PANELS_COVER) {
if (!invflag && !sbookflag && CanPanelsCoverView()) {
if (!chrflag) { // We closed the character sheet
if (MouseX > 160 && MouseY < PANEL_TOP) {
SetCursorPos(MouseX - 160, MouseY);
@ -1381,7 +1381,7 @@ static void PressChar(int32_t vkey)
} else {
questlog = false;
}
if (!invflag && !sbookflag && PANELS_COVER) {
if (!invflag && !sbookflag && CanPanelsCoverView()) {
if (!questlog) { // We closed the quest log
if (MouseX > 160 && MouseY < PANEL_TOP) {
SetCursorPos(MouseX - 160, MouseY);
@ -1419,7 +1419,7 @@ static void PressChar(int32_t vkey)
case 'b':
if (stextflag == STORE_NONE) {
sbookflag = !sbookflag;
if (!chrflag && !questlog && PANELS_COVER) {
if (!chrflag && !questlog && CanPanelsCoverView()) {
if (!sbookflag) { // We closed the invetory
if (MouseX < 480 && MouseY < PANEL_TOP) {
SetCursorPos(MouseX + 160, MouseY);

2
Source/qol/monhealthbar.cpp
Unescape View File

@ -63,7 +63,7 @@ void DrawMonsterHealthBar(const CelOutputBuffer &out)
const int height = healthBox.h();
int xPos = (gnScreenWidth - width) / 2;
if (PANELS_COVER) {
if (CanPanelsCoverView()) {
if (invflag || sbookflag)
xPos -= SPANEL_WIDTH / 2;
if (chrflag || questlog)

4
Source/scrollrt.cpp
Unescape View File

@ -947,7 +947,7 @@ static void Zoom(const CelOutputBuffer &out)
{
int viewport_width = out.w();
int viewport_offset_x = 0;
if (PANELS_COVER) {
if (CanPanelsCoverView()) {
if (chrflag || questlog) {
viewport_width -= SPANEL_WIDTH;
viewport_offset_x = SPANEL_WIDTH;
@ -1159,7 +1159,7 @@ static void DrawGame(const CelOutputBuffer &full_out, int x, int y)
y += tileShiftY;
// Skip rendering parts covered by the panels
if (PANELS_COVER) {
if (CanPanelsCoverView()) {
if (zoomflag) {
if (chrflag || questlog) {
ShiftGrid(&x, &y, 2, 0);

2
Source/scrollrt.h
Unescape View File

@ -11,8 +11,6 @@
namespace devilution {
#define PANELS_COVER (gnScreenWidth <= PANEL_WIDTH && gnScreenHeight <= SPANEL_HEIGHT + PANEL_HEIGHT)
enum _scroll_direction : uint8_t {
SDIR_NONE,
SDIR_N,

Write Preview
Loading…
Cancel
Save