0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix whitespace

Browse source
This commit is contained in:
Celtic Minstrel 2021-06-17 21:02:56 -04:00 • committed by Celtic Minstrel
parent 9a74447946
commit 1c2636e989
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/lua/core/_initial.lua
View file

@ -149,16 +149,16 @@ if wesnoth.kernel_type() == 'Game Lua Kernel' then
end end
return get_tod(loc, turn) return get_tod(loc, turn)
end end
local function liminal_bonus(...) local function liminal_bonus(...)
return wesnoth.current.schedule.liminal_bonus return wesnoth.current.schedule.liminal_bonus
end end
wesnoth.get_time_of_day = wesnoth.deprecate_api('wesnoth.get_time_of_day', 'wesnoth.schedule.get_time_of_day or wesnoth.schedule.get_illumination', 1, nil, get_time_of_day, 'The arguments have changed') wesnoth.get_time_of_day = wesnoth.deprecate_api('wesnoth.get_time_of_day', 'wesnoth.schedule.get_time_of_day or wesnoth.schedule.get_illumination', 1, nil, get_time_of_day, 'The arguments have changed')
wesnoth.set_time_of_day = wesnoth.deprecate_api('wesnoth.set_time_of_day', 'wesnoth.current.schedule.time_of_day', 4, nil, nil) wesnoth.set_time_of_day = wesnoth.deprecate_api('wesnoth.set_time_of_day', 'wesnoth.current.schedule.time_of_day', 4, nil, nil)
wesnoth.get_max_liminal_bonus = wesnoth.deprecate_api('wesnoth.get_max_liminal_bonus', 'wesnoth.current.schedule.liminal_bonus', 1, nil, liminal_bonus, "It's now a read-write attribute") wesnoth.get_max_liminal_bonus = wesnoth.deprecate_api('wesnoth.get_max_liminal_bonus', 'wesnoth.current.schedule.liminal_bonus', 1, nil, liminal_bonus, "It's now a read-write attribute")
wesnoth.replace_schedule = wesnoth.deprecate_api('wesnoth.replace_schedule', 'wesnoth.schedule.replace', 1, nil, wesnoth.schedule.replace) wesnoth.replace_schedule = wesnoth.deprecate_api('wesnoth.replace_schedule', 'wesnoth.schedule.replace', 1, nil, wesnoth.schedule.replace)
wesnoth.get_traits = wesnoth.deprecate_api('wesnoth.get_traits', 'wesnoth.game_config.global_traits', 1, nil, function() return wesnoth.game_config.global_traits end) wesnoth.get_traits = wesnoth.deprecate_api('wesnoth.get_traits', 'wesnoth.game_config.global_traits', 1, nil, function() return wesnoth.game_config.global_traits end)
wesnoth.end_level = wesnoth.deprecate_api('wesnoth.end_level', 'wesnoth.scenario.end_level_data assignment', 1, nil, function(cfg) wesnoth.scenario.end_level_data = cfg end) wesnoth.end_level = wesnoth.deprecate_api('wesnoth.end_level', 'wesnoth.scenario.end_level_data assignment', 1, nil, function(cfg) wesnoth.scenario.end_level_data = cfg end)
wesnoth.get_end_level_data = wesnoth.deprecate_api('wesnoth.get_end_level_data', 'wesnoth.scenario.end_level_data', 1, nil, function() return wesnoth.scenario.end_level_data end) wesnoth.get_end_level_data = wesnoth.deprecate_api('wesnoth.get_end_level_data', 'wesnoth.scenario.end_level_data', 1, nil, function() return wesnoth.scenario.end_level_data end)

8
src/scripting/game_lua_kernel.cpp
View file

@ -960,7 +960,7 @@ int game_lua_kernel::impl_schedule_get(lua_State *L)
return_string_attrib("time_of_day", tod_man().get_time_of_day().id); return_string_attrib("time_of_day", tod_man().get_time_of_day().id);
return_int_attrib("liminal_bonus", tod_man().get_max_liminal_bonus()); return_int_attrib("liminal_bonus", tod_man().get_max_liminal_bonus());
} }
if(luaW_getglobal(L, "wesnoth", "schedule", m)) { if(luaW_getglobal(L, "wesnoth", "schedule", m)) {
return 1; return 1;
} }
@ -1117,7 +1117,7 @@ int game_lua_kernel::intf_get_time_of_day(lua_State *L)
// We just need SOME location in that area, it doesn't matter which one. // We just need SOME location in that area, it doesn't matter which one.
loc = *area.begin(); loc = *area.begin();
} }
if(lua_isnumber(L, 2)) { if(lua_isnumber(L, 2)) {
for_turn = luaL_checkinteger(L, 1); for_turn = luaL_checkinteger(L, 1);
int number_of_turns = tod_man().number_of_turns(); int number_of_turns = tod_man().number_of_turns();
@ -3834,7 +3834,7 @@ int game_lua_kernel::intf_replace_schedule(lua_State * L)
// Replace the global schedule with a time area's schedule // Replace the global schedule with a time area's schedule
// The expectation is that you call schedule.replace(time_area.schedule), // The expectation is that you call schedule.replace(time_area.schedule),
// rather than passing a literal location. // rather than passing a literal location.
} else { } else {
vconfig cfg = luaW_checkvconfig(L, 1); vconfig cfg = luaW_checkvconfig(L, 1);
@ -4430,7 +4430,7 @@ game_lua_kernel::game_lua_kernel(game_state & gs, play_controller & pc, reports
luaL_setfuncs(L, audio_callbacks, 0); luaL_setfuncs(L, audio_callbacks, 0);
lua_setfield(L, -2, "audio"); lua_setfield(L, -2, "audio");
lua_pop(L, 1); lua_pop(L, 1);
// Create the schedule module // Create the schedule module
cmd_log_ << "Adding schedule module...\n"; cmd_log_ << "Adding schedule module...\n";
static luaL_Reg const schedule_callbacks[] { static luaL_Reg const schedule_callbacks[] {