Revision: 2676
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2676&view=rev
Author: rorthomas
Date: 2012-05-26 02:06:28 +0000 (Sat, 26 May 2012)
Log Message:
-----------
fixed syntax problems
Modified Paths:
--------------
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/gameplay/RoRFrameListener.h
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-26 01:58:41 UTC
(rev 2675)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2012-05-26 02:06:28 UTC
(rev 2676)
@@ -1239,45 +1239,8 @@
#endif
}
-void RoRFrameListener::loadNetTerrain(char *preselected_map)
-{
- // load preselected map
- char mapname[1024];
- String group="";
- sprintf(mapname, "%s.terrn", preselected_map);
- loadTerrain(mapname);
- //miniature map stuff
- MaterialPtr
tmat=(MaterialPtr)(MaterialManager::getSingleton().getByName("tracks/Map"));
- //search if mini picture exists
- char ppname[1024];
- sprintf(ppname, "%s-mini.dds", preselected_map);
- group="";
- if (group == "")
- {
- sprintf(ppname, "%s-mini.png", preselected_map);
- try
- {
- group =
ResourceGroupManager::getSingleton().findGroupContainingResource(ppname);
- }catch(...)
- {
- }
- }
- if (group == "")
- return;
- FileInfoListPtr files=
ResourceGroupManager::getSingleton().findResourceFileInfo(group, ppname);
- if (!files->empty())
- {
-
tmat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName(ppname);
- }
- else
- {
-
tmat->getTechnique(0)->getPass(0)->getTextureUnitState(0)->setTextureName("unknown.dds");
- }
-}
-
-
void updateCruiseControl(Beam* curr_truck, float dt)
{
if (INPUTENGINE.getEventValue(EV_TRUCK_BRAKE) > 0.05f ||
@@ -3054,7 +3017,7 @@
LOG("Loading new terrain format: " + terrainfile);
loadNewTerrain(terrainfile);
- else if (terrainfile.find(".terrn") != String::npos)
+ } else if (terrainfile.find(".terrn") != String::npos)
{
LOG("Loading classic terrain format: " + terrainfile);
loadClassicTerrain(terrainfile);
Modified: trunk/source/main/gameplay/RoRFrameListener.h
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.h 2012-05-26 01:58:41 UTC
(rev 2675)
+++ trunk/source/main/gameplay/RoRFrameListener.h 2012-05-26 02:06:28 UTC
(rev 2676)
@@ -293,7 +293,6 @@
void loadNewTerrain(Ogre::String terrainfile);
void loadClassicTerrain(Ogre::String terrainfile);
- void loadNetTerrain(char *preselected_map);
void loadTerrain(Ogre::String terrainfile);
void netDisconnectTruck(int number);
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
