Revision: 1481
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1481&view=rev
Author: rorthomas
Date: 2010-07-21 23:03:05 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
fixed missing return value
fixed MP gui shown at startup
fixed MP GUI not updating on stream registration result changes
Modified Paths:
--------------
trunk/source/main/ChatSystem.cpp
trunk/source/main/StreamableFactory.h
trunk/source/main/network.cpp
Modified: trunk/source/main/ChatSystem.cpp
===================================================================
--- trunk/source/main/ChatSystem.cpp 2010-07-21 17:58:03 UTC (rev 1480)
+++ trunk/source/main/ChatSystem.cpp 2010-07-21 23:03:05 UTC (rev 1481)
@@ -81,6 +81,8 @@
// now add the update for the player list here
if(changes)
updatePlayerList();
+
+ return changes;
}
void ChatSystemFactory::updatePlayerList()
Modified: trunk/source/main/StreamableFactory.h
===================================================================
--- trunk/source/main/StreamableFactory.h 2010-07-21 17:58:03 UTC (rev
1480)
+++ trunk/source/main/StreamableFactory.h 2010-07-21 23:03:05 UTC (rev
1481)
@@ -149,6 +149,10 @@
stream_registrations.pop_front();
changes++;
}
+
+ // count the stream creation results into the changes
+ changes += stream_creation_results.size();
+
// then deletions:
// first registrations
while (!stream_deletions.empty())
Modified: trunk/source/main/network.cpp
===================================================================
--- trunk/source/main/network.cpp 2010-07-21 17:58:03 UTC (rev 1480)
+++ trunk/source/main/network.cpp 2010-07-21 23:03:05 UTC (rev 1481)
@@ -38,6 +38,7 @@
#include "language.h"
#include "errorutils.h"
#include "rormemory.h"
+#include "gui_mp.h"
#ifdef USE_CRASHRPT
# include "crashrpt.h"
@@ -129,6 +130,13 @@
// direct start, no vehicle required
initiated = true;
+
+#ifdef USE_MYGUI
+#ifdef USE_SOCKETW
+ // you can just run this here in the main thread, not in others!
+ GUI_Multiplayer::getSingleton().update();
+#endif // USE_SOCKETW
+#endif // USE_MYGUI
}
Network::~Network()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
