mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 22:44:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Range-based for for VfsPath loops.

Browse Source 
This was SVN commit r16893.
This commit is contained in:
leper
2015-07-29 23:44:12 +00:00
parent 540cf75794
commit c5eb9b7bb7
8 changed files with 39 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/ScriptInterface.cpp
+4 -6
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2014 Wildfire Games.
/* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -461,14 +461,12 @@ bool ScriptInterface::LoadGlobalScripts()
// Load and execute *.js in the global scripts directory
VfsPaths pathnames;
vfs::GetPathnames(g_VFS, L"globalscripts/", L"*.js", pathnames);
for (VfsPaths::iterator it = pathnames.begin(); it != pathnames.end(); ++it)
{
if (!LoadGlobalScriptFile(*it))
for (const VfsPath& path : pathnames)
if (!LoadGlobalScriptFile(path))
{
LOGERROR("LoadGlobalScripts: Failed to load script %s", it->string8());
LOGERROR("LoadGlobalScripts: Failed to load script %s", path.string8());
return false;
}
}
JSAutoRequest rq(m->m_cx);
JS::RootedValue proto(m->m_cx);