From 0f55595ddf0ed34c3dc3a2fe6202285f4440f015 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Sun, 18 May 2014 20:15:31 +0900
Subject: [PATCH] Fix error of naming rule in Square class.

---
 Deeangband/Floor.cpp          |  2 +-
 Deeangband/GameSurfaceSDL.cpp |  2 +-
 Deeangband/Square.cpp         |  4 ++--
 Deeangband/Square.h           |  6 +++---
 lib-Vanilla/Feature.xml       | 24 ++++++++++++------------
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Deeangband/Floor.cpp b/Deeangband/Floor.cpp
index e8c63e4..657849d 100644
--- a/Deeangband/Floor.cpp
+++ b/Deeangband/Floor.cpp
@@ -23,7 +23,7 @@ namespace Deeangband
 		{
 			for(x = 0; x < width; x++)
 			{
-				squares[y].push_back(boost::shared_ptr<Square>(new Square()));			
+				squares[y].push_back(boost::shared_ptr<Square>(new Square()));
 			}
 		}
 
diff --git a/Deeangband/GameSurfaceSDL.cpp b/Deeangband/GameSurfaceSDL.cpp
index 46f4334..fc3f10f 100644
--- a/Deeangband/GameSurfaceSDL.cpp
+++ b/Deeangband/GameSurfaceSDL.cpp
@@ -534,7 +534,7 @@ namespace Deeangband
 			{
 				if(px < floorPtr->GetWidth() && py < floorPtr->GetHeight())
 				{
-					TAG tag = floorPtr->GetSquare(px, py)->getFeatureTag();
+					TAG tag = floorPtr->GetSquare(px, py)->GetFeatureTag();
 					Color symColor = gameWorld->GetFeature(tag)->GetSymColor();
 					Color backColor = gameWorld->GetFeature(tag)->GetBackColor();
 					SDL_Color sdlSymCol = {(Uint8)symColor.GetRed(), (Uint8)symColor.GetGreen(), (Uint8)symColor.GetBlue(), (Uint8)symColor.GetAlpha()};
diff --git a/Deeangband/Square.cpp b/Deeangband/Square.cpp
index 0f238c9..2a5a6ac 100644
--- a/Deeangband/Square.cpp
+++ b/Deeangband/Square.cpp
@@ -36,12 +36,12 @@ namespace Deeangband
 		return false;
 	}
 
-	TAG Square::getFeatureTag(void)
+	TAG Square::GetFeatureTag(void)
 	{
 		return this->featureTag;
 	}
 
-	Feature *Square::getFeaturePtr(void)
+	Feature *Square::GetFeaturePtr(void)
 	{
 		return NULL;
 	}
diff --git a/Deeangband/Square.h b/Deeangband/Square.h
index b31a001..76e38eb 100644
--- a/Deeangband/Square.h
+++ b/Deeangband/Square.h
@@ -55,17 +55,17 @@ namespace Deeangband
 		/*!
 		* @brief Š‘®‚·‚éƒtƒƒA‚̃|ƒCƒ“ƒ^‚ð•Ô‚·B
 		*/
-		Floor* getFloorPtr(void);
+		Floor* GetFloorPtr(void);
 
 		/*!
 		* @brief ‘Ήž‚·‚é’nŒ`‚̃^ƒO‚ð•Ô‚·B
 		*/
-		TAG getFeatureTag(void);
+		TAG GetFeatureTag(void);
 
 		/*!
 		* @brief ‘Ήž‚·‚é’nŒ`‚̃|ƒCƒ“ƒ^‚ð•Ô‚·B
 		*/
-		Feature* getFeaturePtr(void);
+		Feature* GetFeaturePtr(void);
 
 		/*!
 		* @brief Žó‚¯‚½Œø‰Ê‚ðˆ—‚·‚é
diff --git a/lib-Vanilla/Feature.xml b/lib-Vanilla/Feature.xml
index 64814c7..18dc2cb 100644
--- a/lib-Vanilla/Feature.xml
+++ b/lib-Vanilla/Feature.xml
@@ -10,11 +10,11 @@
 			<px class_id="3" tracking_level="1" version="10" object_id="_0">
 				<name>‰i‹v°</name>
 				<tileID>-1</tileID>
-				<symbol>88</symbol>
+				<symbol>.</symbol>
 				<symColor class_id="4" tracking_level="0" version="10">
-					<Red>40</Red>
-					<Green>40</Green>
-					<Blue>40</Blue>
+					<Red>255</Red>
+					<Green>255</Green>
+					<Blue>255</Blue>
 					<Alpha>255</Alpha>
 				</symColor>
 				<backColor>
@@ -32,18 +32,18 @@
 			<px class_id_reference="3" object_id="_1">
 				<name>‰i‹v•Ç</name>
 				<tileID>-1</tileID>
-				<symbol>88</symbol>
+				<symbol>#</symbol>
 				<symColor>
-					<Red>40</Red>
-					<Green>40</Green>
-					<Blue>40</Blue>
-					<Alpha>255</Alpha>
-				</symColor>
-				<backColor>
 					<Red>0</Red>
 					<Green>0</Green>
 					<Blue>0</Blue>
 					<Alpha>255</Alpha>
+				</symColor>
+				<backColor>
+					<Red>255</Red>
+					<Green>255</Green>
+					<Blue>255</Blue>
+					<Alpha>255</Alpha>
 				</backColor>
 			</px>
 		</second>
@@ -54,7 +54,7 @@
 			<px class_id_reference="3" object_id="_2">
 				<name>–¢’m‚Ì’nŒ`</name>
 				<tileID>-1</tileID>
-				<symbol>”</symbol>
+				<symbol>?</symbol>
 				<symColor>
 					<Red>40</Red>
 					<Green>40</Green>
-- 
2.11.0