Delete a constructor in GameElement class.

diff --git a/Deeangband/Building.cpp b/Deeangband/Building.cpp
index 623a589..8aca2a8 100644 (file)
--- a/Deeangband/Building.cpp
+++ b/Deeangband/Building.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       Building::Building(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Building::Building(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
        }
 

diff --git a/Deeangband/Camp.cpp b/Deeangband/Camp.cpp
index f9b1fc1..b3db84a 100644 (file)
--- a/Deeangband/Camp.cpp
+++ b/Deeangband/Camp.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       Camp::Camp(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Camp::Camp(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                Camp();
        }

diff --git a/Deeangband/Creature.cpp b/Deeangband/Creature.cpp
index 2884dfc..65092c4 100644 (file)
--- a/Deeangband/Creature.cpp
+++ b/Deeangband/Creature.cpp
@@ -77,13 +77,13 @@ namespace Deeangband
                11100000000, // Lv60\93\9e\92B\83\\83E\83\8b
        };
 
-       Creature::Creature(Species *speciesPtr, ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Creature::Creature(Species *speciesPtr, ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                SetDammyData();
                SetSpeciesData(speciesPtr);
        }
 
-       Creature::Creature(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Creature::Creature(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                SetDammyData();
        }

diff --git a/Deeangband/CreatureTemplate.cpp b/Deeangband/CreatureTemplate.cpp
index 398902a..fe0d416 100644 (file)
--- a/Deeangband/CreatureTemplate.cpp
+++ b/Deeangband/CreatureTemplate.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       CreatureTemplate::CreatureTemplate(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       CreatureTemplate::CreatureTemplate(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                CreatureTemplate();
                return;

diff --git a/Deeangband/Door.cpp b/Deeangband/Door.cpp
index 1ee8a8a..6dfbf23 100644 (file)
--- a/Deeangband/Door.cpp
+++ b/Deeangband/Door.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-Door::Door(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+Door::Door(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
 {
        return;
 }

diff --git a/Deeangband/Dungeon.cpp b/Deeangband/Dungeon.cpp
index ba1f4c5..5e5a4c2 100644 (file)
--- a/Deeangband/Dungeon.cpp
+++ b/Deeangband/Dungeon.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       Dungeon::Dungeon(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Dungeon::Dungeon(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                this->baseSize.Set(80, 80);
                this->name = SPECIAL_NAME_UNKNOWN;

diff --git a/Deeangband/Effect.cpp b/Deeangband/Effect.cpp
index 69762c2..df81105 100644 (file)
--- a/Deeangband/Effect.cpp
+++ b/Deeangband/Effect.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       Effect::Effect(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Effect::Effect(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
        }
 

diff --git a/Deeangband/Feature.cpp b/Deeangband/Feature.cpp
index 8024158..1d75341 100644 (file)
--- a/Deeangband/Feature.cpp
+++ b/Deeangband/Feature.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       Feature::Feature(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Feature::Feature(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                SetDammyData();
        }

diff --git a/Deeangband/Floor.cpp b/Deeangband/Floor.cpp
index 041ac45..2ef991a 100644 (file)
--- a/Deeangband/Floor.cpp
+++ b/Deeangband/Floor.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       Floor::Floor(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Floor::Floor(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                int x, y;
                this->width = 50;
@@ -33,7 +33,7 @@ namespace Deeangband
                items.resize(0);
        }
 
-       Floor::Floor(ID id, TAG tag, GameWorld *gameWorld, Dungeon *dungeonPtr, DEPTH depth) : GameElement(id, tag, gameWorld)
+       Floor::Floor(ID id, TAG tag, GameWorld *gameWorld, Dungeon *dungeonPtr, DEPTH depth)
        {
                int x, y;
                this->width = dungeonPtr->GetBaseSize().GetX();

diff --git a/Deeangband/GameCampaign.cpp b/Deeangband/GameCampaign.cpp
index 3ab4489..a8f916f 100644 (file)
--- a/Deeangband/GameCampaign.cpp
+++ b/Deeangband/GameCampaign.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       GameCampaign::GameCampaign(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       GameCampaign::GameCampaign(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
        }
 

diff --git a/Deeangband/GameElement.cpp b/Deeangband/GameElement.cpp
index d31b14e..cfa60f8 100644 (file)
--- a/Deeangband/GameElement.cpp
+++ b/Deeangband/GameElement.cpp
@@ -11,22 +11,10 @@
 
 namespace Deeangband
 {
-
-       GameElement::GameElement(ID id, TAG tag)
-       {
-               this->name = "";
-               this->description = "";
-       }
-
-       GameElement::GameElement(ID id, TAG tag, GameWorld *gameWorld)
+       GameElement::GameElement(void)
        {
                this->name = "";
                this->description = "";
-               (void)gameWorld;
-       }
-
-       GameElement::GameElement(void)
-       {
                return;
        }
 

diff --git a/Deeangband/GameElement.h b/Deeangband/GameElement.h
index 100f6db..3a0df6a 100644 (file)
--- a/Deeangband/GameElement.h
+++ b/Deeangband/GameElement.h
@@ -45,21 +45,6 @@ namespace Deeangband
 
                /*! 
                * @brief GameElement\83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^
-               * @param id \97v\91f\82ÌID
-               * @param tag \97v\91f\82Ì\83^\83O
-               */
-               GameElement::GameElement(ID id, TAG tag);
-
-               /*! 
-               * @brief GameElement\83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^
-               * @param id \97v\91f\82ÌID
-               * @param tag \97v\91f\82Ì\83^\83O
-               * @param gameWorld \8f\8a\91®\8c³gameWorld\8eQ\8fÆ\83|\83C\83\93\83^
-               */
-               GameElement::GameElement(ID id, TAG tag, GameWorld *gameWorld); 
-
-               /*! 
-               * @brief GameElement\83N\83\89\83X\83R\83\93\83X\83g\83\89\83N\83^
                */
                GameElement::GameElement(void); 
 

diff --git a/Deeangband/ItemTemplate.cpp b/Deeangband/ItemTemplate.cpp
index b3bf34b..139c616 100644 (file)
--- a/Deeangband/ItemTemplate.cpp
+++ b/Deeangband/ItemTemplate.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       ItemTemplate::ItemTemplate(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       ItemTemplate::ItemTemplate(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                this->SetDammyData();
        }

diff --git a/Deeangband/ItemTrait.cpp b/Deeangband/ItemTrait.cpp
index 59df1fe..eaedd6f 100644 (file)
--- a/Deeangband/ItemTrait.cpp
+++ b/Deeangband/ItemTrait.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       ItemTrait::ItemTrait(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       ItemTrait::ItemTrait(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
        }
 

diff --git a/Deeangband/Quest.cpp b/Deeangband/Quest.cpp
index 69bd4d0..e56dc04 100644 (file)
--- a/Deeangband/Quest.cpp
+++ b/Deeangband/Quest.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       Quest::Quest(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Quest::Quest(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                return;
        }

diff --git a/Deeangband/Skill.cpp b/Deeangband/Skill.cpp
index 82e610f..3818563 100644 (file)
--- a/Deeangband/Skill.cpp
+++ b/Deeangband/Skill.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       Skill::Skill(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Skill::Skill(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                this->SetDammyData();
        }

diff --git a/Deeangband/Species.cpp b/Deeangband/Species.cpp
index 0259fab..6c28e89 100644 (file)
--- a/Deeangband/Species.cpp
+++ b/Deeangband/Species.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       Species::Species(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Species::Species(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                Species();
                return;

diff --git a/Deeangband/Stair.cpp b/Deeangband/Stair.cpp
index da210a8..a99144e 100644 (file)
--- a/Deeangband/Stair.cpp
+++ b/Deeangband/Stair.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       Stair::Stair(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Stair::Stair(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                return;
        }

diff --git a/Deeangband/Trap.cpp b/Deeangband/Trap.cpp
index 3f22033..da1314d 100644 (file)
--- a/Deeangband/Trap.cpp
+++ b/Deeangband/Trap.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       Trap::Trap(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       Trap::Trap(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                return;
        }

diff --git a/Deeangband/TrapBase.cpp b/Deeangband/TrapBase.cpp
index 561e1da..4b7fc7a 100644 (file)
--- a/Deeangband/TrapBase.cpp
+++ b/Deeangband/TrapBase.cpp
@@ -12,7 +12,7 @@
 namespace Deeangband
 {
 
-       TrapBase::TrapBase(ID id, TAG tag, GameWorld *gameWorld) : GameElement(id, tag, gameWorld)
+       TrapBase::TrapBase(ID id, TAG tag, GameWorld *gameWorld) : GameElement()
        {
                this->name = "\83_\83~\81[";
                return;