Revision: 2738
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2738&view=rev
Author: rorthomas
Date: 2012-05-28 16:03:50 +0000 (Mon, 28 May 2012)
Log Message:
-----------
.terrn -> .terrn2
Modified Paths:
--------------
trunk/source/main/gameplay/CacheSystem.cpp
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/gui/SelectorWindow.cpp
Modified: trunk/source/main/gameplay/CacheSystem.cpp
===================================================================
--- trunk/source/main/gameplay/CacheSystem.cpp 2012-05-28 15:57:40 UTC (rev
2737)
+++ trunk/source/main/gameplay/CacheSystem.cpp 2012-05-28 16:03:50 UTC (rev
2738)
@@ -48,7 +48,7 @@
// register the extensions
known_extensions.push_back("machine");
known_extensions.push_back("fixed");
- known_extensions.push_back("terrn");
+ known_extensions.push_back("terrn2");
known_extensions.push_back("truck");
known_extensions.push_back("car");
known_extensions.push_back("boat");
@@ -1179,7 +1179,7 @@
DataStreamPtr ds =
ResourceGroupManager::getSingleton().openResource(filename, group);
entry.dname = ds->getLine();
- if (ext == "terrn")
+ if (ext == "terrn2")
fillTerrainDetailInfo(entry, ds, filename);
else
fillTruckDetailInfo(entry, ds, filename);
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-28 15:57:40 UTC
(rev 2737)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-28 16:03:50 UTC
(rev 2738)
@@ -1075,7 +1075,7 @@
{
if (!CACHE.checkResourceLoaded(preselected_map))
{
- preselected_map = preselected_map + ".terrn";
+ preselected_map = preselected_map + ".terrn2";
// fallback to old terrain name with .terrn
if (!CACHE.checkResourceLoaded(preselected_map))
{
@@ -2786,7 +2786,7 @@
if (!CACHE.checkResourceLoaded(terrainfile))
{
// fallback for terrains, add .terrn if not found and retry
- terrainfile = terrainfile + ".terrn";
+ terrainfile = terrainfile + ".terrn2";
if (!CACHE.checkResourceLoaded(terrainfile))
{
LOG("Terrain not found: " + terrainfile);
@@ -3266,7 +3266,7 @@
BeamFactory::getSingleton().updateVisual(dt);
// add some example AI
- //if (loadedTerrain == "simple.terrn")
+ //if (loadedTerrain == "simple.terrn2")
//BeamFactory::getSingleton().updateAI(dt);
}
Modified: trunk/source/main/gui/SelectorWindow.cpp
===================================================================
--- trunk/source/main/gui/SelectorWindow.cpp 2012-05-28 15:57:40 UTC (rev
2737)
+++ trunk/source/main/gui/SelectorWindow.cpp 2012-05-28 16:03:50 UTC (rev
2738)
@@ -313,7 +313,7 @@
//printf("category: %d\n", it->categoryid);
bool add = false;
- if (it->fext=="terrn")
+ if (it->fext=="terrn2")
add = (mLoaderType == LT_Terrain);
else if (it->fext=="truck")
add = (mLoaderType == LT_AllBeam || mLoaderType ==
LT_Vehicle || mLoaderType == LT_Truck || mLoaderType == LT_Network ||
mLoaderType == LT_NetworkWithBoat);
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
Rigsofrods-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
