zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-07-24 03:20:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Removed all the unique talk defaults for Wil region (thx Jorge). Got most of man0l0 working with the new system. Fixed nullterm str parsing.

Browse source
This commit is contained in:
Filip Maj 2022-01-27 17:38:15 -05:00
parent 6e869af4fb
commit 26fd79bea5
133 changed files with 481 additions and 2247 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Map Server/Actors/Director/Director.cs
View file

@ -284,7 +284,7 @@ namespace Meteor.Map.actors.director
private void LoadLuaScript()
{
string errorMsg = "";
string luaPath = String.Format(LuaEngine.FILEPATH_DIRECTORS, GetScriptPath());
string luaPath = ConfigConstants.OPTIONS_SCRIPTPATH + String.Format(LuaEngine.FILEPATH_DIRECTORS, GetScriptPath());
directorScript = LuaEngine.LoadScript(luaPath, ref errorMsg);
if (directorScript == null)
Program.Log.Error("Could not find script for director {0}.", GetName());
@ -295,7 +295,7 @@ namespace Meteor.Map.actors.director
if (directorScript != null)
{
string errorMsg = "";
directorScript = LuaEngine.LoadScript(String.Format(LuaEngine.FILEPATH_DIRECTORS, directorScriptPath), ref errorMsg);
directorScript = LuaEngine.LoadScript(ConfigConstants.OPTIONS_SCRIPTPATH + String.Format(LuaEngine.FILEPATH_DIRECTORS, directorScriptPath), ref errorMsg);
if (!directorScript.Globals.Get(funcName).IsNil())
{
DynValue result = directorScript.Call(directorScript.Globals[funcName], args);