mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-11-08 23:51:54 +00:00
Balances random map resources.
Attempts to avoid "invalid argument" errors in typed arrays by forcing them to integer (see #658). Removes script preloading from map generator (VFS is thread-safe now) Removes thread checking from ScriptInterface file loading functions. Adjusts starting entities in civ data. This was SVN commit r9435.
This commit is contained in:
1 parent
d6b073df22
commit
fffcdbbf21
16 files changed
+260
-242
No files matched your search
@@ -808,8 +808,6 @@ bool ScriptInterface::LoadGlobalScript(const VfsPath& filename, const std::wstri
|
||||
|
||||
bool ScriptInterface::LoadGlobalScriptFile(const VfsPath& path)
|
||||
{
|
||||
ENSURE(ThreadUtil::IsMainThread()); // VFS isn't thread-safe
|
||||
|
||||
if (!VfsFileExists(g_VFS, path))
|
||||
{
|
||||
LOGERROR(L"File '%ls' does not exist", path.string().c_str());
|
||||
@@ -896,8 +894,6 @@ CScriptValRooted ScriptInterface::ParseJSON(const std::string& string_utf8)
|
||||
|
||||
CScriptValRooted ScriptInterface::ReadJSONFile(const VfsPath& path)
|
||||
{
|
||||
ENSURE(ThreadUtil::IsMainThread()); // VFS isn't thread-safe
|
||||
|
||||
if (!VfsFileExists(g_VFS, path))
|
||||
{
|
||||
LOGERROR(L"File '%ls' does not exist", path.string().c_str());
|
||||
|
||||
Reference in new issue
Block a user