summaryrefslogtreecommitdiffstats
path: root/src/object/robotmain.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/object/robotmain.cpp')
-rw-r--r--src/object/robotmain.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 62176a1..012b08a 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -4123,7 +4123,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
if (line->GetCommand() == "TerrainInitTextures" && !resetObject)
{
- std::string name = line->GetParam("image")->AsPath(""); //TODO: don't make this relative to textures/
+ std::string name = "../"+line->GetParam("image")->AsPath("textures");
if(name.find(".") == std::string::npos)
name += ".png";
unsigned int dx = line->GetParam("dx")->AsInt(1);
@@ -4154,11 +4154,6 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
}
}
- /*TODO: ???
- if (strstr(name, "%user%") != 0)
- CopyFileListToTemp(name, tt, dx*dy);
- */
-
m_terrain->InitTextures(name.c_str(), tt, dx, dy);
continue;
}
@@ -4175,12 +4170,6 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
if(name.find(".") == std::string::npos)
name += ".png";
name = "../"+name;
- /*TODO: ???
- if (strstr(name, "%user%") != 0)
- {
- GetProfile().CopyFileToTemp(std::string(name));
- }
- */
m_terrain->AddMaterial(line->GetParam("id")->AsInt(0),
name.c_str(),