Revision: 1681
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1681&view=rev
Author: rorthomas
Date: 2011-02-15 14:44:51 +0000 (Tue, 15 Feb 2011)
Log Message:
-----------
fixed updater called from configurator
fixed truck spawning in special cases
fixed userpath in config.cfg not appending a slash at the end
Modified Paths:
--------------
trunk/source/configurator/configurator.cpp
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/utils/Settings.cpp
Modified: trunk/source/configurator/configurator.cpp
===================================================================
--- trunk/source/configurator/configurator.cpp 2011-02-14 13:52:54 UTC (rev
1680)
+++ trunk/source/configurator/configurator.cpp 2011-02-15 14:44:51 UTC (rev
1681)
@@ -1937,7 +1937,7 @@
sei.hwnd = NULL;
sei.lpVerb = _T("runas");
sei.lpFile = wpath;
- sei.lpParameters = wxT("--update");
+ sei.lpParameters = NULL;//wxT("--update");
sei.lpDirectory = cwpath;
sei.nShow = SW_NORMAL;
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2011-02-14 13:52:54 UTC
(rev 1680)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2011-02-15 14:44:51 UTC
(rev 1681)
@@ -7574,6 +7574,7 @@
{
//boy, thats bad
if(ow) ow->flashMessage(_L("Please clear the
place first"), 4);
+ collisions->clearEventCache();
return;
}
}
Modified: trunk/source/main/utils/Settings.cpp
===================================================================
--- trunk/source/main/utils/Settings.cpp 2011-02-14 13:52:54 UTC (rev
1680)
+++ trunk/source/main/utils/Settings.cpp 2011-02-15 14:44:51 UTC (rev
1681)
@@ -352,11 +352,11 @@
loadSettings(configfile, true);
// fix up time things...
- settings["Config Root"] = settings["User Path"]+"config"+dirsep;
- settings["Cache Path"] = settings["User Path"]+"cache"+dirsep;
- settings["Log Path"] = settings["User Path"]+"logs"+dirsep;
- settings["ogre.cfg"] = settings["User
Path"]+"config"+dirsep+"ogre.cfg";
- settings["ogre.log"] = settings["User
Path"]+"logs"+dirsep+"ogre.log";
+ settings["Config Root"] = settings["User
Path"]+dsStr+"config"+dirsep;
+ settings["Cache Path"] = settings["User
Path"]+dsStr+"cache"+dirsep;
+ settings["Log Path"] = settings["User
Path"]+dsStr+"logs"+dirsep;
+ settings["ogre.cfg"] = settings["User
Path"]+dsStr+"config"+dirsep+"ogre.cfg";
+ settings["ogre.log"] = settings["User
Path"]+dsStr+"logs"+dirsep+"ogre.log";
} catch(...)
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
