Update of /cvsroot/gcblue/gcb_wx/src/graphics
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9232/src/graphics
Modified Files:
tcFlightPortGui.cpp
Log Message:
Index: tcFlightPortGui.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcFlightPortGui.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tcFlightPortGui.cpp 20 Nov 2006 00:17:42 -0000 1.12
--- tcFlightPortGui.cpp 1 Dec 2006 03:39:54 -0000 1.13
***************
*** 220,224 ****
// draw description caption if mouse is over slot
! if (isMouseOver)
{
caption = entityItem->GetDescription();
--- 220,233 ----
// draw description caption if mouse is over slot
! if (!isMouseOver)
! {
! caption = air->GetLoadoutTag();
! if (caption.size() == 0)
! {
! air->UpdateLoadoutTag();
! caption = air->GetLoadoutTag();
! }
! }
! else
{
caption = entityItem->GetDescription();
***************
*** 238,242 ****
! if (isMouseOver)
{
if (caption.size() == 0)
--- 247,260 ----
! if (!isMouseOver)
! {
! if (caption.size() > 0)
! {
! const osg::Vec4 color(1.0f, 1.0f, 1.0f, 1.0f);
! DrawTextR(caption.c_str(), slot.loc.XCenter(), slot.loc.GetTop() + 8.0f, defaultFont.get(),
! color, 10.0f, CENTER_CENTER);
! }
! }
! else
{
if (caption.size() == 0)
***************
*** 250,253 ****
--- 268,272 ----
}
+
}
|
