From 046335da232e800da128af97728c1733d1aa5799 Mon Sep 17 00:00:00 2001 From: Deskull Date: Fri, 7 Mar 2014 21:55:13 +0900 Subject: [PATCH] Renam Tag type to TAG. --- Deeangband/Authority.cpp | 2 +- Deeangband/Authority.h | 4 +- Deeangband/Building.cpp | 2 +- Deeangband/Building.h | 4 +- Deeangband/Camp.cpp | 2 +- Deeangband/Camp.h | 4 +- Deeangband/Creature.cpp | 2 +- Deeangband/Creature.h | 8 ++-- Deeangband/CreatureTemplate.cpp | 2 +- Deeangband/CreatureTemplate.h | 4 +- Deeangband/CreatureTrait.cpp | 2 +- Deeangband/CreatureTrait.h | 4 +- Deeangband/Deeangband.h | 2 +- Deeangband/Door.cpp | 2 +- Deeangband/Door.h | 4 +- Deeangband/Dungeon.cpp | 2 +- Deeangband/Dungeon.h | 4 +- Deeangband/Effect.cpp | 2 +- Deeangband/Effect.h | 4 +- Deeangband/Feature.cpp | 2 +- Deeangband/Feature.h | 4 +- Deeangband/FixedArtifact.cpp | 2 +- Deeangband/FixedArtifact.h | 4 +- Deeangband/FixedFloor.cpp | 2 +- Deeangband/FixedFloor.h | 4 +- Deeangband/Floor.cpp | 2 +- Deeangband/Floor.h | 4 +- Deeangband/GameCampaign.cpp | 2 +- Deeangband/GameCampaign.h | 4 +- Deeangband/GameElement.cpp | 6 +-- Deeangband/GameElement.h | 10 ++--- Deeangband/GameWorld.cpp | 30 ++++++------- Deeangband/GameWorld.h | 96 ++++++++++++++++++++--------------------- Deeangband/Item.cpp | 2 +- Deeangband/Item.h | 4 +- Deeangband/ItemBase.cpp | 2 +- Deeangband/ItemBase.h | 4 +- Deeangband/ItemEgo.cpp | 2 +- Deeangband/ItemEgo.h | 4 +- Deeangband/ItemTrait.cpp | 2 +- Deeangband/ItemTrait.h | 4 +- Deeangband/Karma.cpp | 2 +- Deeangband/Karma.h | 4 +- Deeangband/Quest.cpp | 2 +- Deeangband/Quest.h | 4 +- Deeangband/Race.cpp | 2 +- Deeangband/Race.h | 4 +- Deeangband/Skill.cpp | 2 +- Deeangband/Skill.h | 4 +- Deeangband/Species.cpp | 2 +- Deeangband/Species.h | 4 +- Deeangband/Stair.cpp | 2 +- Deeangband/Stair.h | 4 +- Deeangband/StartingClass.cpp | 2 +- Deeangband/StartingClass.h | 4 +- Deeangband/Trap.cpp | 2 +- Deeangband/Trap.h | 4 +- Deeangband/TrapBase.cpp | 2 +- Deeangband/TrapBase.h | 4 +- 59 files changed, 155 insertions(+), 155 deletions(-) diff --git a/Deeangband/Authority.cpp b/Deeangband/Authority.cpp index a92a1e5..553fb70 100644 --- a/Deeangband/Authority.cpp +++ b/Deeangband/Authority.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Authority.h" -Authority::Authority(ID id, Tag tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld) +Authority::Authority(ID id, TAG tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld) { return; } diff --git a/Deeangband/Authority.h b/Deeangband/Authority.h index 5abe6cb..f45f19d 100644 --- a/Deeangband/Authority.h +++ b/Deeangband/Authority.h @@ -24,10 +24,10 @@ public: /*! * @brief AuthorityƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Authority::Authority(ID id, Tag tag, GameWorld *gameWorld); + Authority::Authority(ID id, TAG tag, GameWorld *gameWorld); Authority::Authority(void); diff --git a/Deeangband/Building.cpp b/Deeangband/Building.cpp index 81c2f86..5bc46e9 100644 --- a/Deeangband/Building.cpp +++ b/Deeangband/Building.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Building.h" -Building::Building(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Building::Building(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/Building.h b/Deeangband/Building.h index 30bec7f..e126f62 100644 --- a/Deeangband/Building.h +++ b/Deeangband/Building.h @@ -23,10 +23,10 @@ public: /*! * @brief BuildingƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Building::Building(ID id, Tag tag, GameWorld *gameWorld); + Building::Building(ID id, TAG tag, GameWorld *gameWorld); Building::Building(void); diff --git a/Deeangband/Camp.cpp b/Deeangband/Camp.cpp index 7bea99d..5b5aa2e 100644 --- a/Deeangband/Camp.cpp +++ b/Deeangband/Camp.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Camp.h" -Camp::Camp(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Camp::Camp(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/Camp.h b/Deeangband/Camp.h index 96c6b12..5fc781e 100644 --- a/Deeangband/Camp.h +++ b/Deeangband/Camp.h @@ -25,10 +25,10 @@ public: /*! * @brief CampƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Camp::Camp(ID id, Tag tag, GameWorld *gameWorld); + Camp::Camp(ID id, TAG tag, GameWorld *gameWorld); Camp::Camp(void); diff --git a/Deeangband/Creature.cpp b/Deeangband/Creature.cpp index f8abb54..56b22e4 100644 --- a/Deeangband/Creature.cpp +++ b/Deeangband/Creature.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Creature.h" -Creature::Creature(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Creature::Creature(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { Creature(); return; diff --git a/Deeangband/Creature.h b/Deeangband/Creature.h index ffe4a6a..1df341c 100644 --- a/Deeangband/Creature.h +++ b/Deeangband/Creature.h @@ -46,7 +46,7 @@ private: ID floorID; /*!< Œ»Ý‚¢‚éƒtƒƒAID */ Coordinates position; /*!< Œ»À•W */ - map itemList; /*!< ŠŽƒAƒCƒeƒ€ƒŠƒXƒg */ + map itemList; /*!< ŠŽƒAƒCƒeƒ€ƒŠƒXƒg */ char symbol; /*!< ƒVƒ“ƒ{ƒ‹ƒLƒƒƒ‰ */ Color symbolColor; /*!< ƒVƒ“ƒ{ƒ‹ƒJƒ‰[ */ ID tileID ;/*!< ƒ^ƒCƒ‹ID */ @@ -98,10 +98,10 @@ public: /*! * @brief CreatureƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Creature::Creature(ID id, Tag tag, GameWorld *gameWorld); + Creature::Creature(ID id, TAG tag, GameWorld *gameWorld); Creature::Creature(void); @@ -190,7 +190,7 @@ public: * @brief ƒNƒŠ[ƒ`ƒƒ[‚̏ŠŽ•iƒŠƒXƒg‚ð•Ô‚· * @return ƒNƒŠ[ƒ`ƒƒ[ŠŽ•iƒŠƒXƒgƒ}ƒbƒv */ - map *Creature::getItemList(void); + map *Creature::getItemList(void); /*! * @brief ƒNƒŠ[ƒ`ƒƒ[‚ÌŒ»ƒ\ƒEƒ‹’l‚ð•Ô‚· diff --git a/Deeangband/CreatureTemplate.cpp b/Deeangband/CreatureTemplate.cpp index d0961c6..6d5ebf0 100644 --- a/Deeangband/CreatureTemplate.cpp +++ b/Deeangband/CreatureTemplate.cpp @@ -10,7 +10,7 @@ #include "Creature.h" #include "CreatureTemplate.h" -CreatureTemplate::CreatureTemplate(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +CreatureTemplate::CreatureTemplate(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { CreatureTemplate(); return; diff --git a/Deeangband/CreatureTemplate.h b/Deeangband/CreatureTemplate.h index a0fedb5..b8b7f72 100644 --- a/Deeangband/CreatureTemplate.h +++ b/Deeangband/CreatureTemplate.h @@ -24,10 +24,10 @@ public: /*! * @brief CreatureTemplateƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - CreatureTemplate::CreatureTemplate(ID id, Tag tag, GameWorld *gameWorld); + CreatureTemplate::CreatureTemplate(ID id, TAG tag, GameWorld *gameWorld); /*! * @brief CreatureTemplateƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(ƒfƒtƒHƒ‹ƒg’l“ü—Í) diff --git a/Deeangband/CreatureTrait.cpp b/Deeangband/CreatureTrait.cpp index 2172dae..c75f50a 100644 --- a/Deeangband/CreatureTrait.cpp +++ b/Deeangband/CreatureTrait.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "CreatureTrait.h" -CreatureTrait::CreatureTrait(ID id, Tag tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld) +CreatureTrait::CreatureTrait(ID id, TAG tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld) { return; } diff --git a/Deeangband/CreatureTrait.h b/Deeangband/CreatureTrait.h index 343b5f3..86a3a83 100644 --- a/Deeangband/CreatureTrait.h +++ b/Deeangband/CreatureTrait.h @@ -23,10 +23,10 @@ public: /*! * @brief CreatureTraitƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - CreatureTrait::CreatureTrait(ID id, Tag tag, GameWorld *gameWorld); + CreatureTrait::CreatureTrait(ID id, TAG tag, GameWorld *gameWorld); CreatureTrait::CreatureTrait(void); diff --git a/Deeangband/Deeangband.h b/Deeangband/Deeangband.h index e3e7844..ee805d0 100644 --- a/Deeangband/Deeangband.h +++ b/Deeangband/Deeangband.h @@ -71,7 +71,7 @@ typedef int AC; //!< typedef int EV; //!< ‰ñ”ð—Í typedef int VO; //!< ˆÓŽu—Í typedef int ID; //!< ƒQ[ƒ€—v‘fID -typedef string Tag; //!< ƒQ[ƒ€—v‘f•¶Žš—ñID +typedef string TAG; //!< ƒQ[ƒ€—v‘f•¶Žš—ñID typedef int Weight; //!< d—Ê typedef int DEPTH; //!< ŠK‘w[“x typedef int NUMBER; //!< ŒÂ” diff --git a/Deeangband/Door.cpp b/Deeangband/Door.cpp index b9f3152..437afd5 100644 --- a/Deeangband/Door.cpp +++ b/Deeangband/Door.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Door.h" -Door::Door(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Door::Door(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/Door.h b/Deeangband/Door.h index 56ea508..f1248a5 100644 --- a/Deeangband/Door.h +++ b/Deeangband/Door.h @@ -23,10 +23,10 @@ public: /*! * @brief DoorƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Door::Door(ID id, Tag tag, GameWorld *gameWorld); + Door::Door(ID id, TAG tag, GameWorld *gameWorld); Door::Door(void); diff --git a/Deeangband/Dungeon.cpp b/Deeangband/Dungeon.cpp index d7217a4..8da6caa 100644 --- a/Deeangband/Dungeon.cpp +++ b/Deeangband/Dungeon.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Dungeon.h" -Dungeon::Dungeon(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Dungeon::Dungeon(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/Dungeon.h b/Deeangband/Dungeon.h index 41e6ab1..bbf19e3 100644 --- a/Deeangband/Dungeon.h +++ b/Deeangband/Dungeon.h @@ -52,10 +52,10 @@ public: /*! * @brief DungeonƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Dungeon::Dungeon(ID id, Tag tag, GameWorld *gameWorld); + Dungeon::Dungeon(ID id, TAG tag, GameWorld *gameWorld); Dungeon::Dungeon(void); diff --git a/Deeangband/Effect.cpp b/Deeangband/Effect.cpp index 238b421..8a28c96 100644 --- a/Deeangband/Effect.cpp +++ b/Deeangband/Effect.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Effect.h" -Effect::Effect(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Effect::Effect(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/Effect.h b/Deeangband/Effect.h index 4524982..97ff6f9 100644 --- a/Deeangband/Effect.h +++ b/Deeangband/Effect.h @@ -65,10 +65,10 @@ public: /*! * @brief EffectƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Effect::Effect(ID id, Tag tag, GameWorld *gameWorld); + Effect::Effect(ID id, TAG tag, GameWorld *gameWorld); Effect::Effect(void); diff --git a/Deeangband/Feature.cpp b/Deeangband/Feature.cpp index 1682e1b..5ff27cb 100644 --- a/Deeangband/Feature.cpp +++ b/Deeangband/Feature.cpp @@ -10,7 +10,7 @@ #include "Feature.h" -Feature::Feature(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Feature::Feature(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { Feature(); return; diff --git a/Deeangband/Feature.h b/Deeangband/Feature.h index 3e936d9..947ca09 100644 --- a/Deeangband/Feature.h +++ b/Deeangband/Feature.h @@ -28,10 +28,10 @@ public: /*! * @brief FeatureƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Feature::Feature(ID id, Tag tag, GameWorld *gameWorld); + Feature::Feature(ID id, TAG tag, GameWorld *gameWorld); Feature::Feature(void); diff --git a/Deeangband/FixedArtifact.cpp b/Deeangband/FixedArtifact.cpp index 24ba428..3968e24 100644 --- a/Deeangband/FixedArtifact.cpp +++ b/Deeangband/FixedArtifact.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "FixedArtifact.h" -FixedArtifact::FixedArtifact(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +FixedArtifact::FixedArtifact(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/FixedArtifact.h b/Deeangband/FixedArtifact.h index 6349d22..8fcf016 100644 --- a/Deeangband/FixedArtifact.h +++ b/Deeangband/FixedArtifact.h @@ -23,10 +23,10 @@ public: /*! * @brief FixedArtifactƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - FixedArtifact::FixedArtifact(ID id, Tag tag, GameWorld *gameWorld); + FixedArtifact::FixedArtifact(ID id, TAG tag, GameWorld *gameWorld); FixedArtifact::FixedArtifact(void); diff --git a/Deeangband/FixedFloor.cpp b/Deeangband/FixedFloor.cpp index 3ef7dd4..a510cc1 100644 --- a/Deeangband/FixedFloor.cpp +++ b/Deeangband/FixedFloor.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "FixedFloor.h" -FixedFloor::FixedFloor(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +FixedFloor::FixedFloor(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/FixedFloor.h b/Deeangband/FixedFloor.h index 4f7705e..3bbd2db 100644 --- a/Deeangband/FixedFloor.h +++ b/Deeangband/FixedFloor.h @@ -21,10 +21,10 @@ public: /*! * @brief FixedFloorƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - FixedFloor::FixedFloor(ID id, Tag tag, GameWorld *gameWorld); + FixedFloor::FixedFloor(ID id, TAG tag, GameWorld *gameWorld); FixedFloor::FixedFloor(void); diff --git a/Deeangband/Floor.cpp b/Deeangband/Floor.cpp index a09228d..eed03d4 100644 --- a/Deeangband/Floor.cpp +++ b/Deeangband/Floor.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Floor.h" -Floor::Floor(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Floor::Floor(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { Floor(); return; diff --git a/Deeangband/Floor.h b/Deeangband/Floor.h index 69a47c0..f5a78f5 100644 --- a/Deeangband/Floor.h +++ b/Deeangband/Floor.h @@ -30,10 +30,10 @@ public: /*! * @brief FloorƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Floor::Floor(ID id, Tag tag, GameWorld *gameWorld); + Floor::Floor(ID id, TAG tag, GameWorld *gameWorld); Floor::Floor(); diff --git a/Deeangband/GameCampaign.cpp b/Deeangband/GameCampaign.cpp index 18a43bb..c184339 100644 --- a/Deeangband/GameCampaign.cpp +++ b/Deeangband/GameCampaign.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "GameCampaign.h" -GameCampaign::GameCampaign(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +GameCampaign::GameCampaign(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { } diff --git a/Deeangband/GameCampaign.h b/Deeangband/GameCampaign.h index 35cd91f..a569907 100644 --- a/Deeangband/GameCampaign.h +++ b/Deeangband/GameCampaign.h @@ -30,10 +30,10 @@ public: /*! * @brief GameCampaign ƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^( GameElement ƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - GameCampaign::GameCampaign(ID id, Tag tag, GameWorld *gameWorld); + GameCampaign::GameCampaign(ID id, TAG tag, GameWorld *gameWorld); GameCampaign::GameCampaign(void); diff --git a/Deeangband/GameElement.cpp b/Deeangband/GameElement.cpp index 9b81abc..8396652 100644 --- a/Deeangband/GameElement.cpp +++ b/Deeangband/GameElement.cpp @@ -10,7 +10,7 @@ #include "GameElement.h" -GameElement::GameElement(ID id, Tag tag, GameWorld *gameWorld) +GameElement::GameElement(ID id, TAG tag, GameWorld *gameWorld) { this->id = id; this->tag = tag; @@ -37,12 +37,12 @@ void GameElement::SetID(ID newID) this->id = newID; } -Tag GameElement::GetTag(void) +TAG GameElement::GetTAG(void) { return this->tag; } -void GameElement::SetTag(Tag newTag) +void GameElement::SetTag(TAG newTag) { this->tag = newTag; } diff --git a/Deeangband/GameElement.h b/Deeangband/GameElement.h index f86f1d5..0f358df 100644 --- a/Deeangband/GameElement.h +++ b/Deeangband/GameElement.h @@ -33,7 +33,7 @@ class GameElement private: ID id; //!< ID - Tag tag; //!< ƒ^ƒO + TAG tag; //!< ƒ^ƒO GameWorld *gameWorld; //!< Š‘®Œ³‚ÌGameWorld public: @@ -41,12 +41,12 @@ public: /*! * @brief GameElementƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^ * @param id —v‘f‚ÌID - * @param tag —v‘f‚̃^ƒO + * @param TAG —v‘f‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ GameElement::GameElement(void); - GameElement::GameElement(ID id, Tag tag, GameWorld *gameWorld); + GameElement::GameElement(ID id, TAG tag, GameWorld *gameWorld); virtual GameElement::~GameElement(void); @@ -64,12 +64,12 @@ public: /*! * @brief ƒ^ƒO‚ðÝ’è‚·‚é */ - void GameElement::SetTag(Tag newTag); + void GameElement::SetTag(TAG newTag); /*! * @brief ƒ^ƒO‚ðŽæ“¾‚·‚é */ - Tag GameElement::GetTag(); + TAG GameElement::GetTAG(); /*! * @brief Š‘®Œ³‚ÌGameWorldƒCƒ“ƒXƒ^ƒ“ƒX‚ð•Ô‚· diff --git a/Deeangband/GameWorld.cpp b/Deeangband/GameWorld.cpp index 13be601..a261737 100644 --- a/Deeangband/GameWorld.cpp +++ b/Deeangband/GameWorld.cpp @@ -74,77 +74,77 @@ PLAY_EXIT_CODE GameWorld::DoGameCommand(GAME_COMMAND command) return PLAY_EXIT_NONE; } -Authority *GameWorld::GetAuthority(Tag tag) +Authority *GameWorld::GetAuthority(TAG tag) { return &(*authorityList[tag]); } -CreatureTrait *GameWorld::GetCreatureTrait(Tag tag) +CreatureTrait *GameWorld::GetCreatureTrait(TAG tag) { return &(*creatureTraitList[tag]); } -Effect *GameWorld::GetEffect(Tag tag) +Effect *GameWorld::GetEffect(TAG tag) { return &(*effectList[tag]); } -FixedArtifact *GameWorld::GetFixedArtifact(Tag tag) +FixedArtifact *GameWorld::GetFixedArtifact(TAG tag) { return &(*fixedArtifactList[tag]); } -Feature *GameWorld::GetFeature(Tag tag) +Feature *GameWorld::GetFeature(TAG tag) { return &(*featureList[tag]); } -ItemBase *GameWorld::GetItemBase(Tag tag) +ItemBase *GameWorld::GetItemBase(TAG tag) { return &(*itemBaseList[tag]); } -ItemEgo *GameWorld::GetItemEgo(Tag tag) +ItemEgo *GameWorld::GetItemEgo(TAG tag) { return &(*itemEgoList[tag]); } -ItemTrait *GameWorld::GetItemTrait(Tag tag) +ItemTrait *GameWorld::GetItemTrait(TAG tag) { return &(*itemTraitList[tag]); } -Karma *GameWorld::GetKarma(Tag tag) +Karma *GameWorld::GetKarma(TAG tag) { return &(*karmaList[tag]); } -Skill *GameWorld::GetSkill(Tag tag) +Skill *GameWorld::GetSkill(TAG tag) { return &(*skillList[tag]); } -Species *GameWorld::GetSpecies(Tag tag) +Species *GameWorld::GetSpecies(TAG tag) { return &(*speciesList[tag]); } -TrapBase *GameWorld::GetTrapBase(Tag tag) +TrapBase *GameWorld::GetTrapBase(TAG tag) { return &(*trapBaseList[tag]); } -Building *GameWorld::GetBuilding(Tag tag) +Building *GameWorld::GetBuilding(TAG tag) { return &(*buildingList[tag]); } -Camp *GameWorld::GetCamp(Tag tag) +Camp *GameWorld::GetCamp(TAG tag) { return &(*campList[tag]); } -Dungeon *GameWorld::GetDungeon(Tag tag) +Dungeon *GameWorld::GetDungeon(TAG tag) { return &(*dungeonList[tag]); } diff --git a/Deeangband/GameWorld.h b/Deeangband/GameWorld.h index 7b3aad8..7b21e3e 100644 --- a/Deeangband/GameWorld.h +++ b/Deeangband/GameWorld.h @@ -42,21 +42,21 @@ private: GameSurface *gameSurface; //Ã“Iƒf[ƒ^ƒŠƒXƒg - map> authorityList; /*!<‘SŒ ”\ƒŠƒXƒg*/ - map> effectList; /*!<‘SŒø‰Ê‘®«ƒŠƒXƒg*/ - map> fixedArtifactList; /*!<‘SŒÅ’èƒA[ƒeƒBƒtƒ@ƒNƒgƒŠƒXƒg*/ - map> featureList; /*!<‘S’nŒ`ƒŠƒXƒg*/ - map> itemBaseList; /*!<‘SƒAƒCƒeƒ€ƒx[ƒXƒŠƒXƒg*/ - map> itemEgoList; /*!<‘SƒAƒCƒeƒ€ƒGƒSƒŠƒXƒg*/ - map> itemTraitList; /*!<‘SƒAƒCƒeƒ€“Á«ƒŠƒXƒg*/ - map> karmaList; /*!<‘SƒJƒ‹ƒ}ƒŠƒXƒg*/ - map> skillList; /*!<‘SƒXƒLƒ‹ƒŠƒXƒg*/ - map> speciesList; /*!<‘SƒNƒŠ[ƒ`ƒƒ[Ží•ÊƒŠƒXƒg*/ - map> trapBaseList; /*!<‘Sƒgƒ‰ƒbƒvƒx[ƒXŽí•ÊƒŠƒXƒg*/ - map> buildingList; /*!<‘SŽ{ÝƒŠƒXƒg*/ - map> campList; /*!<‘Sw‰cƒŠƒXƒg*/ - map> dungeonList; /*!<‘Sƒ_ƒ“ƒWƒ‡ƒ“ƒŠƒXƒg*/ - map> creatureTraitList; /*!<‘SƒNƒŠ[ƒ`ƒƒ[“Á«ƒŠƒXƒg*/ + map> authorityList; /*!<‘SŒ ”\ƒŠƒXƒg*/ + map> effectList; /*!<‘SŒø‰Ê‘®«ƒŠƒXƒg*/ + map> fixedArtifactList; /*!<‘SŒÅ’èƒA[ƒeƒBƒtƒ@ƒNƒgƒŠƒXƒg*/ + map> featureList; /*!<‘S’nŒ`ƒŠƒXƒg*/ + map> itemBaseList; /*!<‘SƒAƒCƒeƒ€ƒx[ƒXƒŠƒXƒg*/ + map> itemEgoList; /*!<‘SƒAƒCƒeƒ€ƒGƒSƒŠƒXƒg*/ + map> itemTraitList; /*!<‘SƒAƒCƒeƒ€“Á«ƒŠƒXƒg*/ + map> karmaList; /*!<‘SƒJƒ‹ƒ}ƒŠƒXƒg*/ + map> skillList; /*!<‘SƒXƒLƒ‹ƒŠƒXƒg*/ + map> speciesList; /*!<‘SƒNƒŠ[ƒ`ƒƒ[Ží•ÊƒŠƒXƒg*/ + map> trapBaseList; /*!<‘Sƒgƒ‰ƒbƒvƒx[ƒXŽí•ÊƒŠƒXƒg*/ + map> buildingList; /*!<‘SŽ{ÝƒŠƒXƒg*/ + map> campList; /*!<‘Sw‰cƒŠƒXƒg*/ + map> dungeonList; /*!<‘Sƒ_ƒ“ƒWƒ‡ƒ“ƒŠƒXƒg*/ + map> creatureTraitList; /*!<‘SƒNƒŠ[ƒ`ƒƒ[“Á«ƒŠƒXƒg*/ //“®“Iƒf[ƒ^ƒŠƒXƒg map> itemList; /*!<‘SƒAƒCƒeƒ€ƒŠƒXƒg*/ @@ -79,126 +79,126 @@ public: /*! * @brief GameWorld’†‚É‘¶Ý‚·‚錠”\‚ð•Ô‚· - * @param tag Œ ”\‚̃^ƒO + * @param TAG Œ ”\‚̃^ƒO * @return Œ ”\‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - Authority *GameWorld::GetAuthority(Tag tag); + Authority *GameWorld::GetAuthority(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒNƒŠ[ƒ`ƒƒ[“Á«‚ð•Ô‚· - * @param tag ƒNƒŠ[ƒ`ƒƒ[“Á«‚̃^ƒO + * @param TAG ƒNƒŠ[ƒ`ƒƒ[“Á«‚̃^ƒO * @return ƒNƒŠ[ƒ`ƒƒ[“Á«‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - CreatureTrait *GameWorld::GetCreatureTrait(Tag tag); + CreatureTrait *GameWorld::GetCreatureTrait(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éŒø‰Ê‘®«‚ð•Ô‚· - * @param tag Œø‰Ê‘®«‚̃^ƒO + * @param TAG Œø‰Ê‘®«‚̃^ƒO * @return Œø‰Ê‘®«‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - Effect *GameWorld::GetEffect(Tag tag); + Effect *GameWorld::GetEffect(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éŒÅ’èƒA[ƒeƒBƒtƒ@ƒNƒg‚ð•Ô‚· - * @param tag Œø‰Ê‘®«‚̃^ƒO + * @param TAG Œø‰Ê‘®«‚̃^ƒO * @return ŒÅ’èƒA[ƒeƒBƒtƒ@ƒNƒg‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - FixedArtifact *GameWorld::GetFixedArtifact(Tag tag); + FixedArtifact *GameWorld::GetFixedArtifact(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚é’nŒ`‚ð•Ô‚· - * @param tag ’nŒ`‚̃^ƒO + * @param TAG ’nŒ`‚̃^ƒO * @return ’nŒ`‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - Feature *GameWorld::GetFeature(Tag tag); + Feature *GameWorld::GetFeature(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒx[ƒXƒAƒCƒeƒ€‚ð•Ô‚· - * @param tag ƒx[ƒXƒAƒCƒeƒ€‚̃^ƒO + * @param TAG ƒx[ƒXƒAƒCƒeƒ€‚̃^ƒO * @return ƒx[ƒXƒAƒCƒeƒ€‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - ItemBase *GameWorld::GetItemBase(Tag tag); + ItemBase *GameWorld::GetItemBase(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒAƒCƒeƒ€ƒGƒS‚ð•Ô‚· - * @param tag ƒAƒCƒeƒ€ƒGƒS‚̃^ƒO + * @param TAG ƒAƒCƒeƒ€ƒGƒS‚̃^ƒO * @return ƒAƒCƒeƒ€ƒGƒS‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - ItemEgo *GameWorld::GetItemEgo(Tag tag); + ItemEgo *GameWorld::GetItemEgo(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒAƒCƒeƒ€“Á«‚ð•Ô‚· - * @param tag ƒAƒCƒeƒ€“Á«‚̃^ƒO + * @param TAG ƒAƒCƒeƒ€“Á«‚̃^ƒO * @return ƒAƒCƒeƒ€“Á«‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - ItemTrait *GameWorld::GetItemTrait(Tag tag); + ItemTrait *GameWorld::GetItemTrait(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒJƒ‹ƒ}‚ð•Ô‚· - * @param tag ƒJƒ‹ƒ}‚̃^ƒO + * @param TAG ƒJƒ‹ƒ}‚̃^ƒO * @return ƒJƒ‹ƒ}‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - Karma *GameWorld::GetKarma(Tag tag); + Karma *GameWorld::GetKarma(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒXƒLƒ‹‚ð•Ô‚· - * @param tag ƒXƒLƒ‹‚̃^ƒO + * @param TAG ƒXƒLƒ‹‚̃^ƒO * @return ƒXƒLƒ‹‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - Skill *GameWorld::GetSkill(Tag tag); + Skill *GameWorld::GetSkill(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒXƒLƒ‹‚ð•Ô‚· - * @param tag ƒXƒLƒ‹‚̃^ƒO + * @param TAG ƒXƒLƒ‹‚̃^ƒO * @return ƒXƒLƒ‹‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - Species *GameWorld::GetSpecies(Tag tag); + Species *GameWorld::GetSpecies(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒgƒ‰ƒbƒvŽí•Ê‚ð•Ô‚· - * @param tag ƒgƒ‰ƒbƒvŽí•Ê‚̃^ƒO + * @param TAG ƒgƒ‰ƒbƒvŽí•Ê‚̃^ƒO * @return ƒgƒ‰ƒbƒvŽí•Ê‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - TrapBase *GameWorld::GetTrapBase(Tag tag); + TrapBase *GameWorld::GetTrapBase(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éŽ{Ý‚ð•Ô‚· - * @param tag Ž{Ý‚̃^ƒO + * @param TAG Ž{Ý‚̃^ƒO * @return Ž{Ý‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - Building *GameWorld::GetBuilding(Tag tag); + Building *GameWorld::GetBuilding(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éw‰c‚ð•Ô‚· - * @param tag w‰c‚̃^ƒO + * @param TAG w‰c‚̃^ƒO * @return w‰c‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - Camp *GameWorld::GetCamp(Tag tag); + Camp *GameWorld::GetCamp(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒ_ƒ“ƒWƒ‡ƒ“‚ð•Ô‚· - * @param tag ƒ_ƒ“ƒWƒ‡ƒ“‚̃^ƒO + * @param TAG ƒ_ƒ“ƒWƒ‡ƒ“‚̃^ƒO * @return ƒ_ƒ“ƒWƒ‡ƒ“‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ - Dungeon *GameWorld::GetDungeon(Tag tag); + Dungeon *GameWorld::GetDungeon(TAG tag); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒAƒCƒeƒ€‚ð•Ô‚· - * @param tag ƒAƒCƒeƒ€‚̃^ƒO + * @param TAG ƒAƒCƒeƒ€‚̃^ƒO * @return ƒAƒCƒeƒ€‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ Item *GameWorld::GetItem(ID id); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒtƒƒA‚ð•Ô‚· - * @param tag ƒtƒƒA‚̃^ƒO + * @param TAG ƒtƒƒA‚̃^ƒO * @return ƒtƒƒA‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ Floor *GameWorld::GetFloor(ID id); /*! * @brief GameWorld’†‚É‘¶Ý‚·‚éƒNƒŠ[ƒ`ƒƒ[‚ð•Ô‚· - * @param tag ƒNƒŠ[ƒ`ƒƒ[‚̃^ƒO + * @param TAG ƒNƒŠ[ƒ`ƒƒ[‚̃^ƒO * @return ƒNƒŠ[ƒ`ƒƒ[‚ÌŽQÆƒ|ƒCƒ“ƒ^A‘¶Ý‚µ‚È‚¯‚ê‚ÎNULL‚ð•Ô‚·B */ Creature *GameWorld::GetCreature(ID id); diff --git a/Deeangband/Item.cpp b/Deeangband/Item.cpp index c703d6c..d350374 100644 --- a/Deeangband/Item.cpp +++ b/Deeangband/Item.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Item.h" -Item::Item(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Item::Item(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { } diff --git a/Deeangband/Item.h b/Deeangband/Item.h index b2a1d0b..ceac56d 100644 --- a/Deeangband/Item.h +++ b/Deeangband/Item.h @@ -32,10 +32,10 @@ public: /*! * @brief ItemƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Item::Item(ID id, Tag tag, GameWorld *gameWorld); + Item::Item(ID id, TAG tag, GameWorld *gameWorld); /*! * @brief ItemƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^ diff --git a/Deeangband/ItemBase.cpp b/Deeangband/ItemBase.cpp index e941d22..3e0c1fb 100644 --- a/Deeangband/ItemBase.cpp +++ b/Deeangband/ItemBase.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "ItemBase.h" -ItemBase::ItemBase(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +ItemBase::ItemBase(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/ItemBase.h b/Deeangband/ItemBase.h index cfe4bb2..15d7644 100644 --- a/Deeangband/ItemBase.h +++ b/Deeangband/ItemBase.h @@ -22,10 +22,10 @@ public: /*! * @brief ItemBaseƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - ItemBase::ItemBase(ID id, Tag tag, GameWorld *gameWorld); + ItemBase::ItemBase(ID id, TAG tag, GameWorld *gameWorld); ItemBase::ItemBase(void); diff --git a/Deeangband/ItemEgo.cpp b/Deeangband/ItemEgo.cpp index fe5539e..7bb6d60 100644 --- a/Deeangband/ItemEgo.cpp +++ b/Deeangband/ItemEgo.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "ItemEgo.h" -ItemEgo::ItemEgo(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +ItemEgo::ItemEgo(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/ItemEgo.h b/Deeangband/ItemEgo.h index 8046e42..c211f56 100644 --- a/Deeangband/ItemEgo.h +++ b/Deeangband/ItemEgo.h @@ -23,10 +23,10 @@ public: /*! * @brief ItemEgoƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - ItemEgo::ItemEgo(ID id, Tag tag, GameWorld *gameWorld); + ItemEgo::ItemEgo(ID id, TAG tag, GameWorld *gameWorld); ItemEgo::ItemEgo(void); diff --git a/Deeangband/ItemTrait.cpp b/Deeangband/ItemTrait.cpp index 971db96..d87ea7e 100644 --- a/Deeangband/ItemTrait.cpp +++ b/Deeangband/ItemTrait.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "ItemTrait.h" -ItemTrait::ItemTrait(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +ItemTrait::ItemTrait(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/ItemTrait.h b/Deeangband/ItemTrait.h index 25cd862..067a462 100644 --- a/Deeangband/ItemTrait.h +++ b/Deeangband/ItemTrait.h @@ -23,10 +23,10 @@ public: /*! * @brief ItemTraitƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - ItemTrait::ItemTrait(ID id, Tag tag, GameWorld *gameWorld); + ItemTrait::ItemTrait(ID id, TAG tag, GameWorld *gameWorld); ItemTrait::ItemTrait(void); diff --git a/Deeangband/Karma.cpp b/Deeangband/Karma.cpp index 1ee6b80..b44aa03 100644 --- a/Deeangband/Karma.cpp +++ b/Deeangband/Karma.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Karma.h" -Karma::Karma(ID id, Tag tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld) +Karma::Karma(ID id, TAG tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld) { Karma(); return; diff --git a/Deeangband/Karma.h b/Deeangband/Karma.h index c43095d..b1b0090 100644 --- a/Deeangband/Karma.h +++ b/Deeangband/Karma.h @@ -68,10 +68,10 @@ public: /*! * @brief KarmaƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Karma::Karma(ID id, Tag tag, GameWorld *gameWorld); + Karma::Karma(ID id, TAG tag, GameWorld *gameWorld); /*! * @brief KarmaƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(‰Šú’l‘ã“ü) diff --git a/Deeangband/Quest.cpp b/Deeangband/Quest.cpp index 2104dff..5c0cb4f 100644 --- a/Deeangband/Quest.cpp +++ b/Deeangband/Quest.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Quest.h" -Quest::Quest(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Quest::Quest(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/Quest.h b/Deeangband/Quest.h index 03b6edf..fa7cf97 100644 --- a/Deeangband/Quest.h +++ b/Deeangband/Quest.h @@ -25,10 +25,10 @@ public: /*! * @brief QuestƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Quest::Quest(ID id, Tag tag, GameWorld *gameWorld); + Quest::Quest(ID id, TAG tag, GameWorld *gameWorld); Quest::Quest(void); diff --git a/Deeangband/Race.cpp b/Deeangband/Race.cpp index f82b7dd..a461319 100644 --- a/Deeangband/Race.cpp +++ b/Deeangband/Race.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Race.h" -Race::Race(ID id, Tag tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld) +Race::Race(ID id, TAG tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld) { return; } diff --git a/Deeangband/Race.h b/Deeangband/Race.h index 916a7db..d75741b 100644 --- a/Deeangband/Race.h +++ b/Deeangband/Race.h @@ -51,10 +51,10 @@ public: /*! * @brief RaceƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Race::Race(ID id, Tag tag, GameWorld *gameWorld); + Race::Race(ID id, TAG tag, GameWorld *gameWorld); Race::Race(void); diff --git a/Deeangband/Skill.cpp b/Deeangband/Skill.cpp index 18f8d9d..824d422 100644 --- a/Deeangband/Skill.cpp +++ b/Deeangband/Skill.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Skill.h" -Skill::Skill(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Skill::Skill(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/Skill.h b/Deeangband/Skill.h index 70290f1..09968e0 100644 --- a/Deeangband/Skill.h +++ b/Deeangband/Skill.h @@ -22,10 +22,10 @@ public: /*! * @brief SkillƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Skill::Skill(ID id, Tag tag, GameWorld *gameWorld); + Skill::Skill(ID id, TAG tag, GameWorld *gameWorld); Skill::Skill(void); Skill::~Skill(void); diff --git a/Deeangband/Species.cpp b/Deeangband/Species.cpp index ee3018d..fbafe79 100644 --- a/Deeangband/Species.cpp +++ b/Deeangband/Species.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Species.h" -Species::Species(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Species::Species(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/Species.h b/Deeangband/Species.h index d12c94e..d612c17 100644 --- a/Deeangband/Species.h +++ b/Deeangband/Species.h @@ -25,10 +25,10 @@ public: /*! * @brief SpeciesƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Species::Species(ID id, Tag tag, GameWorld *gameWorld); + Species::Species(ID id, TAG tag, GameWorld *gameWorld); Species::Species(void); diff --git a/Deeangband/Stair.cpp b/Deeangband/Stair.cpp index 7e670a9..46d689c 100644 --- a/Deeangband/Stair.cpp +++ b/Deeangband/Stair.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Stair.h" -Stair::Stair(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Stair::Stair(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/Stair.h b/Deeangband/Stair.h index 7902d1a..47eb35d 100644 --- a/Deeangband/Stair.h +++ b/Deeangband/Stair.h @@ -26,10 +26,10 @@ public: /*! * @brief Stair ƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElement ƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Stair::Stair(ID id, Tag tag, GameWorld *gameWorld); + Stair::Stair(ID id, TAG tag, GameWorld *gameWorld); Stair::Stair(void); diff --git a/Deeangband/StartingClass.cpp b/Deeangband/StartingClass.cpp index 9d9704d..9dc273f 100644 --- a/Deeangband/StartingClass.cpp +++ b/Deeangband/StartingClass.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "StartingClass.h" -StartingClass::StartingClass(ID id, Tag tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld) +StartingClass::StartingClass(ID id, TAG tag, GameWorld *gameWorld) : CreatureTemplate(id, tag, gameWorld) { return; } diff --git a/Deeangband/StartingClass.h b/Deeangband/StartingClass.h index 3cc1c32..1d1097c 100644 --- a/Deeangband/StartingClass.h +++ b/Deeangband/StartingClass.h @@ -38,10 +38,10 @@ public: /*! * @brief StartingƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - StartingClass::StartingClass(ID id, Tag tag, GameWorld *gameWorld); + StartingClass::StartingClass(ID id, TAG tag, GameWorld *gameWorld); StartingClass::StartingClass(void); diff --git a/Deeangband/Trap.cpp b/Deeangband/Trap.cpp index 04ee401..0bbae8d 100644 --- a/Deeangband/Trap.cpp +++ b/Deeangband/Trap.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "Trap.h" -Trap::Trap(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +Trap::Trap(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/Trap.h b/Deeangband/Trap.h index c4b4243..9250a67 100644 --- a/Deeangband/Trap.h +++ b/Deeangband/Trap.h @@ -26,10 +26,10 @@ public: /*! * @brief TrapƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - Trap::Trap(ID id, Tag tag, GameWorld *gameWorld); + Trap::Trap(ID id, TAG tag, GameWorld *gameWorld); Trap::Trap(void); diff --git a/Deeangband/TrapBase.cpp b/Deeangband/TrapBase.cpp index 4ff8fcb..e16ff68 100644 --- a/Deeangband/TrapBase.cpp +++ b/Deeangband/TrapBase.cpp @@ -9,7 +9,7 @@ #include "stdafx.h" #include "TrapBase.h" -TrapBase::TrapBase(ID id, Tag tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) +TrapBase::TrapBase(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld) { return; } diff --git a/Deeangband/TrapBase.h b/Deeangband/TrapBase.h index a99fb37..deefc4f 100644 --- a/Deeangband/TrapBase.h +++ b/Deeangband/TrapBase.h @@ -24,10 +24,10 @@ public: /*! * @brief TrapBaseƒNƒ‰ƒXƒRƒ“ƒXƒgƒ‰ƒNƒ^(GameElementƒƒ“ƒo‘Ήž) * @param id GameElement‚ÌID - * @param tag GameElement‚̃^ƒO + * @param TAG GameElement‚̃^ƒO * @param gameWorld Š‘®Œ³gameWorldŽQÆƒ|ƒCƒ“ƒ^ */ - TrapBase::TrapBase(ID id, Tag tag, GameWorld *gameWorld); + TrapBase::TrapBase(ID id, TAG tag, GameWorld *gameWorld); TrapBase::TrapBase(void); -- 2.11.0