From 8708cddb4248400bc8da7e0a3a35c0b6504a4114 Mon Sep 17 00:00:00 2001
From: Deskull <deskull@users.sourceforge.jp>
Date: Wed, 12 Mar 2014 22:37:28 +0900
Subject: [PATCH] Fix Initialization in GameWorld class.

---
 Deeangband/Feature.cpp   |  2 ++
 Deeangband/GameWorld.cpp | 40 ++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/Deeangband/Feature.cpp b/Deeangband/Feature.cpp
index cf50a30..790a65f 100644
--- a/Deeangband/Feature.cpp
+++ b/Deeangband/Feature.cpp
@@ -27,6 +27,8 @@ Feature::~Feature(void)
 void Feature::SetDammyData(void)
 {
 	this->name = "–¢’m‚Ì’nŒ`";
+	this->SetID(0);
+	this->SetTag("UNKNOWN_FEATURE");
 	this->symbol = 'X';
 	this->symColor.r = 40;
 	this->symColor.g = 40;
diff --git a/Deeangband/GameWorld.cpp b/Deeangband/GameWorld.cpp
index 938257e..fcfc829 100644
--- a/Deeangband/GameWorld.cpp
+++ b/Deeangband/GameWorld.cpp
@@ -15,26 +15,26 @@ GameWorld::GameWorld(GameSurface *gSurface)
 	Dice::Initialize();
 
 	gameSurface = gSurface;
-	authorityList.emplace("NONE", make_shared<Authority>(0, "DAMMY", this));
-	creatureTraitList.emplace("NONE", make_shared<CreatureTrait>(0, "DAMMY", this));
-	effectList.emplace("NONE", make_shared<Effect>(0, "DAMMY", this));
-	fixedArtifactList.emplace("NONE", make_shared<FixedArtifact>(0, "DAMMY", this));
-	featureList.emplace("NONE", make_shared<Feature>(0, "DAMMY", this));
-	itemBaseList.emplace("NONE", make_shared<ItemBase>(0, "DAMMY", this));
-	itemEgoList.emplace("NONE", make_shared<ItemEgo>(0, "DAMMY", this));
-	itemTraitList.emplace("NONE", make_shared<ItemTrait>(0, "DAMMY", this));
-	karmaList.emplace("NONE", make_shared<Karma>(0, "DAMMY", this));
-	skillList.emplace("NONE", make_shared<Skill>(0, "DAMMY", this));
-	speciesList.emplace("NONE", make_shared<Species>(0, "DAMMY", this));
-	trapBaseList.emplace("NONE", make_shared<TrapBase>(0, "DAMMY", this));
-	buildingList.emplace("NONE", make_shared<Building>(0, "DAMMY", this));
-	campList.emplace("NONE", make_shared<Camp>(0, "DAMMY", this));
-	dungeonList.emplace("NONE", make_shared<Dungeon>(0, "DAMMY", this));
-
-	trapList.emplace(0, make_shared<Trap>(0, "DAMMY", this));
-	itemList.emplace(0, make_shared<Item>(0, "DAMMY", this));
-	floorList.emplace(0, make_shared<Floor>(0, "DAMMY", this));
-	creatureList.emplace(0, make_shared<Creature>(0, "DAMMY", this));
+	authorityList.emplace("UNKNOWN", make_shared<Authority>(0, "UNKNOWN", this));
+	creatureTraitList.emplace("UNKNOWN", make_shared<CreatureTrait>(0, "UNKNOWN", this));
+	effectList.emplace("UNKNOWN", make_shared<Effect>(0, "UNKNOWN", this));
+	fixedArtifactList.emplace("UNKNOWN", make_shared<FixedArtifact>(0, "UNKNOWN", this));
+	featureList.emplace("UNKNOWN", make_shared<Feature>(0, "UNKNOWN", this));
+	itemBaseList.emplace("UNKNOWN", make_shared<ItemBase>(0, "UNKNOWN", this));
+	itemEgoList.emplace("UNKNOWN", make_shared<ItemEgo>(0, "UNKNOWN", this));
+	itemTraitList.emplace("UNKNOWN", make_shared<ItemTrait>(0, "UNKNOWN", this));
+	karmaList.emplace("UNKNOWN", make_shared<Karma>(0, "UNKNOWN", this));
+	skillList.emplace("UNKNOWN", make_shared<Skill>(0, "UNKNOWN", this));
+	speciesList.emplace("UNKNOWN", make_shared<Species>(0, "UNKNOWN", this));
+	trapBaseList.emplace("UNKNOWN", make_shared<TrapBase>(0, "UNKNOWN", this));
+	buildingList.emplace("UNKNOWN", make_shared<Building>(0, "UNKNOWN", this));
+	campList.emplace("UNKNOWN", make_shared<Camp>(0, "UNKNOWN", this));
+	dungeonList.emplace("UNKNOWN", make_shared<Dungeon>(0, "UNKNOWN", this));
+
+	trapList.emplace(0, make_shared<Trap>(0, "UNKNOWN", this));
+	itemList.emplace(0, make_shared<Item>(0, "UNKNOWN", this));
+	floorList.emplace(0, make_shared<Floor>(0, "UNKNOWN", this));
+	creatureList.emplace(0, make_shared<Creature>(0, "UNKNOWN", this));
 
 	gSurface->SetFloor(&(*floorList[0]));
 }
-- 
2.11.0