Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Two things I'd like for 82.7 #3

Closed
wants to merge 13 commits into from
Closed

Two things I'd like for 82.7 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b93e348
* New "channel" parameter to LuaUnsyncedCtrl::PlaySoundFile
FLOZi Aug 29, 2010
0c2a2e9
Merge git://springrts.com/spring
FLOZi Sep 7, 2010
3845b86
Merge git://springrts.com/spring
FLOZi Sep 16, 2010
1851f22
Merge git://springrts.com/spring
FLOZi Sep 24, 2010
13cbb18
Merge git://springrts.com/spring
FLOZi Oct 7, 2010
04c59e1
Merge git://springrts.com/spring
FLOZi Oct 25, 2010
4e2a919
Merge git://springrts.com/spring
FLOZi Oct 25, 2010
68e3e7b
Merge git://springrts.com/spring
FLOZi Oct 25, 2010
813822f
Merge git://springrts.com/spring
FLOZi Oct 29, 2010
50c66d1
Merge git://springrts.com/spring
FLOZi Nov 1, 2010
a10a285
* Allow loading from subfolders for weapondef files (tdf and lua)
FLOZi Nov 1, 2010
843aa75
Revert "* New "channel" parameter to LuaUnsyncedCtrl::PlaySoundFile"
FLOZi Nov 1, 2010
3df551a
* Make Spring.AssignMouseCursor and Spring.ReplaceMouseCursor availab…
FLOZi Nov 1, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions cont/base/springcontent/gamedata/weapondefs.lua
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@ local postProcFile = 'gamedata/weapondefs_post.lua'
local TDF = TDFparser or VFS.Include('gamedata/parse_tdf.lua')

local system = VFS.Include('gamedata/system.lua')
VFS.Include('gamedata/VFSUtils.lua')


--------------------------------------------------------------------------------
Expand All @@ -44,7 +45,7 @@ end
-- Load the TDF weapondef files
--

local tdfFiles = VFS.DirList('weapons/', '*.tdf')
local tdfFiles = RecursiveFileSearch('weapons/', '*.tdf')

for _, filename in ipairs(tdfFiles) do
local wds, err = TDF.Parse(filename)
Expand All @@ -66,7 +67,7 @@ end
-- (these will override the TDF versions)
--

local luaFiles = VFS.DirList('weapons/', '*.lua')
local luaFiles = RecursiveFileSearch('weapons/', '*.lua')

for _, filename in ipairs(luaFiles) do
local wdEnv = {}
Expand Down
8 changes: 0 additions & 8 deletions rts/Lua/LuaUnsyncedCtrl.cpp
View file
Open in desktop
Expand Up @@ -863,10 +863,6 @@ int LuaUnsyncedCtrl::SetTeamColor(lua_State* L)

int LuaUnsyncedCtrl::AssignMouseCursor(lua_State* L)
{
if (!CLuaHandle::GetActiveHandle()->GetUserMode()) {
return 0;
}

const int args = lua_gettop(L); // number of arguments
if ((args < 2) || !lua_isstring(L, 1) || !lua_isstring(L, 2)) {
luaL_error(L, "Incorrect arguments to AssignMouseCursor()");
Expand Down Expand Up @@ -899,10 +895,6 @@ int LuaUnsyncedCtrl::AssignMouseCursor(lua_State* L)

int LuaUnsyncedCtrl::ReplaceMouseCursor(lua_State* L)
{
if (!CLuaHandle::GetActiveHandle()->GetUserMode()) {
return 0;
}

const int args = lua_gettop(L); // number of arguments
if ((args < 1) || !lua_isstring(L, 1) || !lua_isstring(L, 2)) {
luaL_error(L, "Incorrect arguments to ReplaceMouseCursor()");
Expand Down