ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allows override of flycast.lua file (#411)

This commit is contained in:
BornPosthumous 2021-11-21 09:16:11 -05:00 committed by GitHub
parent 1057f50f86
commit 417ffc09f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/cfg/option.cpp
View File

@ -160,4 +160,8 @@ std::array<std::array<Option<MapleDeviceType>, 2>, 4> MapleExpansionDevices {
Option<bool> UseRawInput("RawInput", false, "input");
#endif
#ifdef USE_LUA
OptionString LuaFileName("LuaFileName", "flycast.lua");
#endif
} // namespace config

4
core/cfg/option.h
View File

@ -484,5 +484,9 @@ extern Option<bool> UseRawInput;
constexpr bool UseRawInput = false;
#endif
#ifdef USE_LUA
extern OptionString LuaFileName;
#endif
} // namespace config

15
core/lua/lua.cpp
View File

@ -578,6 +578,19 @@ static void luaRegister(lua_State *L)
.endNamespace();
}
static std::string getLuaFile()
{
std::string initFile;
if( !config::LuaFileName.get().empty()){
initFile = get_readonly_config_path(config::LuaFileName.get());
} else {
initFile = get_readonly_config_path("flycast.lua");
}
return initFile;
}
static void doExec(const std::string& path)
{
if (L == nullptr)
@ -598,7 +611,7 @@ void exec(const std::string& path)
void init()
{
std::string initFile = get_readonly_config_path("flycast.lua");
std::string initFile = getLuaFile();
if (!file_exists(initFile))
return;
L = luaL_newstate();

14
core/rend/gui.cpp
View File

@ -1965,6 +1965,20 @@ static void gui_display_settings()
}
ImGui::PopStyleVar();
ImGui::EndTabItem();
#ifdef USE_LUA
header("Lua Scripting");
{
char LuaFileName[256];
strcpy(LuaFileName, config::LuaFileName.get().c_str());
ImGui::InputText("Lua Filename", LuaFileName, sizeof(LuaFileName), ImGuiInputTextFlags_CharsNoBlank, nullptr, nullptr);
ImGui::SameLine();
ShowHelpMarker("Specify lua filename to use. Should be located in Flycasts root directory. Defaults to flycast.lua when empty.");
config::LuaFileName = LuaFileName;
}
#endif
}
if (ImGui::BeginTabItem("About"))
{