[Gcblue-commits] gcb_wx/src/graphics tcFlightPortGui.cpp, 1.13, 1.14 tcMapView.cpp, 1.51, 1.52 tcNe
Status: Alpha
Brought to you by:
ddcforge
From: Dewitt C. <ddc...@us...> - 2006-12-06 01:20:48
|
Update of /cvsroot/gcblue/gcb_wx/src/graphics In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22513/src/graphics Modified Files: tcFlightPortGui.cpp tcMapView.cpp tcNetworkView.cpp tcPlatformGui.cpp tcStoresGui.cpp Log Message: Index: tcStoresGui.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcStoresGui.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcStoresGui.cpp 27 Nov 2006 00:46:39 -0000 1.11 --- tcStoresGui.cpp 6 Dec 2006 01:20:42 -0000 1.12 *************** *** 43,46 **** --- 43,69 ---- + + + tcStoresGui* tcStoresGui::GetExistingGui(long id, long host) + { + std::list<tcContainerGui*>::iterator iter = + openContainers.begin(); + + for (iter=openContainers.begin(); iter!=openContainers.end(); ++iter) + { + if (tcStoresGui* storesGui = dynamic_cast<tcStoresGui*>(*iter)) + { + if ((storesGui->GetPlatformId() == id) && (storesGui->GetHostId() == host)) + { + return storesGui; + } + } + + } + return 0; + } + + + /** * If slot has tcStoresContainerItem then update it, otherwise create *************** *** 195,198 **** --- 218,232 ---- } + long tcStoresGui::GetPlatformId() const + { + return platformId; + } + + long tcStoresGui::GetHostId() const + { + return hostId; + } + + /** * @return pointer to stores object Index: tcNetworkView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcNetworkView.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tcNetworkView.cpp 24 Oct 2006 01:34:04 -0000 1.14 --- tcNetworkView.cpp 6 Dec 2006 01:20:42 -0000 1.15 *************** *** 377,380 **** --- 377,381 ---- passwordEdit->SetClearOnReturn(false); passwordEdit->SetBuffer(""); + tcMultiplayerInterface::Get()->SetPassword(""); if (!tcOptions::Get()->OptionStringExists("HostAddress")) Index: tcPlatformGui.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcPlatformGui.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tcPlatformGui.cpp 20 Nov 2006 00:17:42 -0000 1.14 --- tcPlatformGui.cpp 6 Dec 2006 01:20:42 -0000 1.15 *************** *** 62,65 **** --- 62,85 ---- + + tcPlatformGui* tcPlatformGui::GetExistingGui(long id, long host) + { + std::list<tcContainerGui*>::iterator iter = + openContainers.begin(); + + for (iter=openContainers.begin(); iter!=openContainers.end(); ++iter) + { + if (tcPlatformGui* platformGui = dynamic_cast<tcPlatformGui*>(*iter)) + { + if ((platformGui->GetPlatformId() == id) && (platformGui->GetHostId() == host)) + { + return platformGui; + } + } + + } + return 0; + } + /** * @return first stores that has at least one compatible item with platform launcher (or 0 if none found) *************** *** 97,100 **** --- 117,132 ---- } + + long tcPlatformGui::GetPlatformId() const + { + return platformId; + } + + long tcPlatformGui::GetHostId() const + { + return hostId; + } + + void tcPlatformGui::OnLoadoutCommand(wxCommandEvent& event) { Index: tcFlightPortGui.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcFlightPortGui.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** tcFlightPortGui.cpp 1 Dec 2006 03:39:54 -0000 1.13 --- tcFlightPortGui.cpp 6 Dec 2006 01:20:42 -0000 1.14 *************** *** 99,102 **** --- 99,124 ---- //------------------------------------------------------------------------------ + + tcFlightPortGui* tcFlightPortGui::GetExistingGui(long id) + { + std::list<tcContainerGui*>::iterator iter = + openContainers.begin(); + + for (iter=openContainers.begin(); iter!=openContainers.end(); ++iter) + { + if (tcFlightPortGui* flightPortGui = dynamic_cast<tcFlightPortGui*>(*iter)) + { + if (flightPortGui->GetPlatformId() == id) + { + return flightPortGui; + } + } + + } + return 0; + } + + + /** * If slot has tcEntityContainerItem then update it, otherwise create *************** *** 320,323 **** --- 342,351 ---- } + long tcFlightPortGui::GetPlatformId() const + { + return platformId; + } + + void tcFlightPortGui::HandleDrop(size_t slotIdx, tcContainerItem* item) { Index: tcMapView.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMapView.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** tcMapView.cpp 24 Oct 2006 01:34:04 -0000 1.51 --- tcMapView.cpp 6 Dec 2006 01:20:42 -0000 1.52 *************** *** 2147,2151 **** bool suppressTrackId = (pMO->mnID == NULL_INDEX) || (type == SYMBOL_UNKNOWN) || ! (type == SYMBOL_MARK); if (mbShowTrackID && !suppressTrackId) --- 2147,2152 ---- bool suppressTrackId = (pMO->mnID == NULL_INDEX) || (type == SYMBOL_UNKNOWN) || ! (type == SYMBOL_MARK) || ((pMO->meAffiliation == FRIENDLY) && (type == SYMBOL_MISSILE)); ! if (mbShowTrackID && !suppressTrackId) |