summaryrefslogtreecommitdiff
path: root/src/gui/palette.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 13:24:16 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 21:23:10 +0100
commit306ad2effe4d0897453e61ad787e01dc47c33076 (patch)
tree75b8b291af55e80d01d9eb85afd7d465233a1a57 /src/gui/palette.h
parent66599a9896e0cf69b58c0a73152aba4750d87af2 (diff)
downloadmana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.gz
mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.bz2
mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.xz
mana-306ad2effe4d0897453e61ad787e01dc47c33076.zip
General code cleanups
* Use default member initializers * Use range-based for loops * Avoid needless pointer references for ShopItem::mDuplicates * Removed type aliases that are only used once or twice * Removed more unused includes * Removed some unused functions * Removed superfluous .c_str() * Rely on default copy and assignment operators for Vector class * Use std::unique_ptr in some places * Removed duplicated mPlayerMoney updating in SellDialog * Removed duplicated Game::handleInput call * Removed unused SDLInput::mMouseInWindow * Removed remnant of manual widget positioning in HelpWindow * Removed superfluous initialization of static pointers
Diffstat (limited to 'src/gui/palette.h')
-rw-r--r--src/gui/palette.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/palette.h b/src/gui/palette.h
index 1ea7c467..41378a43 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -72,9 +72,9 @@ class Palette
*/
const gcn::Color &getColor(int type, int alpha = 255)
{
- gcn::Color *col = &mColors[type].color;
- col->a = alpha;
- return *col;
+ gcn::Color &col = mColors[type].color;
+ col.a = alpha;
+ return col;
}
/**
@@ -163,9 +163,8 @@ class Palette
committedColor.b;
}
};
- using Colors = std::vector<ColorElem>;
/** Vector containing the colors. */
- Colors mColors;
+ std::vector<ColorElem> mColors;
std::vector<ColorElem*> mGradVector;
};