From: <geo...@us...> - 2008-12-23 06:51:23
|
Revision: 2707 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2707&view=rev Author: geoffthemedio Date: 2008-12-23 06:51:19 +0000 (Tue, 23 Dec 2008) Log Message: ----------- -Added OndrejR's full name to credits -Committed modified version of his AddPart patch, so that double-clicking a part on the Design screen attempts to add the clicked part to the current design, if possible Modified Paths: -------------- trunk/FreeOrion/UI/DesignWnd.cpp trunk/FreeOrion/default/credits.xml Modified: trunk/FreeOrion/UI/DesignWnd.cpp =================================================================== --- trunk/FreeOrion/UI/DesignWnd.cpp 2008-12-23 05:55:35 UTC (rev 2706) +++ trunk/FreeOrion/UI/DesignWnd.cpp 2008-12-23 06:51:19 UTC (rev 2707) @@ -1668,7 +1668,16 @@ } void DesignWnd::MainPanel::AddPart(const PartType* part) { - // TODO: IMPLEMENT THIS + for (unsigned int i = 0; i < m_slots.size(); ++i) { + const ShipSlotType slot_type = m_slots[i]->SlotType(); + const PartType* part_type = m_slots[i]->GetPart(); + + if (!part_type && part && part->CanMountInSlotType(slot_type)) { + SetPart(part, i); + return; + } + } + Logger().debugStream() << "DesignWnd::MainPanel::AddPart(" << (part ? part->Name() : "no part") << ") couldn't find a slot for the part"; } void DesignWnd::MainPanel::ClearParts() { Modified: trunk/FreeOrion/default/credits.xml =================================================================== --- trunk/FreeOrion/default/credits.xml 2008-12-23 05:55:35 UTC (rev 2706) +++ trunk/FreeOrion/default/credits.xml 2008-12-23 06:51:19 UTC (rev 2707) @@ -21,7 +21,7 @@ <PERSON name="Karl Chen" nick="quarl" task="Programming"/> <PERSON name="Eliot Eshelman" nick="igrok" task="Programming"/> <PERSON name="stride" nick="" task="Programming"/> - <PERSON name="OndrejR" nick="" task="Programming"/> + <PERSON name="Ondrej Riha" nick="OndrejR" task="Programming"/> </GROUP> <GROUP name ="GAMEDESIGN"> <PERSON name="Samuel Knowlton" nick="Aquitaine" task="Game Design"/> |