mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-01-20 06:01:16 +00:00
Merge branch 'replace-si' of https://github.com/foxtacles/isle-portable into replace-si
This commit is contained in:
commit
34a5319080
@ -46,7 +46,11 @@ void CreateWidescreen()
|
|||||||
object->location_ = si::Vector3(-240.0, 0.0, -1.0);
|
object->location_ = si::Vector3(-240.0, 0.0, -1.0);
|
||||||
object->direction_ = si::Vector3(0, 0, 0);
|
object->direction_ = si::Vector3(0, 0, 0);
|
||||||
object->up_ = si::Vector3(0, 1.0, 0);
|
object->up_ = si::Vector3(0, 1.0, 0);
|
||||||
object->ReplaceWithFile(file.c_str());
|
|
||||||
|
if (!object->ReplaceWithFile(file.c_str())) {
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
|
||||||
si.AppendChild(object);
|
si.AppendChild(object);
|
||||||
depfile << result << ": " << (std::filesystem::current_path() / file).string() << std::endl;
|
depfile << result << ": " << (std::filesystem::current_path() / file).string() << std::endl;
|
||||||
i++;
|
i++;
|
||||||
@ -176,7 +180,10 @@ void CreateHDMusic()
|
|||||||
object->direction_ = si::Vector3(0, 0, 1);
|
object->direction_ = si::Vector3(0, 0, 1);
|
||||||
object->up_ = si::Vector3(0, 1, 0);
|
object->up_ = si::Vector3(0, 1, 0);
|
||||||
object->volume_ = 79;
|
object->volume_ = 79;
|
||||||
object->ReplaceWithFile(file.c_str());
|
|
||||||
|
if (!object->ReplaceWithFile(file.c_str())) {
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
|
||||||
si.AppendChild(object);
|
si.AppendChild(object);
|
||||||
depfile << result << ": " << (std::filesystem::current_path() / file).string() << std::endl;
|
depfile << result << ": " << (std::filesystem::current_path() / file).string() << std::endl;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user