From 45176f4852cd5cbbb8cab64214bef17208adf039 Mon Sep 17 00:00:00 2001 From: Deskull Date: Thu, 19 Jun 2014 21:10:36 +0900 Subject: [PATCH] Change ID in camp to Tag. --- Deeangband/Creature.cpp | 8 ++++---- Deeangband/Creature.h | 9 +++++---- Deeangband/Deeangband.h | 4 ++-- Deeangband/Species.cpp | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Deeangband/Creature.cpp b/Deeangband/Creature.cpp index d76e953..9637f58 100644 --- a/Deeangband/Creature.cpp +++ b/Deeangband/Creature.cpp @@ -102,7 +102,7 @@ namespace Deeangband this->maxFeed = speciesPtr->GetBaseFeed(); this->weight = distWeight(Dice::mt); this->height = distHeight(Dice::mt); - this->campID = CAMP_FIELD_NATIVE; + this->campTag = TAG_VARIABLE; //this->firstRace = speciesPtr->baseFirstRace; //this->secondRace = speciesPtr->baseSecondRace; } @@ -133,7 +133,7 @@ namespace Deeangband this->skillExpList.clear(); this->turn = 0; - this->campID = CAMP_FIELD_NATIVE; + this->campTag = TAG_VARIABLE; this->fieldID = -1; this->position.Set(0, 0); @@ -340,9 +340,9 @@ namespace Deeangband else return 0; } - ID Creature::GetCampID(void) + TAG Creature::GetCampTag(void) { - return this->campID; + return this->campTag; } bool Creature::Walk(DIRECTION dir) diff --git a/Deeangband/Creature.h b/Deeangband/Creature.h index 67150ca..2ddd977 100644 --- a/Deeangband/Creature.h +++ b/Deeangband/Creature.h @@ -12,6 +12,7 @@ #include "BaseStatusTable.h" #include "Color.h" #include "Coordinates.h" +#include "Deeangband.h" #include "Discipline.h" #include "Direction.h" #include "Effect.h" @@ -93,7 +94,7 @@ namespace Deeangband std::map skillExpList; //!< ƒXƒLƒ‹ŒoŒ±’lƒŠƒXƒg - ID campID; //!< Š‘®w‰cID + TAG campTag; //!< Š‘®w‰cƒ^ƒO TURN turn; //!< ¶‘¶‘ƒ^[ƒ“” @@ -374,10 +375,10 @@ namespace Deeangband SKILL_EXP Creature::GetSkillExp(TAG tag); /*! - * @brief ƒNƒŠ[ƒ`ƒƒ[‚̏Š‘®w‰cID‚ð•Ô‚· - * @return Š‘®w‰cID + * @brief ƒNƒŠ[ƒ`ƒƒ[‚̏Š‘®w‰cTag‚ð•Ô‚· + * @return Š‘®w‰cTag */ - ID Creature::GetCampID(void); + TAG Creature::GetCampTag(void); /*! * @brief XMLƒVƒŠƒAƒ‰ƒCƒY‚É‚æ‚éƒQ[ƒ€ƒf[ƒ^•Û‘¶ˆ— diff --git a/Deeangband/Deeangband.h b/Deeangband/Deeangband.h index 6b83e33..972c21a 100644 --- a/Deeangband/Deeangband.h +++ b/Deeangband/Deeangband.h @@ -14,8 +14,8 @@ #define SPECIAL_NAME_UNKNOWN "UNKNOWN" //!< –¼Ì‚̃_ƒ~[–¼ #define SPECIAL_TAG_UNKNOWN "XXX_UNKNOWN" //!< ƒQ[ƒ€—v‘fƒ^ƒO‚̃_ƒ~[–¼ -#define CAMP_VARIABLE -1 //!< Š‘®w‰cF–¢ŒÅ’èiSpeciesƒNƒ‰ƒXŽž‚̂݁j -#define CAMP_FIELD_NATIVE -2 //!< Š‘®w‰cFƒtƒƒA“y’… + +#define TAG_VARIABLE "VARIABLE" //!< —v‘f‰Â•Ïƒ^ƒO /*! * ƒQ[ƒ€ƒRƒ}ƒ“ƒh’è‹` diff --git a/Deeangband/Species.cpp b/Deeangband/Species.cpp index d152cd9..c47c7bb 100644 --- a/Deeangband/Species.cpp +++ b/Deeangband/Species.cpp @@ -34,7 +34,7 @@ namespace Deeangband this->baseStatus.Set(8, 8, 8, 8, 8, 8); this->skillExpList.clear(); - this->baseCamp = CAMP_VARIABLE; + this->baseCamp = TAG_VARIABLE; return; } -- 2.11.0