Revision: 1537
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1537&view=rev
Author: rorthomas
Date: 2010-09-03 09:12:34 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
minor linux warning fixes
Modified Paths:
--------------
trunk/source/main/DustManager.cpp
trunk/source/main/as_ogre.cpp
Modified: trunk/source/main/DustManager.cpp
===================================================================
--- trunk/source/main/DustManager.cpp 2010-09-03 09:11:51 UTC (rev 1536)
+++ trunk/source/main/DustManager.cpp 2010-09-03 09:12:34 UTC (rev 1537)
@@ -48,15 +48,15 @@
if (SETTINGS.getSetting("Dust")=="Yes")
{
- dustpools["dust"] = new DustPool("tracks/Dust", 20,
mSceneMgr->getRootSceneNode(), mSceneMgr, w);
- dustpools["clump"] = new DustPool("tracks/Clump", 20,
mSceneMgr->getRootSceneNode(), mSceneMgr, w);
- dustpools["sparks"] = new DustPool("tracks/Sparks", 10,
mSceneMgr->getRootSceneNode(), mSceneMgr, w);
+ dustpools["dust"] = new DustPool((char *)"tracks/Dust", 20,
mSceneMgr->getRootSceneNode(), mSceneMgr, w);
+ dustpools["clump"] = new DustPool((char *)"tracks/Clump", 20,
mSceneMgr->getRootSceneNode(), mSceneMgr, w);
+ dustpools["sparks"] = new DustPool((char *)"tracks/Sparks", 10,
mSceneMgr->getRootSceneNode(), mSceneMgr, w);
}
if (SETTINGS.getSetting("Spray")=="Yes")
{
- dustpools["drip"] = new DustPool("tracks/Drip", 50,
mSceneMgr->getRootSceneNode(), mSceneMgr, w);
- dustpools["splash"] = new DustPool("tracks/Splash", 20,
mSceneMgr->getRootSceneNode(), mSceneMgr, w);
- dustpools["ripple"] = new DustPool("tracks/Ripple", 20,
mSceneMgr->getRootSceneNode(), mSceneMgr, w);
+ dustpools["drip"] = new DustPool((char *)"tracks/Drip", 50,
mSceneMgr->getRootSceneNode(), mSceneMgr, w);
+ dustpools["splash"] = new DustPool((char *)"tracks/Splash", 20,
mSceneMgr->getRootSceneNode(), mSceneMgr, w);
+ dustpools["ripple"] = new DustPool((char *)"tracks/Ripple", 20,
mSceneMgr->getRootSceneNode(), mSceneMgr, w);
}
}
Modified: trunk/source/main/as_ogre.cpp
===================================================================
--- trunk/source/main/as_ogre.cpp 2010-09-03 09:11:51 UTC (rev 1536)
+++ trunk/source/main/as_ogre.cpp 2010-09-03 09:12:34 UTC (rev 1537)
@@ -57,10 +57,12 @@
// Register the object properties
- r = engine->RegisterObjectProperty("Vector3", "float x",
offsetof(Vector3, x)); assert( r >= 0 );
- r = engine->RegisterObjectProperty("Vector3", "float y",
offsetof(Vector3, y)); assert( r >= 0 );
- r = engine->RegisterObjectProperty("Vector3", "float z",
offsetof(Vector3, z)); assert( r >= 0 );
+ r = engine->RegisterObjectProperty("Vector3", "float x",
offsetof(Ogre::Vector3, x)); assert( r >= 0 );
+ r = engine->RegisterObjectProperty("Vector3", "float y",
offsetof(Ogre::Vector3, y)); assert( r >= 0 );
+ r = engine->RegisterObjectProperty("Vector3", "float z",
offsetof(Ogre::Vector3, z)); assert( r >= 0 );
+ r = engine->RegisterObjectProperty("Vector3", "float x",
offsetof(Ogre::Vector3, x)); assert( r >= 0 );
+
// Register the object methods
r = engine->RegisterObjectMethod("Vector3", "float length() const",
asMETHOD(Vector3,length), asCALL_THISCALL); assert( r >= 0 );
r = engine->RegisterObjectMethod("Vector3", "float squaredLength()
const", asMETHOD(Vector3,squaredLength), asCALL_THISCALL); assert( r >= 0 );
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
