From 829e03df97228213c47992b998483e288f1defd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>
Date: Sun, 31 Mar 2013 17:28:10 +0200
Subject: [PATCH] Rename GrayScale to GScale because GrayScale is #define in
X11/X.h
---
src/include/icons.h | 2 +-
src/ui/icons.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/include/icons.h b/src/include/icons.h
index f97a237dc..fbd52ac75 100644
--- a/src/include/icons.h
+++ b/src/include/icons.h
@@ -126,7 +126,7 @@ public:
public:
CGraphic *G; /// Graphic data
- CGraphic *GrayScale; /// Icon when drawn grayscaled
+ CGraphic *GScale; /// Icon when drawn grayscaled
int Frame; /// Frame number in graphic
private:
std::string Ident; /// Icon identifier
diff --git a/src/ui/icons.cpp b/src/ui/icons.cpp
index 8307f089f..c265bf104 100644
--- a/src/ui/icons.cpp
+++ b/src/ui/icons.cpp
@@ -60,7 +60,7 @@ static IconMap Icons; /// Map of ident to icon.
/**
** CIcon constructor
*/
-CIcon::CIcon(const std::string &ident) : G(NULL), GrayScale(NULL), Frame(0), Ident(ident)
+CIcon::CIcon(const std::string &ident) : G(NULL), GScale(NULL), Frame(0), Ident(ident)
{
}
@@ -70,7 +70,7 @@ CIcon::CIcon(const std::string &ident) : G(NULL), GrayScale(NULL), Frame(0), Ide
CIcon::~CIcon()
{
CGraphic::Free(this->G);
- CGraphic::Free(this->GrayScale);
+ CGraphic::Free(this->GScale);
}
/**
@@ -112,7 +112,7 @@ void CIcon::Load()
{
Assert(G);
G->Load();
- GrayScale = G->Clone(true);
+ GScale = G->Clone(true);
if (Frame >= G->NumFrames) {
DebugPrint("Invalid icon frame: %s - %d\n" _C_ Ident.c_str() _C_ Frame);
Frame = 0;
@@ -142,7 +142,7 @@ void CIcon::DrawIcon(const CPlayer &player, const PixelPos &pos) const
*/
void CIcon::DrawGrayscaleIcon(const PixelPos &pos) const
{
- this->GrayScale->DrawFrameClip(this->Frame, pos.x, pos.y);
+ this->GScale->DrawFrameClip(this->Frame, pos.x, pos.y);
}
/**