Revision: 2460
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2460&view=rev
Author: rorthomas
Date: 2012-03-14 21:00:42 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
.train support :)
Modified Paths:
--------------
trunk/source/main/gameplay/CacheSystem.cpp
trunk/source/main/gui/SelectorWindow.cpp
trunk/source/main/gui/SelectorWindow.h
trunk/source/main/scripting/GameScript.cpp
Modified: trunk/source/main/gameplay/CacheSystem.cpp
===================================================================
--- trunk/source/main/gameplay/CacheSystem.cpp 2012-03-14 20:49:20 UTC (rev
2459)
+++ trunk/source/main/gameplay/CacheSystem.cpp 2012-03-14 21:00:42 UTC (rev
2460)
@@ -57,6 +57,7 @@
known_extensions.push_back("airplane");
known_extensions.push_back("trailer");
known_extensions.push_back("load");
+ known_extensions.push_back("train");
if(BSETTING("streamCacheGenerationOnly", false))
{
Modified: trunk/source/main/gui/SelectorWindow.cpp
===================================================================
--- trunk/source/main/gui/SelectorWindow.cpp 2012-03-14 20:49:20 UTC (rev
2459)
+++ trunk/source/main/gui/SelectorWindow.cpp 2012-03-14 21:00:42 UTC (rev
2460)
@@ -56,6 +56,7 @@
_L("Helicopters");
_L("Aircraft");
_L("Trailers");
+_L("Trains");
_L("Other Loads");
_L("Addon Terrains");
_L("Official Terrains");
@@ -326,10 +327,12 @@
add = (mLoaderType == LT_Airplane || mLoaderType ==
LT_Network || mLoaderType == LT_NetworkWithBoat);
else if(it->fext=="trailer")
add = (mLoaderType == LT_Trailer || mLoaderType ==
LT_Extension);
+ else if(it->fext=="train")
+ add = (mLoaderType == LT_Train);
else if(it->fext=="load")
add = (mLoaderType == LT_Load || mLoaderType ==
LT_Extension);
- if(mLoaderType == LT_AllBeam && (it->fext == "truck" ||
it->fext == "car" || it->fext == "airplane" || it->fext == "trailer" ||
it->fext == "boat" || it->fext == "load"))
+ if(mLoaderType == LT_AllBeam && (it->fext == "train" ||
it->fext == "truck" || it->fext == "car" || it->fext == "airplane" ||
it->fext == "trailer" || it->fext == "boat" || it->fext == "load"))
add = true;
if(!add)
Modified: trunk/source/main/gui/SelectorWindow.h
===================================================================
--- trunk/source/main/gui/SelectorWindow.h 2012-03-14 20:49:20 UTC (rev
2459)
+++ trunk/source/main/gui/SelectorWindow.h 2012-03-14 21:00:42 UTC (rev
2460)
@@ -43,7 +43,7 @@
void setupCamera(Ogre::Camera* _camera) { mCamera = _camera; }
bool isFinishedSelecting();
- enum LoaderType {LT_None, LT_Terrain, LT_Vehicle, LT_Truck, LT_Car,
LT_Boat, LT_Airplane, LT_Trailer, LT_Load, LT_Extension, LT_Network,
LT_NetworkWithBoat, LT_Heli, LT_SKIN, LT_AllBeam};
+ enum LoaderType {LT_None, LT_Terrain, LT_Vehicle, LT_Truck, LT_Car,
LT_Boat, LT_Airplane, LT_Trailer, LT_Train, LT_Load, LT_Extension, LT_Network,
LT_NetworkWithBoat, LT_Heli, LT_SKIN, LT_AllBeam};
void show(LoaderType type);
void hide();
Modified: trunk/source/main/scripting/GameScript.cpp
===================================================================
--- trunk/source/main/scripting/GameScript.cpp 2012-03-14 20:49:20 UTC (rev
2459)
+++ trunk/source/main/scripting/GameScript.cpp 2012-03-14 21:00:42 UTC (rev
2460)
@@ -231,6 +231,7 @@
if (type == "airplane") ntype = SelectorWindow::LT_Airplane;
if (type == "heli") ntype = SelectorWindow::LT_Heli;
if (type == "trailer") ntype = SelectorWindow::LT_Trailer;
+ if (type == "train") ntype = SelectorWindow::LT_Train;
if (type == "load") ntype = SelectorWindow::LT_Load;
if (type == "extension") ntype = SelectorWindow::LT_Extension;
if (ntype != SelectorWindow::LT_None)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
