From: Deskull <desull@users.sourceforge.jp>
Date: Mon, 9 Jun 2014 14:10:57 +0000 (+0900)
Subject: Add abilityLiat and that's property function to GameWorld class.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=17de2289916b6822ca58144a6be0da30f7385724;p=deeangband%2FDeeangband-new.git

Add abilityLiat and that's property function to GameWorld class.
---

diff --git a/Deeangband/GameWorld.cpp b/Deeangband/GameWorld.cpp
index 0ead317..1720db7 100644
--- a/Deeangband/GameWorld.cpp
+++ b/Deeangband/GameWorld.cpp
@@ -504,6 +504,11 @@ namespace Deeangband
 		return &(*creatureList[id]);
 	}
 
+	std::map<TAG, boost::shared_ptr<Ability>> *GameWorld::GetAbilityList(void)
+	{
+		return &(this->abilityList);
+	}
+
 	std::map<ID, boost::shared_ptr<Creature>> *GameWorld::GetCreatureList(void)
 	{
 		return &(this->creatureList);
diff --git a/Deeangband/GameWorld.h b/Deeangband/GameWorld.h
index 86e2659..e7141ea 100644
--- a/Deeangband/GameWorld.h
+++ b/Deeangband/GameWorld.h
@@ -11,6 +11,7 @@
 #include "stdafx.h"
 #include "Deeangband.h"
 
+#include "Ability.h"
 #include "Authority.h"
 #include "Building.h"
 #include "Camp.h"
@@ -50,6 +51,7 @@ namespace Deeangband
 	private:
 
 		//Ã“Iƒf[ƒ^ƒŠƒXƒg
+		std::map<TAG, boost::shared_ptr<Ability>> abilityList;              /*!<‘S”­“®‹Z”\ƒŠƒXƒg*/
 		std::map<TAG, boost::shared_ptr<Authority>> authorityList;          /*!<‘SŒ ”\ƒŠƒXƒg*/
 		std::map<TAG, boost::shared_ptr<Building>> buildingList;            /*!<‘SŽ{ÝƒŠƒXƒg*/
 		std::map<TAG, boost::shared_ptr<Camp>> campList;                    /*!<‘Sw‰cƒŠƒXƒg*/
@@ -58,7 +60,8 @@ namespace Deeangband
 		std::map<TAG, boost::shared_ptr<Effect>> effectList;                /*!<‘SŒø‰Ê‘®«ƒŠƒXƒg*/
 		std::map<TAG, boost::shared_ptr<Feature>> featureList;              /*!<‘S’nŒ`ƒŠƒXƒg*/
 		std::map<TAG, boost::shared_ptr<FixedArtifact>> fixedArtifactList;  /*!<‘SŒÅ’èƒA[ƒeƒBƒtƒ@ƒNƒgƒŠƒXƒg*/
-		std::map<TAG, boost::shared_ptr<ItemBase>> itemBaseList;            /*!<‘SƒAƒCƒeƒ€ƒx[ƒXƒŠƒXƒg*/		std::map<TAG, boost::shared_ptr<ItemEgo>> itemEgoList;              /*!<‘SƒAƒCƒeƒ€ƒGƒSƒŠƒXƒg*/
+		std::map<TAG, boost::shared_ptr<ItemBase>> itemBaseList;            /*!<‘SƒAƒCƒeƒ€ƒx[ƒXƒŠƒXƒg*/
+		std::map<TAG, boost::shared_ptr<ItemEgo>> itemEgoList;              /*!<‘SƒAƒCƒeƒ€ƒGƒSƒŠƒXƒg*/
 		std::map<TAG, boost::shared_ptr<ItemTrait>> itemTraitList;          /*!<‘SƒAƒCƒeƒ€“Á«ƒŠƒXƒg*/
 		std::map<TAG, boost::shared_ptr<Karma>> karmaList;                  /*!<‘SƒJƒ‹ƒ}ƒŠƒXƒg*/
 		std::map<TAG, boost::shared_ptr<Quest>> questList;                  /*!<‘SƒNƒGƒXƒg“Á«ƒŠƒXƒg*/
@@ -398,8 +401,14 @@ namespace Deeangband
 		Creature *GameWorld::GetCreature(ID id);
 
 		/*!
+		* @brief GameWorld’†‚É‘¶Ý‚·‚é”­“®‹Z”\‚ð•Ô‚·
+		* @return ‘S”­“®‹Z”\‚̃ŠƒXƒg
+		*/
+		std::map<TAG, boost::shared_ptr<Ability>> *GameWorld::GetAbilityList(void);
+
+		/*!
 		* @brief GameWorld’†‚É‘¶Ý‚·‚éƒNƒŠ[ƒ`ƒƒ[‚ð•Ô‚·
-		* @return ƒNƒŠ[ƒ`ƒƒ[‚̃ŠƒXƒg
+		* @return ‘SƒNƒŠ[ƒ`ƒƒ[‚̃ŠƒXƒg
 		*/
 		std::map<ID, boost::shared_ptr<Creature>> *GameWorld::GetCreatureList(void);