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

🎨 Fix line endings in Source/qol/xpbar*

pull/1802/head
Gleb Mazovetskiy 5 years ago committed by Anders Jenbo
parent
ca09c704cf
commit
fe99f79bb0
2 changed files with 172 additions and 172 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. 308
      Source/qol/xpbar.cpp
  2. 36
      Source/qol/xpbar.h

308
Source/qol/xpbar.cpp
Unescape View File

@ -1,154 +1,154 @@
/** /**
* @file xpbar.cpp * @file xpbar.cpp
* *
* Adds XP bar QoL feature * Adds XP bar QoL feature
*/ */
#include "DiabloUI/art_draw.h" #include "DiabloUI/art_draw.h"
#include "common.h" #include "common.h"
#include "control.h" #include "control.h"
#include "options.h" #include "options.h"
#include "utils/language.h" #include "utils/language.h"
#include <array> #include <array>
namespace devilution { namespace devilution {
namespace { namespace {
constexpr int BAR_WIDTH = 307; constexpr int BAR_WIDTH = 307;
using ColorGradient = std::array<Uint8, 12>; using ColorGradient = std::array<Uint8, 12>;
constexpr ColorGradient GOLD_GRADIENT = { 0xCF, 0xCE, 0xCD, 0xCC, 0xCB, 0xCA, 0xC9, 0xC8, 0xC7, 0xC6, 0xC5, 0xC4 }; constexpr ColorGradient GOLD_GRADIENT = { 0xCF, 0xCE, 0xCD, 0xCC, 0xCB, 0xCA, 0xC9, 0xC8, 0xC7, 0xC6, 0xC5, 0xC4 };
constexpr ColorGradient SILVER_GRADIENT = { 0xFE, 0xFD, 0xFC, 0xFB, 0xFA, 0xF9, 0xF8, 0xF7, 0xF6, 0xF5, 0xF4, 0xF3 }; constexpr ColorGradient SILVER_GRADIENT = { 0xFE, 0xFD, 0xFC, 0xFB, 0xFA, 0xF9, 0xF8, 0xF7, 0xF6, 0xF5, 0xF4, 0xF3 };
constexpr int BACK_WIDTH = 313; constexpr int BACK_WIDTH = 313;
constexpr int BACK_HEIGHT = 9; constexpr int BACK_HEIGHT = 9;
Art xpbarArt; Art xpbarArt;
void DrawBar(const CelOutputBuffer &out, int x, int y, int width, const ColorGradient &gradient) void DrawBar(const CelOutputBuffer &out, int x, int y, int width, const ColorGradient &gradient)
{ {
FastDrawHorizLine(out, x, y + 1, width, gradient[gradient.size() * 3 / 4 - 1]); FastDrawHorizLine(out, x, y + 1, width, gradient[gradient.size() * 3 / 4 - 1]);
FastDrawHorizLine(out, x, y + 2, width, gradient[gradient.size() - 1]); FastDrawHorizLine(out, x, y + 2, width, gradient[gradient.size() - 1]);
FastDrawHorizLine(out, x, y + 3, width, gradient[gradient.size() / 2 - 1]); FastDrawHorizLine(out, x, y + 3, width, gradient[gradient.size() / 2 - 1]);
} }
void DrawEndCap(const CelOutputBuffer &out, int x, int y, int idx, const ColorGradient &gradient) void DrawEndCap(const CelOutputBuffer &out, int x, int y, int idx, const ColorGradient &gradient)
{ {
SetPixel(out, x, y + 1, gradient[idx * 3 / 4]); SetPixel(out, x, y + 1, gradient[idx * 3 / 4]);
SetPixel(out, x, y + 2, gradient[idx]); SetPixel(out, x, y + 2, gradient[idx]);
SetPixel(out, x, y + 3, gradient[idx / 2]); SetPixel(out, x, y + 3, gradient[idx / 2]);
} }
} // namespace } // namespace
void InitXPBar() void InitXPBar()
{ {
if (sgOptions.Gameplay.bExperienceBar) { if (sgOptions.Gameplay.bExperienceBar) {
LoadMaskedArt("data\\xpbar.pcx", &xpbarArt, 1, 1); LoadMaskedArt("data\\xpbar.pcx", &xpbarArt, 1, 1);
if (xpbarArt.surface == nullptr) { if (xpbarArt.surface == nullptr) {
app_fatal(_("Failed to load UI resources. Is devilutionx.mpq accessible and up to date?")); app_fatal(_("Failed to load UI resources. Is devilutionx.mpq accessible and up to date?"));
} }
} }
} }
void FreeXPBar() void FreeXPBar()
{ {
xpbarArt.Unload(); xpbarArt.Unload();
} }
void DrawXPBar(const CelOutputBuffer &out) void DrawXPBar(const CelOutputBuffer &out)
{ {
if (!sgOptions.Gameplay.bExperienceBar) if (!sgOptions.Gameplay.bExperienceBar)
return; return;
const PlayerStruct &player = plr[myplr]; const PlayerStruct &player = plr[myplr];
const int backX = PANEL_LEFT + PANEL_WIDTH / 2 - 155; const int backX = PANEL_LEFT + PANEL_WIDTH / 2 - 155;
const int backY = PANEL_TOP + PANEL_HEIGHT - 11; const int backY = PANEL_TOP + PANEL_HEIGHT - 11;
const int xPos = backX + 3; const int xPos = backX + 3;
const int yPos = backY + 2; const int yPos = backY + 2;
DrawArt(out, backX, backY, &xpbarArt); DrawArt(out, backX, backY, &xpbarArt);
const int charLevel = player._pLevel; const int charLevel = player._pLevel;
if (charLevel == MAXCHARLEVEL - 1) { if (charLevel == MAXCHARLEVEL - 1) {
// Draw a nice golden bar for max level characters. // Draw a nice golden bar for max level characters.
DrawBar(out, xPos, yPos, BAR_WIDTH, GOLD_GRADIENT); DrawBar(out, xPos, yPos, BAR_WIDTH, GOLD_GRADIENT);
return; return;
} }
const int prevXp = ExpLvlsTbl[charLevel - 1]; const int prevXp = ExpLvlsTbl[charLevel - 1];
if (player._pExperience < prevXp) if (player._pExperience < prevXp)
return; return;
uint64_t prevXpDelta_1 = player._pExperience - prevXp; uint64_t prevXpDelta_1 = player._pExperience - prevXp;
uint64_t prevXpDelta = ExpLvlsTbl[charLevel] - prevXp; uint64_t prevXpDelta = ExpLvlsTbl[charLevel] - prevXp;
uint64_t fullBar = BAR_WIDTH * prevXpDelta_1 / prevXpDelta; uint64_t fullBar = BAR_WIDTH * prevXpDelta_1 / prevXpDelta;
// Figure out how much to fill the last pixel of the XP bar, to make it gradually appear with gained XP // Figure out how much to fill the last pixel of the XP bar, to make it gradually appear with gained XP
uint64_t onePx = prevXpDelta / BAR_WIDTH + 1; uint64_t onePx = prevXpDelta / BAR_WIDTH + 1;
uint64_t lastFullPx = fullBar * prevXpDelta / BAR_WIDTH; uint64_t lastFullPx = fullBar * prevXpDelta / BAR_WIDTH;
const uint64_t fade = (prevXpDelta_1 - lastFullPx) * (SILVER_GRADIENT.size() - 1) / onePx; const uint64_t fade = (prevXpDelta_1 - lastFullPx) * (SILVER_GRADIENT.size() - 1) / onePx;
// Draw beginning of bar full brightness // Draw beginning of bar full brightness
DrawBar(out, xPos, yPos, fullBar, SILVER_GRADIENT); DrawBar(out, xPos, yPos, fullBar, SILVER_GRADIENT);
// End pixels appear gradually // End pixels appear gradually
DrawEndCap(out, xPos + fullBar, yPos, fade, SILVER_GRADIENT); DrawEndCap(out, xPos + fullBar, yPos, fade, SILVER_GRADIENT);
} }
bool CheckXPBarInfo() bool CheckXPBarInfo()
{ {
if (!sgOptions.Gameplay.bExperienceBar) if (!sgOptions.Gameplay.bExperienceBar)
return false; return false;
const int backX = PANEL_LEFT + PANEL_WIDTH / 2 - 155; const int backX = PANEL_LEFT + PANEL_WIDTH / 2 - 155;
const int backY = PANEL_TOP + PANEL_HEIGHT - 11; const int backY = PANEL_TOP + PANEL_HEIGHT - 11;
if (MouseX < backX || MouseX >= backX + BACK_WIDTH || MouseY < backY || MouseY >= backY + BACK_HEIGHT) if (MouseX < backX || MouseX >= backX + BACK_WIDTH || MouseY < backY || MouseY >= backY + BACK_HEIGHT)
return false; return false;
const PlayerStruct &player = plr[myplr]; const PlayerStruct &player = plr[myplr];
const int charLevel = player._pLevel; const int charLevel = player._pLevel;
sprintf(tempstr, _("Level %d"), charLevel); sprintf(tempstr, _("Level %d"), charLevel);
AddPanelString(tempstr, true); AddPanelString(tempstr, true);
if (charLevel == MAXCHARLEVEL - 1) { if (charLevel == MAXCHARLEVEL - 1) {
// Show a maximum level indicator for max level players. // Show a maximum level indicator for max level players.
infoclr = COL_GOLD; infoclr = COL_GOLD;
sprintf(tempstr, _("Experience: ")); sprintf(tempstr, _("Experience: "));
PrintWithSeparator(tempstr + SDL_arraysize("Experience: ") - 1, ExpLvlsTbl[charLevel - 1]); PrintWithSeparator(tempstr + SDL_arraysize("Experience: ") - 1, ExpLvlsTbl[charLevel - 1]);
AddPanelString(tempstr, true); AddPanelString(tempstr, true);
AddPanelString(_("Maximum Level"), true); AddPanelString(_("Maximum Level"), true);
return true; return true;
} }
infoclr = COL_WHITE; infoclr = COL_WHITE;
sprintf(tempstr, _("Experience: ")); sprintf(tempstr, _("Experience: "));
PrintWithSeparator(tempstr + SDL_arraysize("Experience: ") - 1, player._pExperience); PrintWithSeparator(tempstr + SDL_arraysize("Experience: ") - 1, player._pExperience);
AddPanelString(tempstr, true); AddPanelString(tempstr, true);
sprintf(tempstr, _("Next Level: ")); sprintf(tempstr, _("Next Level: "));
PrintWithSeparator(tempstr + SDL_arraysize("Next Level: ") - 1, ExpLvlsTbl[charLevel]); PrintWithSeparator(tempstr + SDL_arraysize("Next Level: ") - 1, ExpLvlsTbl[charLevel]);
AddPanelString(tempstr, true); AddPanelString(tempstr, true);
sprintf(PrintWithSeparator(tempstr, ExpLvlsTbl[charLevel] - player._pExperience), _(" to Level %d"), charLevel + 1); sprintf(PrintWithSeparator(tempstr, ExpLvlsTbl[charLevel] - player._pExperience), _(" to Level %d"), charLevel + 1);
AddPanelString(tempstr, true); AddPanelString(tempstr, true);
return true; return true;
} }
} // namespace devilution } // namespace devilution

36
Source/qol/xpbar.h
Unescape View File

@ -1,18 +1,18 @@
/** /**
* @file xpbar.h * @file xpbar.h
* *
* Adds XP bar QoL feature * Adds XP bar QoL feature
*/ */
#pragma once #pragma once
namespace devilution { namespace devilution {
struct CelOutputBuffer; struct CelOutputBuffer;
void InitXPBar(); void InitXPBar();
void FreeXPBar(); void FreeXPBar();
void DrawXPBar(const CelOutputBuffer &out); void DrawXPBar(const CelOutputBuffer &out);
bool CheckXPBarInfo(); bool CheckXPBarInfo();
} // namespace devilution } // namespace devilution

Write Preview
Loading…
Cancel
Save