Update of /cvsroot/gcblue/gcb_wx/src/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28827/src/graphics
Modified Files:
tcMessageInterface.cpp tcScenarioSelectView.cpp
Log Message:
0.7.2 pre-release test build, added waypoints to client display, fixed multiplayer message overload bug, added better throttling for bad multiplayer connections
Index: tcMessageInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcMessageInterface.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcMessageInterface.cpp 26 Jul 2005 00:37:04 -0000 1.5
--- tcMessageInterface.cpp 29 Jul 2005 02:35:53 -0000 1.6
***************
*** 79,83 ****
wxASSERT(messageCenter);
! messageCenter->PopupMessage(msg);
}
--- 79,86 ----
wxASSERT(messageCenter);
! if (popupsEnabled)
! {
! messageCenter->PopupMessage(msg);
! }
}
***************
*** 96,99 ****
--- 99,107 ----
}
+ void tcMessageInterface::SetPopupState(bool state)
+ {
+ popupsEnabled = state;
+ }
+
/**
* Must be called before using DisplayChannelMessage
***************
*** 109,112 ****
--- 117,121 ----
*/
tcMessageInterface::tcMessageInterface()
+ : popupsEnabled(true)
{
Index: tcScenarioSelectView.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/graphics/tcScenarioSelectView.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** tcScenarioSelectView.cpp 22 Jun 2005 01:22:08 -0000 1.11
--- tcScenarioSelectView.cpp 29 Jul 2005 02:35:53 -0000 1.12
***************
*** 206,209 ****
--- 206,214 ----
using network::tcMultiplayerInterface;
+ if (mpSimState->IsMultiplayerClient())
+ {
+ return; // don't load scenarios as multiplayer client (need remote way of doing this)
+ }
+
std::string totalPath = SCENARIO_PATH;
totalPath += "\\"; // generalize this for Linux?
|
