X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nationalchars.cpp;h=eb2d080c8d07bb7374de29aea8d386ea860d2a39;hb=c77cc4f737c782c3a56d69da0eac82edd41d4976;hp=927a5a4da61a4b86aabccdbaf680aea549ae7ad7;hpb=36f93c0e7f8a980943237b0b28138ade86f5e573;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 927a5a4da..eb2d080c8 100644
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -32,8 +32,6 @@
 class lwbNickHandler : public HandlerBase1<bool, const std::string&>
 {
  public:
-	lwbNickHandler() { }
-	~lwbNickHandler() { }
 	bool Call(const std::string&);
 };
 
@@ -239,10 +237,6 @@ class ModuleNationalChars : public Module
 		national_case_insensitive_map = m_lower;
 
 		ServerInstance->IsNick = &myhandler;
-
-		Implementation eventlist[] = { I_OnRehash, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-		OnRehash(NULL);
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
@@ -250,7 +244,7 @@ class ModuleNationalChars : public Module
 		tokens["CASEMAPPING"] = casemapping;
 	}
 
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("nationalchars");
 		charset = tag->getString("file");
@@ -300,7 +294,7 @@ class ModuleNationalChars : public Module
 	/*so Bynets Unreal distribution stuff*/
 	void loadtables(std::string filename, unsigned char ** tables, unsigned char cnt, char faillimit)
 	{
-		std::ifstream ifs(filename.c_str());
+		std::ifstream ifs(ServerInstance->Config->Paths.PrependConfig(filename).c_str());
 		if (ifs.fail())
 		{
 			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "loadtables() called for missing file: %s", filename.c_str());