From 6ba4c4a96e0c5072279032cc45ae0bc8522129f7 Mon Sep 17 00:00:00 2001
From: Joris <joris.dauphin@gmail.com>
Date: Fri, 27 Apr 2012 16:15:22 +0200
Subject: [PATCH] Replace CMinimap::DrawCursor by DrawViewportArea.
---
src/editor/editloop.cpp | 2 +-
src/include/minimap.h | 4 ++--
src/map/minimap.cpp | 12 ++++++------
src/stratagus/mainloop.cpp | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/editor/editloop.cpp b/src/editor/editloop.cpp
index 0646aae9b..9244e2174 100644
--- a/src/editor/editloop.cpp
+++ b/src/editor/editloop.cpp
@@ -1083,7 +1083,7 @@ void EditorUpdateDisplay()
//
if (UI.SelectedViewport) {
UI.Minimap.Draw();
- UI.Minimap.DrawCursor(UI.SelectedViewport->MapPos.x, UI.SelectedViewport->MapPos.y);
+ UI.Minimap.DrawViewportArea(*UI.SelectedViewport);
}
//
// Info panel
diff --git a/src/include/minimap.h b/src/include/minimap.h
index 6c24e78b0..063186de5 100644
--- a/src/include/minimap.h
+++ b/src/include/minimap.h
@@ -59,8 +59,8 @@ public:
void FreeOpenGL();
void Reload();
void Destroy();
- void Draw();
- void DrawCursor(int vx, int vy);
+ void Draw() const;
+ void DrawViewportArea(const CViewport &viewport) const;
void AddEvent(const Vec2i &pos, Uint32 color);
Vec2i ScreenToTilePos(const PixelPos &screenPos) const;
diff --git a/src/map/minimap.cpp b/src/map/minimap.cpp
index df018ca12..067e6fe95 100644
--- a/src/map/minimap.cpp
+++ b/src/map/minimap.cpp
@@ -590,7 +590,7 @@ static void DrawEvents()
/**
** Draw the minimap on the screen
*/
-void CMinimap::Draw()
+void CMinimap::Draw() const
{
if (!UseOpenGL) {
SDL_Rect drect = {X, Y, 0, 0};
@@ -723,13 +723,13 @@ void CMinimap::Destroy()
** @param vx View point X position.
** @param vy View point Y position.
*/
-void CMinimap::DrawCursor(int vx, int vy)
+void CMinimap::DrawViewportArea(const CViewport &viewport) const
{
// Determine and save region below minimap cursor
- int x = X + XOffset + (vx * MinimapScaleX) / MINIMAP_FAC;
- int y = Y + YOffset + (vy * MinimapScaleY) / MINIMAP_FAC;
- int w = (UI.SelectedViewport->MapWidth * MinimapScaleX) / MINIMAP_FAC;
- int h = (UI.SelectedViewport->MapHeight * MinimapScaleY) / MINIMAP_FAC;
+ int x = X + XOffset + (viewport.MapPos.x * MinimapScaleX) / MINIMAP_FAC;
+ int y = Y + YOffset + (viewport.MapPos.y * MinimapScaleY) / MINIMAP_FAC;
+ int w = (viewport.MapWidth * MinimapScaleX) / MINIMAP_FAC;
+ int h = (viewport.MapHeight * MinimapScaleY) / MINIMAP_FAC;
// Draw cursor as rectangle (Note: unclipped, as it is always visible)
Video.DrawTransRectangle(UI.ViewportCursorColor, x, y, w, h, 128);
diff --git a/src/stratagus/mainloop.cpp b/src/stratagus/mainloop.cpp
index ca2aa8910..1783f9c8c 100644
--- a/src/stratagus/mainloop.cpp
+++ b/src/stratagus/mainloop.cpp
@@ -195,7 +195,7 @@ void UpdateDisplay()
}
if (!BigMapMode) {
- for (int i = 0; i < (int)UI.Fillers.size(); ++i) {
+ for (size_t i = 0; i < UI.Fillers.size(); ++i) {
UI.Fillers[i].G->DrawSubClip(0, 0,
UI.Fillers[i].G->Width,
UI.Fillers[i].G->Height,
@@ -204,7 +204,7 @@ void UpdateDisplay()
DrawMenuButtonArea();
UI.Minimap.Draw();
- UI.Minimap.DrawCursor(UI.SelectedViewport->MapPos.x, UI.SelectedViewport->MapPos.y);
+ UI.Minimap.DrawViewportArea(*UI.SelectedViewport);
UI.InfoPanel.Draw();
UI.ButtonPanel.Draw();