Revision: 2745
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2745&view=rev
Author: rorthomas
Date: 2012-05-28 19:34:58 +0000 (Mon, 28 May 2012)
Log Message:
-----------
changed version of RoR to 0.4 yay :D
Modified Paths:
--------------
trunk/source/main/RoRVersion.h
trunk/source/main/terrain/TerrainManager.cpp
trunk/source/main/utils/Utils.cpp
trunk/source/main/utils/Utils.h
Modified: trunk/source/main/RoRVersion.h
===================================================================
--- trunk/source/main/RoRVersion.h 2012-05-28 19:24:15 UTC (rev 2744)
+++ trunk/source/main/RoRVersion.h 2012-05-28 19:34:58 UTC (rev 2745)
@@ -32,8 +32,8 @@
#define SVN_REVISION "$Rev$"
#define SVN_ID "$Id$"
-#define ROR_VERSION_STRING_SHORT "0.39"
-#define ROR_VERSION_STRING "0.39.8"
-#define ROR_VERSION_STRING_WIN 0,39,8,0
+#define ROR_VERSION_STRING_SHORT "0.4"
+#define ROR_VERSION_STRING "0.4.0"
+#define ROR_VERSION_STRING_WIN 0,4,0,0
#endif //RORVERSION_H__
Modified: trunk/source/main/terrain/TerrainManager.cpp
===================================================================
--- trunk/source/main/terrain/TerrainManager.cpp 2012-05-28 19:24:15 UTC
(rev 2744)
+++ trunk/source/main/terrain/TerrainManager.cpp 2012-05-28 19:34:58 UTC
(rev 2745)
@@ -70,7 +70,7 @@
}
// now generate the hash of it
- generateHashFromDataStream(ds.get(), fileHash);
+ generateHashFromDataStream(ds, fileHash);
mTerrainConfig.load(ds, "\t:=", false);
Modified: trunk/source/main/utils/Utils.cpp
===================================================================
--- trunk/source/main/utils/Utils.cpp 2012-05-28 19:24:15 UTC (rev 2744)
+++ trunk/source/main/utils/Utils.cpp 2012-05-28 19:34:58 UTC (rev 2745)
@@ -369,7 +369,7 @@
return value;
}
-void generateHashFromDataStream(DataStream *ds, Ogre::String &hash)
+void generateHashFromDataStream(DataStreamPtr &ds, Ogre::String &hash)
{
size_t location = ds->tell();
// copy whole file into a buffer
@@ -405,5 +405,5 @@
{
// no exception handling in here
DataStreamPtr ds =
ResourceGroupManager::getSingleton().openResource(filename,
ResourceGroupManager::AUTODETECT_RESOURCE_GROUP_NAME);
- generateHashFromDataStream(ds.get(), hash);
+ generateHashFromDataStream(ds, hash);
}
Modified: trunk/source/main/utils/Utils.h
===================================================================
--- trunk/source/main/utils/Utils.h 2012-05-28 19:24:15 UTC (rev 2744)
+++ trunk/source/main/utils/Utils.h 2012-05-28 19:34:58 UTC (rev 2745)
@@ -135,7 +135,7 @@
Ogre::Real Round(Ogre::Real value, unsigned short ndigits = 0);
// generates a hash from a DataStream, beware, its loading the whole thing
into a buffer, so its not suited for big files
-void generateHashFromDataStream(Ogre::DataStream *ds, Ogre::String &hash);
+void generateHashFromDataStream(Ogre::DataStreamPtr &ds, Ogre::String &hash);
void generateHashFromFile(Ogre::String filename, Ogre::String &hash);
#endif // __UTILS_H_
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
