Revision: 1476
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1476&view=rev
Author: rorthomas
Date: 2010-07-20 09:33:12 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
fixed compilation with no socketw support
Modified Paths:
--------------
trunk/source/main/ChatSystem.cpp
trunk/source/main/RoRFrameListener.cpp
trunk/source/main/gui_mp.cpp
trunk/source/main/gui_mp.h
Modified: trunk/source/main/ChatSystem.cpp
===================================================================
--- trunk/source/main/ChatSystem.cpp 2010-07-20 09:26:44 UTC (rev 1475)
+++ trunk/source/main/ChatSystem.cpp 2010-07-20 09:33:12 UTC (rev 1476)
@@ -86,8 +86,10 @@
if(!net) return;
#ifdef USE_MYGUI
+#ifdef USE_SOCKETW
// TODO: we need to do this upon changes only, not all the time
GUI_Multiplayer::getSingleton().update();
+#endif // USE_SOCKETW
#endif // USE_MYGUI
}
Modified: trunk/source/main/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/RoRFrameListener.cpp 2010-07-20 09:26:44 UTC (rev
1475)
+++ trunk/source/main/RoRFrameListener.cpp 2010-07-20 09:33:12 UTC (rev
1476)
@@ -1179,7 +1179,9 @@
#ifdef USE_MYGUI
LoadingWindow::get()->hide();
+#ifdef USE_SOCKETW
new GUI_Multiplayer(net);
+#endif //USE_SOCKETW
#endif //USE_MYGUI
if(!connres)
@@ -7724,7 +7726,11 @@
if(ow) ow->showEditorOverlay(false);
if(ow) ow->truckhud->show(false);
//if(bigMap) bigMap->setVisibility(false);
+#ifdef USE_MYGUI
+#ifdef USE_SOCKETW
if(net) GUI_Multiplayer::getSingleton().setVisible(false);
+#endif // USE_SOCKETW
+#endif // USE_MYGUI
}
else
{
@@ -7736,7 +7742,11 @@
if(ow) ow->showDashboardOverlays(true,
trucks[current_truck]->driveable);
//if(bigMap) bigMap->setVisibility(true);
}
+#ifdef USE_SOCKETW
+#ifdef USE_MYGUI
if(net) GUI_Multiplayer::getSingleton().setVisible(true);
+#endif // USE_MYGUI
+#endif // USE_SOCKETW
}
}
Modified: trunk/source/main/gui_mp.cpp
===================================================================
--- trunk/source/main/gui_mp.cpp 2010-07-20 09:26:44 UTC (rev 1475)
+++ trunk/source/main/gui_mp.cpp 2010-07-20 09:33:12 UTC (rev 1476)
@@ -21,6 +21,7 @@
// created by Thomas Fischer thomas{AT}thomasfischer{DOT}biz, 7th of September
2009
#ifdef USE_MYGUI
+#ifdef USE_SOCKETW
#include "gui_mp.h"
#include "gui_manager.h"
@@ -342,4 +343,5 @@
return mpPanel->isVisible();
}
-#endif //MYGUI
+#endif // USE_SOCKETW
+#endif // USE_MYGUI
Modified: trunk/source/main/gui_mp.h
===================================================================
--- trunk/source/main/gui_mp.h 2010-07-20 09:26:44 UTC (rev 1475)
+++ trunk/source/main/gui_mp.h 2010-07-20 09:33:12 UTC (rev 1476)
@@ -21,6 +21,7 @@
// created by Thomas Fischer thomas{AT}thomasfischer{DOT}biz, 18th of July 2010
#ifdef USE_MYGUI
+#ifdef USE_SOCKETW
#ifndef GUI_MP_H__
#define GUI_MP_H__
@@ -71,5 +72,6 @@
#endif //GUI_MP_H__
-#endif //MYGUI
+#endif // USE_SOCKETW
+#endif // USE_MYGUI
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
