From 282fe2ee8e69cf609dc34f4ccabe59688e7ae1ff Mon Sep 17 00:00:00 2001 From: Deskull Date: Tue, 4 Mar 2014 21:38:00 +0900 Subject: [PATCH] Change map::insert to map::emplace in GameWorld class. --- Deeangband/GameWorld.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Deeangband/GameWorld.cpp b/Deeangband/GameWorld.cpp index 91cc7bd..ddd3dbb 100644 --- a/Deeangband/GameWorld.cpp +++ b/Deeangband/GameWorld.cpp @@ -15,26 +15,26 @@ GameWorld::GameWorld(GameSurface *gSurface) Dice::Initialize(); gameSurface = gSurface; - authorityList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - creatureTraitList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - effectList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - fixedArtifactList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - featureList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - itemBaseList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - itemEgoList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - itemTraitList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - karmaList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - skillList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - speciesList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - trapBaseList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - buildingList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - campList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - dungeonList.insert(map>::value_type("NONE", make_shared(0, "DAMMY", this))); - - trapList.insert(map>::value_type(0, make_shared(0, "DAMMY", this))); - itemList.insert(map>::value_type(0, make_shared(0, "DAMMY", this))); - floorList.insert(map>::value_type(0, make_shared(0, "DAMMY", this))); - creatureList.insert(map>::value_type(0, make_shared(0, "DAMMY", this))); + authorityList.emplace("NONE", make_shared(0, "DAMMY", this)); + creatureTraitList.emplace("NONE", make_shared(0, "DAMMY", this)); + effectList.emplace("NONE", make_shared(0, "DAMMY", this)); + fixedArtifactList.emplace("NONE", make_shared(0, "DAMMY", this)); + featureList.emplace("NONE", make_shared(0, "DAMMY", this)); + itemBaseList.emplace("NONE", make_shared(0, "DAMMY", this)); + itemEgoList.emplace("NONE", make_shared(0, "DAMMY", this)); + itemTraitList.emplace("NONE", make_shared(0, "DAMMY", this)); + karmaList.emplace("NONE", make_shared(0, "DAMMY", this)); + skillList.emplace("NONE", make_shared(0, "DAMMY", this)); + speciesList.emplace("NONE", make_shared(0, "DAMMY", this)); + trapBaseList.emplace("NONE", make_shared(0, "DAMMY", this)); + buildingList.emplace("NONE", make_shared(0, "DAMMY", this)); + campList.emplace("NONE", make_shared(0, "DAMMY", this)); + dungeonList.emplace("NONE", make_shared(0, "DAMMY", this)); + + trapList.emplace(0, make_shared(0, "DAMMY", this)); + itemList.emplace(0, make_shared(0, "DAMMY", this)); + floorList.emplace(0, make_shared(0, "DAMMY", this)); + creatureList.emplace(0, make_shared(0, "DAMMY", this)); } GameWorld::~GameWorld(void) -- 2.11.0