Differential D3592 Diff 16109 source/ps/scripting/JSInterface_Mod.cpp

Changeset View

Standalone View

source/ps/scripting/JSInterface_Mod.cpp

	/* Copyright (C) 2018 Wildfire Games.			/* Copyright (C) 2021 Wildfire Games.
	* This file is part of 0 A.D.			* This file is part of 0 A.D.
	*			*
	* 0 A.D. is free software: you can redistribute it and/or modify			* 0 A.D. is free software: you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by			* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation, either version 2 of the License, or			* the Free Software Foundation, either version 2 of the License, or
	* (at your option) any later version.			* (at your option) any later version.
	*			*
	* 0 A.D. is distributed in the hope that it will be useful,			* 0 A.D. is distributed in the hope that it will be useful,
	Show All 29 Lines
	* @return JS object with available mods as the keys of the modname.json			* @return JS object with available mods as the keys of the modname.json
	* properties.			* properties.
	*/			*/
	JS::Value JSI_Mod::GetAvailableMods(ScriptInterface::CmptPrivate* pCmptPrivate)			JS::Value JSI_Mod::GetAvailableMods(ScriptInterface::CmptPrivate* pCmptPrivate)
	{			{
	return Mod::GetAvailableMods(*(pCmptPrivate->pScriptInterface));			return Mod::GetAvailableMods(*(pCmptPrivate->pScriptInterface));
	}			}

	void JSI_Mod::RestartEngine(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate))			/**
				* Returns a vector of currently enabled mods.
				*/
				std::vector<CStr> JSI_Mod::GetEnabledMods(ScriptInterface::CmptPrivate* pCmptPrivate)
	{			{
	::RestartEngine();			return Mod::GetEnabledMods(*(pCmptPrivate->pScriptInterface));
				vladislavbelovUnsubmitted Not Done Inline Actions Just `RestartEngine`, without `::`. vladislavbelov: Just `RestartEngine`, without `::`.
	}			}
				wraitiiUnsubmitted Not Done Inline Actions It should be possible to just call Mod::GetEnabledMods directly. You might run into ambiguity as you have overloads - can be solved with static_cast (see JSI_l10n), renaming one of the two functions. In any case, you can now update this file to take `const ScriptInterface&` as first parameter, I've added that. wraitii: It should be possible to just call Mod::GetEnabledMods directly. You might run into ambiguity…

	void JSI_Mod::SetMods(ScriptInterface::CmptPrivate* UNUSED(pCmptPrivate), const std::vector<CStr>& mods)			bool JSI_Mod::SetModsAndRestartEngine(ScriptInterface::CmptPrivate* pCmptPrivate, const std::vector<CStr>& mods)
	{			{
	g_modsLoaded = mods;			if (!Mod::CheckAndEnableMods(*(pCmptPrivate->pScriptInterface), mods))
				return false;

				::RestartEngine();
				return true;
	}			}

	void JSI_Mod::RegisterScriptFunctions(const ScriptInterface& scriptInterface)			void JSI_Mod::RegisterScriptFunctions(const ScriptInterface& scriptInterface)
	{			{
	scriptInterface.RegisterFunction<JS::Value, &GetEngineInfo>("GetEngineInfo");			scriptInterface.RegisterFunction<JS::Value, &GetEngineInfo>("GetEngineInfo");
	scriptInterface.RegisterFunction<JS::Value, &JSI_Mod::GetAvailableMods>("GetAvailableMods");			scriptInterface.RegisterFunction<JS::Value, &JSI_Mod::GetAvailableMods>("GetAvailableMods");
	scriptInterface.RegisterFunction<void, &JSI_Mod::RestartEngine>("RestartEngine");			scriptInterface.RegisterFunction<std::vector<CStr>, &JSI_Mod::GetEnabledMods>("GetEnabledMods");
	scriptInterface.RegisterFunction<void, std::vector<CStr>, &JSI_Mod::SetMods>("SetMods");			scriptInterface.RegisterFunction<bool, std::vector<CStr>, &JSI_Mod::SetModsAndRestartEngine>("SetModsAndRestartEngine");
	}			}