Revision: 1682
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1682&view=rev
Author: rorthomas
Date: 2011-02-16 18:11:26 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
added some comments
and added always loaded directory
Modified Paths:
--------------
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/main_sim/RigsOfRods.cpp
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2011-02-15 14:44:51 UTC
(rev 1681)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2011-02-16 18:11:26 UTC
(rev 1682)
@@ -517,13 +517,13 @@
//fire
if (trucks[current_truck]->aeroengines[0]->isFailed())
ow->engfireo1->setMaterialName("tracks/engfire-on"); else
ow->engfireo1->setMaterialName("tracks/engfire-off");
- if (ftp>1 && trucks[current_truck]->aeroengines[1]->isFailed())
ow->engfireo2->setMaterialName("tracks/engfire-on"); else
ow->engfireo2->setMaterialName("tracks/engfire-off");
- if (ftp>2 && trucks[current_truck]->aeroengines[2]->isFailed())
ow->engfireo3->setMaterialName("tracks/engfire-on"); else
ow->engfireo3->setMaterialName("tracks/engfire-off");
- if (ftp>3 && trucks[current_truck]->aeroengines[3]->isFailed())
ow->engfireo4->setMaterialName("tracks/engfire-on"); else
ow->engfireo4->setMaterialName("tracks/engfire-off");
+ if (ftp > 1 &&
trucks[current_truck]->aeroengines[1]->isFailed())
ow->engfireo2->setMaterialName("tracks/engfire-on"); else
ow->engfireo2->setMaterialName("tracks/engfire-off");
+ if (ftp > 2 &&
trucks[current_truck]->aeroengines[2]->isFailed())
ow->engfireo3->setMaterialName("tracks/engfire-on"); else
ow->engfireo3->setMaterialName("tracks/engfire-off");
+ if (ftp > 3 &&
trucks[current_truck]->aeroengines[3]->isFailed())
ow->engfireo4->setMaterialName("tracks/engfire-on"); else
ow->engfireo4->setMaterialName("tracks/engfire-off");
//airspeed
float angle=0.0;
- float
ground_speed_kt=trucks[current_truck]->nodes[0].Velocity.length()*1.9438;
+ float
ground_speed_kt=trucks[current_truck]->nodes[0].Velocity.length()*1.9438; //
1.943 = m/s in knots/s
//tropospheric model valid up to 11.000m (33.000ft)
float altitude=trucks[current_truck]->nodes[0].AbsPosition.y;
Modified: trunk/source/main/main_sim/RigsOfRods.cpp
===================================================================
--- trunk/source/main/main_sim/RigsOfRods.cpp 2011-02-15 14:44:51 UTC (rev
1681)
+++ trunk/source/main/main_sim/RigsOfRods.cpp 2011-02-16 18:11:26 UTC (rev
1682)
@@ -250,6 +250,7 @@
ResourceGroupManager::getSingleton().addResourceLocation(SETTINGS.getSetting("User
Path")+"cache", "FileSystem", "cache");
//config, flat
ResourceGroupManager::getSingleton().addResourceLocation(SETTINGS.getSetting("User
Path")+"config", "FileSystem",
ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+
ResourceGroupManager::getSingleton().addResourceLocation(SETTINGS.getSetting("User
Path")+"alwaysload", "FileSystem",
ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
//packs, to be processed later by the cache system
// add scripts folder
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
