summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-04-03 19:06:24 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-04-03 19:06:24 +0000
commitbb2da24d75d3ba1f029961cd3b15a29ac330686b (patch)
tree98db2a239a921543bf11be6ba8659854ed54e051 /src
parent7aee9a4d781c49313dab50be383843e08147fdac (diff)
downloadmana-client-bb2da24d75d3ba1f029961cd3b15a29ac330686b.tar.gz
mana-client-bb2da24d75d3ba1f029961cd3b15a29ac330686b.tar.bz2
mana-client-bb2da24d75d3ba1f029961cd3b15a29ac330686b.tar.xz
mana-client-bb2da24d75d3ba1f029961cd3b15a29ac330686b.zip
New version of 3-1 map.
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp2
-rw-r--r--src/gui/minimap.cpp18
2 files changed, 12 insertions, 8 deletions
diff --git a/src/game.cpp b/src/game.cpp
index e330be4c..7f3ff7eb 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -832,7 +832,7 @@ void do_parse() {
memset(map_path, '\0', 480);
strcat(map_path, "data/maps/");
strncat(map_path, RFIFOP(2), 497 - strlen(map_path));
- logger.log("Warping to %s (%d, %d)\n",
+ logger.log("Warping to %s (%d, %d)",
map_path, RFIFOW(18), RFIFOW(20));
strcpy(strrchr(map_path, '.') + 1, "tmx.gz");
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index df9d2f42..c43f5218 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -63,22 +63,26 @@ void Minimap::draw(gcn::Graphics *graphics)
sourceRect.x = sourceRect.y = 0;
sourceRect.w = getWidth();
sourceRect.h = getHeight();
- if ( mapBackground )
+
+ if (mapBackground)
{
SDL_FillRect(mapBackground, &sourceRect, mapColor);
SDL_SetAlpha(mapBackground, SDL_SRCALPHA, 120);
}
-
}
- SDL_Rect screenRect;
- screenRect.w = getWidth();
- screenRect.h = getHeight();
- screenRect.x = x;
- screenRect.y = y;
if (mapBackground)
+ {
+ SDL_Rect screenRect;
+ screenRect.w = getWidth();
+ screenRect.h = getHeight();
+ screenRect.x = x;
+ screenRect.y = y;
+
SDL_BlitSurface(mapBackground, NULL, screen, &screenRect);
+ }
+ graphics->setColor(gcn::Color(0, 0, 0));
graphics->drawRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
graphics->setColor(gcn::Color(209, 52, 61));
graphics->fillRectangle(gcn::Rectangle(player_node->x / 2,