Merge pull request #316 from crymp-net/feature/item-system-xml-ssm

fix: Use XML weapon and ammo definitions when in server mode

Author: diznq

Code/CryGame/Game.cpp

@@ -190,7 +190,13 @@ bool CGame::Init(IGameFramework* pFramework)
 
 	string itemFolder = "scripts/entities/items/xml";
 	pFramework->GetIItemSystem()->Scan(itemFolder.c_str());
-	m_pWeaponSystem->RegisterXMLData();
+	if (!gEnv->bClient) {
+		CryLogAlways("[CryMP] Loading XML weapon definitions");
+		m_pWeaponSystem->Scan(itemFolder.c_str());
+	} else {
+		CryLogAlways("[CryMP] Loading pre-compiled weapon definitions");
+		m_pWeaponSystem->RegisterXMLData();
+	}
 
 	m_pOptionsManager = COptionsManager::CreateOptionsManager();
 

Code/CryGame/Items/Weapons/WeaponSystem.cpp

@@ -208,7 +208,14 @@ void CWeaponSystem::Reload()
 
 	m_tracerManager.Reset();
 
-	this->RegisterXMLData();
+	if (!gEnv->bClient) {
+		CryLogAlways("[CryMP] Reloading XML weapon definitions");
+		for (TFolderList::iterator it = m_folders.begin(); it != m_folders.end(); ++it)
+			Scan(it->c_str());
+	} else {
+		CryLogAlways("[CryMP] Reloading pre-compiled weapon definitions");
+		this->RegisterXMLData();
+	}
 
 	m_reloading = false;
 }
@@ -456,6 +463,133 @@ int  CWeaponSystem::QueryProjectiles(SProjectileQuery& q)
     return q.nCount;
 }
 
