From: <geo...@us...> - 2010-07-09 06:44:23
|
Revision: 3649 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3649&view=rev Author: geoffthemedio Date: 2010-07-09 06:44:17 +0000 (Fri, 09 Jul 2010) Log Message: ----------- Modified Building constructor to not take a location id, as in all cases the Building is added to a planet, and therein assigned its new planet's id as its planet id, making the constructor parameter redundant. Modified Paths: -------------- trunk/FreeOrion/Empire/Empire.cpp trunk/FreeOrion/universe/Building.cpp trunk/FreeOrion/universe/Building.h trunk/FreeOrion/universe/Effect.cpp trunk/FreeOrion/universe/Universe.cpp Modified: trunk/FreeOrion/Empire/Empire.cpp =================================================================== --- trunk/FreeOrion/Empire/Empire.cpp 2010-07-09 06:19:54 UTC (rev 3648) +++ trunk/FreeOrion/Empire/Empire.cpp 2010-07-09 06:44:17 UTC (rev 3649) @@ -2417,7 +2417,7 @@ continue; } - Building* building = new Building(m_id, m_production_queue[i].item.name, planet->ID()); + Building* building = new Building(m_id, m_production_queue[i].item.name); int building_id = universe.Insert(building); Modified: trunk/FreeOrion/universe/Building.cpp =================================================================== --- trunk/FreeOrion/universe/Building.cpp 2010-07-09 06:19:54 UTC (rev 3648) +++ trunk/FreeOrion/universe/Building.cpp 2010-07-09 06:44:17 UTC (rev 3649) @@ -54,10 +54,10 @@ m_ordered_scrapped(false) {} -Building::Building(int empire_id, const std::string& building_type, int planet_id) : +Building::Building(int empire_id, const std::string& building_type) : UniverseObject(), m_building_type(building_type), - m_planet_id(planet_id), + m_planet_id(INVALID_OBJECT_ID), m_ordered_scrapped(false) { AddOwner(empire_id); Modified: trunk/FreeOrion/universe/Building.h =================================================================== --- trunk/FreeOrion/universe/Building.h 2010-07-09 06:19:54 UTC (rev 3648) +++ trunk/FreeOrion/universe/Building.h 2010-07-09 06:44:17 UTC (rev 3649) @@ -18,10 +18,10 @@ { public: /** \name Structors */ //@{ - Building(); ///< default ctor - Building(int empire_id, const std::string& building_type, int planet_id); ///< basic ctor + Building(); ///< default ctor + Building(int empire_id, const std::string& building_type); ///< basic ctor - virtual Building* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this Building + virtual Building* Clone(int empire_id = ALL_EMPIRES) const; ///< returns new copy of this Building //@} /** \name Accessors */ //@{ Modified: trunk/FreeOrion/universe/Effect.cpp =================================================================== --- trunk/FreeOrion/universe/Effect.cpp 2010-07-09 06:19:54 UTC (rev 3648) +++ trunk/FreeOrion/universe/Effect.cpp 2010-07-09 06:44:17 UTC (rev 3649) @@ -899,7 +899,7 @@ return; } - Building* building = new Building(ALL_EMPIRES, m_type, location->ID()); + Building* building = new Building(ALL_EMPIRES, m_type); if (!building) { Logger().errorStream() << "CreateBuilding::Execute couldn't create building!"; return; Modified: trunk/FreeOrion/universe/Universe.cpp =================================================================== --- trunk/FreeOrion/universe/Universe.cpp 2010-07-09 06:19:54 UTC (rev 3648) +++ trunk/FreeOrion/universe/Universe.cpp 2010-07-09 06:44:17 UTC (rev 3649) @@ -4295,19 +4295,19 @@ // give homeworlds a shipyard and drydock so players can build scouts, colony ships and basic attack ships immediately - Building* building = new Building(empire_id, "BLD_SHIPYARD_BASE", UniverseObject::INVALID_OBJECT_ID); + Building* building = new Building(empire_id, "BLD_SHIPYARD_BASE"); int building_id = Insert(building); home_planet->AddBuilding(building_id); - building = new Building(empire_id, "BLD_SHIPYARD_ORBITAL_DRYDOCK", UniverseObject::INVALID_OBJECT_ID); + building = new Building(empire_id, "BLD_SHIPYARD_ORBITAL_DRYDOCK"); building_id = Insert(building); home_planet->AddBuilding(building_id); - building = new Building(empire_id, "BLD_CULTURE_ARCHIVES", UniverseObject::INVALID_OBJECT_ID); + building = new Building(empire_id, "BLD_CULTURE_ARCHIVES"); building_id = Insert(building); home_planet->AddBuilding(building_id); - building = new Building(empire_id, "BLD_IMPERIAL_PALACE", UniverseObject::INVALID_OBJECT_ID); + building = new Building(empire_id, "BLD_IMPERIAL_PALACE"); building_id = Insert(building); home_planet->AddBuilding(building_id); |