Config File Update Initial Update

shared_memory/base_data.cpp

@@ -33,7 +33,7 @@ void LoadBaseData(SharedDatabase *database, const std::string &prefix) {
 
 	uint32 size = records * 16 * sizeof(BaseDataStruct);
 
-	std::string file_name = std::string("shared/") + prefix + std::string("base_data");
+	std::string file_name = Config->SharedMemDir + prefix + std::string("base_data");
 	EQEmu::MemoryMappedFile mmf(file_name, size);
 	mmf.ZeroFile();
 

shared_memory/base_data.h

@@ -20,6 +20,10 @@
 #define __EQEMU_SHARED_MEMORY_BASE_DATA_H
 
 #include <string>
+#include "../common/eqemu_config.h"
+
+extern const EQEmuConfig *Config;
+
 class SharedDatabase;
 void LoadBaseData(SharedDatabase *database, const std::string &prefix);
 

shared_memory/items.cpp

@@ -37,7 +37,7 @@ void LoadItems(SharedDatabase *database, const std::string &prefix) {
 
 	uint32 size = static_cast<uint32>(EQEmu::FixedMemoryHashSet<Item_Struct>::estimated_size(items, max_item));
 
-	std::string file_name = std::string("shared/") + prefix + std::string("items");
+	std::string file_name = Config->SharedMemDir + prefix + std::string("items");
 	EQEmu::MemoryMappedFile mmf(file_name, size);
 	mmf.ZeroFile();
 

shared_memory/items.h

@@ -20,6 +20,9 @@
 #define __EQEMU_SHARED_MEMORY_ITEMS_H
 
 #include <string>
+#include "../common/eqemu_config.h"
+
+extern const EQEmuConfig *Config;
 
 class SharedDatabase;
 void LoadItems(SharedDatabase *database, const std::string &prefix);

shared_memory/loot.cpp

@@ -44,8 +44,8 @@ void LoadLoot(SharedDatabase *database, const std::string &prefix) {
 		(loot_drop_count * sizeof(LootDrop_Struct)) +				//loot table headers
 		(loot_drop_entries_count * sizeof(LootDropEntries_Struct));	//number of loot table entries
 
-	std::string file_name_lt = std::string("shared/") + prefix + std::string("loot_table");
-	std::string file_name_ld = std::string("shared/") + prefix + std::string("loot_drop");
+	std::string file_name_lt = Config->SharedMemDir + prefix + std::string("loot_table");
+	std::string file_name_ld = Config->SharedMemDir + prefix + std::string("loot_drop");
 
 	EQEmu::MemoryMappedFile mmf_loot_table(file_name_lt, loot_table_size);
 	EQEmu::MemoryMappedFile mmf_loot_drop(file_name_ld, loot_drop_size);

shared_memory/loot.h

@@ -20,6 +20,9 @@
 #define __EQEMU_SHARED_MEMORY_LOOT_H
 
 #include <string>
+#include "../common/eqemu_config.h"
+
+extern const EQEmuConfig *Config;
 
 class SharedDatabase;
 void LoadLoot(SharedDatabase *database, const std::string &prefix);

shared_memory/main.cpp

@@ -35,7 +35,7 @@
 #include "base_data.h"
 
 EQEmuLogSys Log;
-
+const EQEmuConfig *Config;
 int main(int argc, char **argv) {
 	RegisterExecutablePlatform(ExePlatformSharedMemory);
 	Log.LoadLogSettingsDefaults();
@@ -47,12 +47,12 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
-	const EQEmuConfig *config = EQEmuConfig::get();
+	Config = EQEmuConfig::get();
 
 	SharedDatabase database;
 	Log.Out(Logs::General, Logs::Status, "Connecting to database...");
-	if(!database.Connect(config->DatabaseHost.c_str(), config->DatabaseUsername.c_str(),
-		config->DatabasePassword.c_str(), config->DatabaseDB.c_str(), config->DatabasePort)) {
+	if(!database.Connect(Config->DatabaseHost.c_str(), Config->DatabaseUsername.c_str(),
+		Config->DatabasePassword.c_str(), Config->DatabaseDB.c_str(), Config->DatabasePort)) {
 		Log.Out(Logs::General, Logs::Error, "Unable to connect to the database, cannot continue without a "
 			"database connection");
 		return 1;

shared_memory/npc_faction.cpp

@@ -34,7 +34,7 @@ void LoadFactions(SharedDatabase *database, const std::string &prefix) {
 
 	uint32 size = static_cast<uint32>(EQEmu::FixedMemoryHashSet<NPCFactionList>::estimated_size(lists, max_list));
 
-	std::string file_name = std::string("shared/") + prefix + std::string("faction");
+	std::string file_name = Config->SharedMemDir + prefix + std::string("faction");
 	EQEmu::MemoryMappedFile mmf(file_name, size);
 	mmf.ZeroFile();
 

shared_memory/npc_faction.h

@@ -20,6 +20,9 @@
 #define __EQEMU_SHARED_MEMORY_NPC_FACTION_H
 
 #include <string>
+#include "../common/eqemu_config.h"
+
+extern const EQEmuConfig *Config;
 
 class SharedDatabase;
 void LoadFactions(SharedDatabase *database, const std::string &prefix);

shared_memory/skill_caps.cpp

@@ -34,7 +34,7 @@ void LoadSkillCaps(SharedDatabase *database, const std::string &prefix) {
 	uint32 level_count = HARD_LEVEL_CAP + 1;
 	uint32 size = (class_count * skill_count * level_count * sizeof(uint16));
 
-	std::string file_name = std::string("shared/") + prefix + std::string("skill_caps");
+	std::string file_name = Config->SharedMemDir + prefix + std::string("skill_caps");
 	EQEmu::MemoryMappedFile mmf(file_name, size);
 	mmf.ZeroFile();
 

shared_memory/skill_caps.h

@@ -20,6 +20,9 @@
 #define __EQEMU_SHARED_MEMORY_SKILL_CAPS_H
 
 #include <string>
+#include "../common/eqemu_config.h"
+
+extern const EQEmuConfig *Config;
 
 class SharedDatabase;
 void LoadSkillCaps(SharedDatabase *database, const std::string &prefix);

shared_memory/spells.cpp

@@ -34,7 +34,7 @@ void LoadSpells(SharedDatabase *database, const std::string &prefix) {
 
 	uint32 size = records * sizeof(SPDat_Spell_Struct) + sizeof(uint32);
 
-	std::string file_name = std::string("shared/") + prefix + std::string("spells");
+	std::string file_name = Config->SharedMemDir + prefix + std::string("spells");
 	EQEmu::MemoryMappedFile mmf(file_name, size);
 	mmf.ZeroFile();
 

shared_memory/spells.h

@@ -20,6 +20,9 @@
 #define __EQEMU_SHARED_MEMORY_SPELLS_H
 
 #include <string>
+#include "../common/eqemu_config.h"
+
+extern const EQEmuConfig *Config;
 
 class SharedDatabase;
 void LoadSpells(SharedDatabase *database, const std::string &prefix);