Revision: 1500
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1500&view=rev
Author: rorthomas
Date: 2010-07-25 18:21:36 +0000 (Sun, 25 Jul 2010)
Log Message:
-----------
added missing precompiler flags
Modified Paths:
--------------
trunk/source/main/Beam.cpp
trunk/source/main/RoRFrameListener.cpp
Modified: trunk/source/main/Beam.cpp
===================================================================
--- trunk/source/main/Beam.cpp 2010-07-25 03:52:01 UTC (rev 1499)
+++ trunk/source/main/Beam.cpp 2010-07-25 18:21:36 UTC (rev 1500)
@@ -8060,8 +8060,10 @@
if (nodes[i].iswheel &&
ns>thresold)
{
if(dustp)
dustp->allocSmoke(nodes[i].AbsPosition, nodes[i].Velocity);
+#ifdef USE_OPENAL
ssm->modulate(trucknum, SS_MOD_SCREETCH, (ns-thresold)/thresold);
ssm->trigOnce(trucknum, SS_TRIG_SCREETCH);
+#endif // USE_OPENAL
}
//sparks
Modified: trunk/source/main/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/RoRFrameListener.cpp 2010-07-25 03:52:01 UTC (rev
1499)
+++ trunk/source/main/RoRFrameListener.cpp 2010-07-25 18:21:36 UTC (rev
1500)
@@ -4948,7 +4948,7 @@
//matProfile->setLightmapEnabled(false);
// Important to set these so that the terrain knows
what to use for derived (non-realtime) data
- if(mainLight)
TerrainGlobalOptions::getSingleton().setLightMapDirection(mainLight->getDerivedDirection());
+ //if(mainLight)
TerrainGlobalOptions::getSingleton().setLightMapDirection(mainLight->getDerivedDirection());
TerrainGlobalOptions::getSingleton().setCompositeMapAmbient(mSceneMgr->getAmbientLight());
//mTerrainGlobals->setCompositeMapAmbient(ColourValue::Red);
if(mainLight)
TerrainGlobalOptions::getSingleton().setCompositeMapDiffuse(mainLight->getDiffuseColour());
@@ -7095,11 +7095,15 @@
netcheckGUITimer=0;
}
+#ifdef USE_SOCKETW
+#ifdef USE_MYGUI
// update net quality icon
if(getNetQualityChanged())
{
GUI_Multiplayer::getSingleton().update();
}
+#endif // USE_MYGUI
+#endif // USE_SOCKETW
}
// updating mirrors fixes its shaking!
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
