summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-11-21 23:01:33 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-11-21 23:07:57 +0100
commit6b6f41466f548f4ab25e7d1fc7701de1b8f2dca9 (patch)
tree7efe9757464bfa69a888b77c0f47798889015069 /src
parentf2f00d9e33b1df0fa356bac54eef0f17a6281bdb (diff)
downloadmana-6b6f41466f548f4ab25e7d1fc7701de1b8f2dca9.tar.gz
mana-6b6f41466f548f4ab25e7d1fc7701de1b8f2dca9.tar.bz2
mana-6b6f41466f548f4ab25e7d1fc7701de1b8f2dca9.tar.xz
mana-6b6f41466f548f4ab25e7d1fc7701de1b8f2dca9.zip
Center large minimaps on player
Based on a patch by QOAL.
Diffstat (limited to 'src')
-rw-r--r--src/gui/minimap.cpp34
1 files changed, 19 insertions, 15 deletions
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index ef1e9544..f07cb417 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -40,42 +40,47 @@ Minimap::Minimap():
Minimap::~Minimap()
{
if (mMapImage)
- {
mMapImage->decRef();
- }
}
void Minimap::setMapImage(Image *img)
{
if (mMapImage)
- {
mMapImage->decRef();
- }
mMapImage = img;
if (mMapImage)
- {
mMapImage->setAlpha(0.7);
- }
}
void Minimap::draw(gcn::Graphics *graphics)
{
Window::draw(graphics);
- if (mMapImage != NULL)
+ const gcn::Rectangle a = getChildrenArea();
+
+ int mapOriginX = a.x;
+ int mapOriginY = a.y;
+
+ if (mMapImage)
{
+ if (mMapImage->getWidth() > a.width ||
+ mMapImage->getHeight() > a.height)
+ {
+ mapOriginX += (a.width - player_node->mX) / 2;
+ mapOriginY += (a.height - player_node->mY) / 2;
+ }
static_cast<Graphics*>(graphics)->
- drawImage(mMapImage, getPadding(), getTitleBarHeight());
+ drawImage(mMapImage, mapOriginX, mapOriginY);
}
- Beings &beings = beingManager->getAll();
- BeingIterator bi;
+ const Beings &beings = beingManager->getAll();
+ Beings::const_iterator bi;
for (bi = beings.begin(); bi != beings.end(); bi++)
{
- Being *being = (*bi);
+ const Being *being = (*bi);
int dotSize = 2;
switch (being->getType()) {
@@ -101,11 +106,10 @@ void Minimap::draw(gcn::Graphics *graphics)
continue;
}
- int offset = (dotSize - 1) / 2;
-
+ const int offset = (dotSize - 1) / 2;
graphics->fillRectangle(gcn::Rectangle(
- being->mX / 2 + getPadding() - offset,
- being->mY / 2 + getTitleBarHeight() - offset,
+ being->mX / 2 + mapOriginX - offset,
+ being->mY / 2 + mapOriginY - offset,
dotSize, dotSize));
}
}