Revision: 1632
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1632&view=rev
Author: rorthomas
Date: 2011-02-02 13:41:17 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
fixed some linux compilation issues
Modified Paths:
--------------
trunk/source/configurator/configurator.cpp
trunk/source/main/BeamFactory.cpp
trunk/source/main/BeamLoadTruck.cpp
trunk/source/main/NetworkStreamManager.cpp
trunk/source/main/RigsOfRods.cpp
trunk/source/main/RoR.list
trunk/source/main/RoRFrameListener.cpp
trunk/source/main/Settings.cpp
Modified: trunk/source/configurator/configurator.cpp
===================================================================
--- trunk/source/configurator/configurator.cpp 2011-02-02 02:17:15 UTC (rev
1631)
+++ trunk/source/configurator/configurator.cpp 2011-02-02 13:41:17 UTC (rev
1632)
@@ -1307,7 +1307,7 @@
wxLogStatus(wxT("language file existing, but not found
via wxLocale!"));
wxLogStatus(wxT("is the language installed on your
system?"));
}
- bool res = lang_locale.Init((wxLanguage)language->Language,
wxLOCALE_CONV_ENCODING);
+ bool res = lang_locale.Init((wxLanguage)language->Language);
if(!res)
{
wxLogStatus(wxT("error while initializing language!"));
@@ -1320,7 +1320,7 @@
}
else
{
- lang_locale.Init(wxLANGUAGE_DEFAULT, wxLOCALE_CONV_ENCODING);
+ lang_locale.Init(wxLANGUAGE_DEFAULT);
wxLogStatus(wxT("language not existing, no lang_locale
support!"));
}
}
Modified: trunk/source/main/BeamFactory.cpp
===================================================================
--- trunk/source/main/BeamFactory.cpp 2011-02-02 02:17:15 UTC (rev 1631)
+++ trunk/source/main/BeamFactory.cpp 2011-02-02 13:41:17 UTC (rev 1632)
@@ -65,7 +65,7 @@
delete it2->second;
it2->second = 0;
- it2 = it1->second.erase(it2);
+ it1->second.erase(it2);
UNLOCKSTREAMS();
return 0;
}
@@ -292,4 +292,4 @@
GUI_Multiplayer::getSingleton().update();
#endif // USE_SOCKETW
#endif // USE_MYGUI
-}
\ No newline at end of file
+}
Modified: trunk/source/main/BeamLoadTruck.cpp
===================================================================
--- trunk/source/main/BeamLoadTruck.cpp 2011-02-02 02:17:15 UTC (rev 1631)
+++ trunk/source/main/BeamLoadTruck.cpp 2011-02-02 13:41:17 UTC (rev 1632)
@@ -1567,7 +1567,7 @@
for(Ogre::vector< Ogre::String >::type::iterator it =
tmp.begin(); it != tmp.end(); it++)
{
- float tmpf =
Ogre::StringConverter::parseReal((*it), -1.0);
+ float tmpf =
Ogre::StringConverter::parseReal(*it);
if( tmpf <= 0.0f ) break;
gears.push_back(tmpf);
}
Modified: trunk/source/main/NetworkStreamManager.cpp
===================================================================
--- trunk/source/main/NetworkStreamManager.cpp 2011-02-02 02:17:15 UTC (rev
1631)
+++ trunk/source/main/NetworkStreamManager.cpp 2011-02-02 13:41:17 UTC (rev
1632)
@@ -113,7 +113,7 @@
{
if(it->first == sourceid && (int)it2->first == streamid)
{
- it2 = streams[it->first].erase(it2);
+ streams[it->first].erase(it2);
// iterator gets invalid!
deleted=true;
break;
Modified: trunk/source/main/RigsOfRods.cpp
===================================================================
--- trunk/source/main/RigsOfRods.cpp 2011-02-02 02:17:15 UTC (rev 1631)
+++ trunk/source/main/RigsOfRods.cpp 2011-02-02 13:41:17 UTC (rev 1632)
@@ -202,8 +202,11 @@
// optional ones
// sound iss a bit special as we mark the base sounds so we dont clear
them accidentially later on
+#ifdef USE_OPENAL
+ LogManager::getSingleton().logMessage("Creating Sound Manager");
SoundScriptManager *ssm = SoundScriptManager::getSingleton();
if(ssm) ssm->setLoadingBaseSounds(true);
+#endif // USE_OPENAL
if (SETTINGS.getSetting("3D Sound renderer") != "No sound")
loadMainResource("sounds");
@@ -271,13 +274,6 @@
bool carryOn = configure();
if (!carryOn) return false;
- LogManager::getSingleton().logMessage("Creating Sound Manager");
- //get instance of SoundScriptManager
- //this will create the singleton and register the parser!
-#ifdef USE_OPENAL
- ssm=SoundScriptManager::getSingleton();
-#endif //OPENAL
-
//CREATE SCENE MANAGER
LogManager::getSingleton().logMessage("Creating Scene Manager");
if(SETTINGS.getSetting("new Terrain Mode") == "Yes")
@@ -346,9 +342,9 @@
{
LogManager::getSingleton().logMessage("catched error while
initializing Resource groups: " + e.getFullDescription());
}
-
+#ifdef USE_OPENAL
if(ssm) ssm->setLoadingBaseSounds(false);
-
+#endif // USE_OPENAL
//rgm.initialiseResourceGroup(ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
#ifndef NOLANG
@@ -534,4 +530,4 @@
rgm.addResourceLocation(fullpath+(*iterFiles).filename+dirsep+"Templates",
"FileSystem", "TerrainFolders");
rgm.addResourceLocation(fullpath+(*iterFiles).filename+dirsep+"Terrain",
"FileSystem", "TerrainFolders");
}
-}
\ No newline at end of file
+}
Modified: trunk/source/main/RoR.list
===================================================================
--- trunk/source/main/RoR.list 2011-02-02 02:17:15 UTC (rev 1631)
+++ trunk/source/main/RoR.list 2011-02-02 13:41:17 UTC (rev 1632)
@@ -12,10 +12,7 @@
LoadingWindow.h
Console.h
malloc.c.h
- memoryAllocatedObject.h
- memoryWrapper.h
nedmalloc.h
- rormemory.h
ColoredTextAreaOverlayElement.h
ColoredTextAreaOverlayElementFactory.h
dashboard.h
@@ -129,7 +126,6 @@
SelectorWindow.cpp
LoadingWindow.cpp
Console.cpp
- memoryWrapper.cpp
nedmalloc.cpp
ColoredTextAreaOverlayElement.cpp
dashboard.cpp
@@ -258,12 +254,8 @@
)
SOURCE_GROUP("Memory Management" FILES
malloc.c.h
- memoryAllocatedObject.h
- memoryWrapper.cpp
- memoryWrapper.h
nedmalloc.cpp
nedmalloc.h
- rormemory.h
)
SOURCE_GROUP("GUI-related" FILES
ColoredTextAreaOverlayElement.cpp
Modified: trunk/source/main/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/RoRFrameListener.cpp 2011-02-02 02:17:15 UTC (rev
1631)
+++ trunk/source/main/RoRFrameListener.cpp 2011-02-02 13:41:17 UTC (rev
1632)
@@ -1267,14 +1267,14 @@
{
if(!CACHE.checkResourceLoaded(preselected_map))
{
+ preselected_map = preselected_map + ".terrn";
// fallback to old terrain name with .terrn
- if(!CACHE.checkResourceLoaded(preselected_map +
".terrn"))
+ if(!CACHE.checkResourceLoaded(preselected_map))
{
LogManager::getSingleton().logMessage("Terrain
not found: " + preselected_map);
showError(_L("Terrain loading error"),
_L("Terrain not found: ") + preselected_map);
exit(123);
- } else
- preselected_map = preselected_map + ".terrn";
+ }
}
// set the terrain cache entry
@@ -4222,7 +4222,9 @@
if(isEmbedded)
{
loading_state=ALL_LOADED;
+#ifdef USE_MYGUI
LoadingWindow::get()->hide();
+#endif //USE_MYGUI
}
//uiloader->updateEvents(dt);
@@ -4724,13 +4726,13 @@
if(!CACHE.checkResourceLoaded(terrainfile))
{
// fallback for terrains, add .terrn if not found and retry
- if(!CACHE.checkResourceLoaded(terrainfile+".terrn"))
+ terrainfile = terrainfile + ".terrn";
+ if(!CACHE.checkResourceLoaded(terrainfile))
{
LogManager::getSingleton().logMessage("Terrain not
found: " + terrainfile);
showError(_L("Terrain loading error"), _L("Terrain not
found: ") + terrainfile);
exit(123);
- } else
- terrainfile = terrainfile + ".terrn";
+ }
}
Modified: trunk/source/main/Settings.cpp
===================================================================
--- trunk/source/main/Settings.cpp 2011-02-02 02:17:15 UTC (rev 1631)
+++ trunk/source/main/Settings.cpp 2011-02-02 13:41:17 UTC (rev 1632)
@@ -144,9 +144,9 @@
int Settings::generateBinaryHash()
{
#ifndef NOOGRE
+ char program_path[1024]="";
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
// note: we enforce usage of the non-UNICODE interfaces (since its
easier to integrate here)
- char program_path[1024]="";
if (!GetModuleFileNameA(NULL, program_path, 512))
{
showError(_L("Startup error"), _L("Error while retrieving
program space path"));
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