+//------------------------------------------------------------------------
+void CWeaponSystem::Scan(const char* folderName)
+{
+	string folder = folderName;
+	string search = folder;
+	search += "/*.*";
+
+	if (!m_recursing)
+		CryLog("Loading ammo XML definitions from '%s'!", folderName);
+
+	for (auto& entry : CryFind(search.c_str()))
+	{
+		if (entry.IsDirectory())
+		{
+			string subName = folder + "/" + entry.name;
+			if (m_recursing)
+			{
+				Scan(subName.c_str());
+			}
+			else
+			{
+				m_recursing=true;
+				Scan(subName.c_str());
+				m_recursing=false;
+			}
+			continue;
+		}
+
+		if (_stricmp(CryPath::GetExt(entry.name), "xml"))
+		{
+			continue;
+		}
+
+		string xmlFile = folder + string("/") + string(entry.name);
+		XmlNodeRef rootNode = m_pSystem->LoadXmlFile(xmlFile.c_str());
+
+		if (!rootNode)
+		{
+			CryLogWarning("Invalid XML file '%s'! Skipping...", xmlFile.c_str());
+			continue;
+		}
+
+		ScanXML(rootNode, xmlFile.c_str());
+	}
+
+	if (!m_recursing)
+		CryLog("Finished loading ammo XML definitions from '%s'!", folderName);
+
+	if (!m_reloading && !m_recursing)
+		m_folders.push_back(folderName);
+}
+
+//------------------------------------------------------------------------
+bool CWeaponSystem::ScanXML(XmlNodeRef& root, const char* xmlFile)
+{
+	if (strcmpi(root->getTag(), "ammo"))
+		return false;
+
+	const char* name = root->getAttr("name");
+	if (!name)
+	{
+		CryLogWarningAlways("Missing ammo name in XML '%s'! Skipping...", xmlFile);
+		return false;
+	}
+
+	const char* className = root->getAttr("class");
+
+	if (!className)
+	{
+		CryLogWarningAlways("Missing ammo class in XML '%s'! Skipping...", xmlFile);
+		return false;
+	}
+
+	TProjectileRegistry::iterator it = m_projectileregistry.find(CONST_TEMP_STRING(className));
+	if (it == m_projectileregistry.end())
+	{
+		CryLogWarningAlways("Unknown ammo class '%s' specified in XML '%s'! Skipping...", className, xmlFile);
+		return false;
+	}
+
+	const char* scriptName = root->getAttr("script");
+	IEntityClassRegistry::SEntityClassDesc classDesc;
+	classDesc.sName = name;
+	classDesc.sScriptFile = scriptName ? scriptName : "";
+	//classDesc.pUserProxyData = (void *)it->second;
+	//classDesc.pUserProxyCreateFunc = &CreateProxy<CProjectile>;
+	classDesc.flags |= ECLF_INVISIBLE;
+
+	IEntityClass* pClass = gEnv->pEntitySystem->GetClassRegistry()->FindClass(name);
+
+	if (!m_reloading && !pClass)
+	{
+		m_pGame->GetIGameFramework()->GetIGameObjectSystem()->RegisterExtension(name, it->second, &classDesc);
+		pClass = gEnv->pEntitySystem->GetClassRegistry()->FindClass(name);
+		assert(pClass);
+	}
+
+
+	TAmmoTypeParams::iterator ait = m_ammoparams.find(pClass);
+	if (ait == m_ammoparams.end())
+	{
+		std::pair<TAmmoTypeParams::iterator, bool> result = m_ammoparams.insert(TAmmoTypeParams::value_type(pClass, SAmmoTypeDesc()));
+		ait = result.first;
+	}
+
+	const char* configName = root->getAttr("configuration");
+
+	IItemParamsNode* params = m_pItemSystem->CreateParams();
+	params->ConvertFromXML(root);
+
+	SAmmoParams* pAmmoParams = new SAmmoParams(params, pClass);
+
+	SAmmoTypeDesc& desc = ait->second;
+
+	if (!configName || !configName[0])
+	{
+		if (desc.params)
+			delete desc.params;
+		desc.params = pAmmoParams;
+	}
+	else
+		desc.configurations.insert(std::make_pair<string, const SAmmoParams*>(configName, static_cast<const SAmmoParams*>(pAmmoParams)));
+
+	return true;
+}
+
+
 //------------------------------------------------------------------------
 void CWeaponSystem::RegisterAmmo(const char* name, const char* className, const char* script, const char* config, IItemParamsNode* params)
 {

Code/CryGame/Items/Weapons/WeaponSystem.h

@@ -102,10 +102,14 @@ class CWeaponSystem : public ILevelSystemListener
 
 	CTracerManager &GetTracerManager() { return m_tracerManager; };
 
-	void RegisterAmmo(const char* name, const char* className, const char* script, const char* config, IItemParamsNode* params);
+	void Scan(const char* folderName);
+	bool ScanXML(XmlNodeRef& root, const char* xmlFile);
 
+	// CryMP:
+	void RegisterAmmo(const char* name, const char* className, const char* script, const char* config, IItemParamsNode* params);
 	// WeaponSystem_XMLData.cpp
 	void RegisterXMLData();
+	// ~CryMP
 
   static void DebugGun(IConsoleCmdArgs *args = 0);
 	static void RefGun(IConsoleCmdArgs *args = 0);
@@ -150,7 +154,9 @@ class CWeaponSystem : public ILevelSystemListener
 	TAmmoTypeParams			m_ammoparams;
 	TProjectileMap			m_projectiles;
 
+	TFolderList					m_folders;
 	bool								m_reloading;
+	bool								m_recursing;
 
 	string							m_config;
 

Code/Launcher/Launcher.cpp

@@ -1119,7 +1119,11 @@ void Launcher::PatchEngine()
 
 void Launcher::StartEngine()
 {
+	#ifdef SERVER_LAUNCHER
+	const bool oldAction = true;
+	#else
 	const bool oldAction = WinAPI::CmdLine::HasArg("-oldaction");
+	#endif
 
 	IGameFramework* pGameFramework = nullptr;
 
@@ -1195,6 +1199,13 @@ void Launcher::StartEngine()
 
 	StartupTime::Finish();
 	CryLogAlways("Startup finished in %.3f seconds", StartupTime::GetSeconds());
+#ifdef SERVER_LAUNCHER
+	if (oldAction) {
+		CryLogAlways("[CryMP] Using old CryAction");
+	} else {
+		CryLogAlways("[CryMP] Using new CryAction");
+	}
+#endif
 
 	gEnv->pSystem->ExecuteCommandLine();
 }
@@ -1308,10 +1319,12 @@ void Launcher::Run()
 		throw StringTools::ErrorFormat("Invalid name of the executable!");
 	}
 
+#ifdef CLIENT_LAUNCHER
 	if (WinAPI::CmdLine::HasArg("-mod"))
 	{
 		throw StringTools::ErrorFormat("Mods are not supported!");
 	}
+#endif
 
 	this->InitWorkingDirectory();