Commit: c9abd0ea6be51d80e827f003f5bd80adec9c0fc5 - Deeangband (git)

Deeangbandのフルスクラッチ新ソースコード。BSD系ライセンスを採用予定。

Commit MetaInfo

• Revision: c9abd0ea6be51d80e827f003f5bd80adec9c0fc5 (tree)
• Time: 2014-03-12 22:46:12
• Author: Deskull <deskull@user...>
• Commiter: Deskull

Log Message

Add SetDammyData() to Square class.

Change Summary

• modified: Deeangband/GameSurfaceSDL.cpp
• modified: Deeangband/Square.cpp
• modified: Deeangband/Square.h

Incremental Difference

--- a/Deeangband/GameSurfaceSDL.cpp
+++ b/Deeangband/GameSurfaceSDL.cpp
@@ -298,13 +298,13 @@ void GameSurfaceSDL::ViewFloor(Floor *floorPtr, int x, int y, int w, int h)
 		{
 			if(px < floorPtr->GetWidth() && py < floorPtr->GetHeight())
 			{
-				ID id = floorPtr->GetSquare(px, py)->getFeatureID();
-				Color symColor = floorPtr->GetGameWorld()->GetFeature("NONE")->GetSymColor();
-				Color backColor = floorPtr->GetGameWorld()->GetFeature("NONE")->GetBackColor();
+				TAG tag = floorPtr->GetSquare(px, py)->getFeatureTag();
+				Color symColor = floorPtr->GetGameWorld()->GetFeature(tag)->GetSymColor();
+				Color backColor = floorPtr->GetGameWorld()->GetFeature(tag)->GetBackColor();
 				SDL_Color sdlSymCol = {symColor.r, symColor.g, symColor.b, symColor.a};
 				SDL_Rect blitRect = {240 + px * 24, py * 24 , 24, 24};
 				SDL_FillRect(windowSurface, &blitRect, SDL_MapRGBA(windowSurface->format, backColor.r, backColor.g, backColor.b, backColor.a));
-				sprintf_s(symBuf, 5, "%c", floorPtr->GetGameWorld()->GetFeature("NONE")->GetSymbol()); 
+				sprintf_s(symBuf, 5, "%c", floorPtr->GetGameWorld()->GetFeature(tag)->GetSymbol()); 
 
 				symbolSurface = TTF_RenderUTF8_Blended(font, toUTF8(symBuf).c_str(), sdlSymCol);
 				blitRect.x += (24 - symbolSurface->w) / 2;
@@ -331,7 +331,7 @@ void GameSurfaceSDL::drawFloor(Floor *floorPtr, int x, int y, int w, int h)
 		{
 			if(px < floorPtr->GetWidth() && py < floorPtr->GetHeight())
 			{
-				ID id = floorPtr->GetSquare(px, py)->getFeatureID();
+				//ID id = floorPtr->GetSquare(px, py)->getFeatureID();
 				SDL_Rect blitRect = {280 + px * 24, py * 24 , 30, 30};
 				sprintf_s(symBuf, 5, "%c", floorPtr->GetGameWorld()->GetFeature("NONE")->GetSymbol()); 
 				symbolSurface = TTF_RenderUTF8_Blended(font, toUTF8(symBuf).c_str(), color);

--- a/Deeangband/Square.cpp
+++ b/Deeangband/Square.cpp
@@ -11,17 +11,20 @@
 
 Square::Square(Floor *floorPtr)
 {
-	this->floorPtr = NULL;
-	this->featureID = 0;
-	this->hitPoint = this->maxPoint = 100;
-	this->floorPtr = floorPtr;
+	SetDammyData();
 }
 
 Square::Square()
 {
+	SetDammyData();
+}
+
+void Square::SetDammyData()
+{
 	this->floorPtr = NULL;
-	this->featureID = 0;
+	this->featureTag = "UNKNOWN";
 	this->hitPoint = this->maxPoint = 100;
+	this->floorPtr = floorPtr;
 }
 
 Square::~Square()
@@ -37,9 +40,9 @@ bool Square::TakeEffect(Effect *effectPtr, POWER amount)
 	return false;
 }
 
-ID Square::getFeatureID(void)
+TAG Square::getFeatureTag(void)
 {
-	return this->featureID;
+	return this->featureTag;
 }
 
 Feature *Square::getFeaturePtr(void)

--- a/Deeangband/Square.h
+++ b/Deeangband/Square.h
@@ -19,10 +19,10 @@
 class Square : public GameElement
 {
 private:
-	Floor *floorPtr; //!<所属フロア参照ポインタ
-	ID featureID;    //!<地形ID
-	HP hitPoint;     //!<地形現HP
-	HP maxPoint;     //!<地形最大HP
+	Floor *floorPtr;  //!<所属フロア参照ポインタ
+	TAG featureTag;    //!<地形タグ
+	HP hitPoint;      //!<地形現HP
+	HP maxPoint;      //!<地形最大HP
 public:
 
 	/*! 
@@ -41,15 +41,21 @@ public:
 	 */
 	Square::~Square();
 
+	/*! 
+	 * @brief ダミーデータによる初期化
+	 * @return なし
+	 */
+	void Square::SetDammyData(void);
+
 	/*!
 	 * @brief 所属するフロアのポインタを返す。
 	 */
 	Floor* getFloorPtr(void);
 
 	/*!
-	 * @brief 対応する地形のIDを返す。
+	 * @brief 対応する地形のタグを返す。
 	 */
-	ID getFeatureID(void);
+	TAG getFeatureTag(void);
 
 	/*!
 	 * @brief 対応する地形のポインタを返す。