From 1ca397f4265d5e2ce542784515e74dbf7d38a1fe Mon Sep 17 00:00:00 2001 From: KimLS Date: Sat, 22 Nov 2014 03:20:39 -0800 Subject: [PATCH] Lua parser: script_init.lua for zones will now follow script_init_v[0-9]+\.lua similar to player quests. --- zone/lua_parser.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/zone/lua_parser.cpp b/zone/lua_parser.cpp index dce88d5e6..b05e7619f 100644 --- a/zone/lua_parser.cpp +++ b/zone/lua_parser.cpp @@ -857,7 +857,9 @@ void LuaParser::ReloadQuests() { if(zone) { std::string zone_script = "quests/"; zone_script += zone->GetShortName(); - zone_script += "/script_init.lua"; + zone_script += "/script_init_v"; + zone_script += std::to_string(zone->GetInstanceVersion()); + zone_script += ".lua"; f = fopen(zone_script.c_str(), "r"); if(f) { fclose(f); @@ -866,6 +868,21 @@ void LuaParser::ReloadQuests() { std::string error = lua_tostring(L, -1); AddError(error); } + + return; + } + + zone_script = "quests/"; + zone_script += zone->GetShortName(); + zone_script += "/script_init.lua"; + f = fopen(zone_script.c_str(), "r"); + if(f) { + fclose(f); + + if(luaL_dofile(L, zone_script.c_str())) { + std::string error = lua_tostring(L, -1); + AddError(error); + } } } }