immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Potential fix to Travis build fails" 

This reverts commit ed0e5dfef5.
master
Tomasz Kapuściński 2015-01-31 11:55:37 +01:00
parent ed0e5dfef5
commit 03bb000e82
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/resources/resourcemanager.cpp
View File

@ -292,7 +292,7 @@ bool CResourceManager::Copy(const std::string& from, const std::string& to)
std::string writeDir = PHYSFS_getWriteDir(); std::string writeDir = PHYSFS_getWriteDir();
try try
{ {
boost::filesystem3::copy(writeDir + "/" + CleanPath(from), writeDir + "/" + CleanPath(to)); fs::copy(writeDir + "/" + CleanPath(from), writeDir + "/" + CleanPath(to));
} }
catch (std::exception & e) catch (std::exception & e)
{ {

4
src/script/scriptfunc.h
View File

@ -28,8 +28,6 @@
#include "CBot/CBotDll.h" #include "CBot/CBotDll.h"
#include <string>
class CObject; class CObject;
class CScript; class CScript;
@ -179,4 +177,4 @@ private:
static bool Process(CScript* script, CBotVar* result, int &exception); static bool Process(CScript* script, CBotVar* result, int &exception);
static bool ShouldProcessStop(Error err, int errMode); static bool ShouldProcessStop(Error err, int errMode);
static CObject* SearchInfo(CScript* script, CObject* object, float power); static CObject* SearchInfo(CScript* script, CObject* object, float power);
}; };