oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Merge 3ac8e4e974 into 499f2284bd

Browse source
This commit is contained in:
DS 2025-09-30 20:09:27 +03:00 • committed by GitHub
commit 2fbcaf5bb3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
50 changed files with 1545 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/client/client.h
View file

@ -45,6 +45,8 @@ class NodeDefManager;
class ParticleManager;
class RenderingEngine;
class SingleMediaDownloader;
class ClientScripting;
class SSCSMController;
struct ChatMessage;
struct ClientDynamicInfo;
struct ClientEvent;
@ -53,6 +55,7 @@ struct MapNode;
struct PlayerControl;
struct PointedThing;
struct ItemVisualsManager;
struct ModVFS;
namespace scene {
class IAnimatedMesh;
@ -100,8 +103,6 @@ private:
std::map<u16, u32> m_packets;
};
class ClientScripting;
class Client : public con::PeerHandler, public InventoryManager, public IGameDef
{
public:
@ -127,14 +128,6 @@ public:
~Client();
DISABLE_CLASS_COPY(Client);
// Load local mods into memory
void scanModSubfolder(const std::string &mod_name, const std::string &mod_path,
std::string mod_subpath);
inline void scanModIntoMemory(const std::string &mod_name, const std::string &mod_path)
{
scanModSubfolder(mod_name, mod_path, "");
}
/*
request all threads managed by client to be stopped
*/
@ -385,7 +378,7 @@ public:
bool checkLocalPrivilege(const std::string &priv)
{ return checkPrivilege(priv); }
virtual scene::IAnimatedMesh* getMesh(const std::string &filename, bool cache = false);
const std::string* getModFile(std::string filename);
ModVFS *getModVFS() { return m_mod_vfs.get(); }
ModStorageDatabase *getModStorageDatabase() override { return m_mod_storage_database; }
ItemVisualsManager *getItemVisualsManager() { return m_item_visuals_manager; }
@ -586,7 +579,10 @@ private:
ModStorageDatabase *m_mod_storage_database = nullptr;
float m_mod_storage_save_timer = 10.0f;
std::vector<ModSpec> m_mods;
StringMap m_mod_vfs;
std::unique_ptr<ModVFS> m_mod_vfs;
// SSCSM
std::unique_ptr<SSCSMController> m_sscsm_controller;
bool m_shutdown = false;