pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 23:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create shared_memory directory from the config file if it doesn't exist on launch of shared_memory.exe

Browse Source
This commit is contained in:
Akkadius 2016-11-10 12:00:44 -06:00
parent e7e379c71b
commit 34ffb5b908
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/emu_legacy.h
View File

@ -176,6 +176,7 @@ namespace EQEmu
static const size_t TEXT_LINK_BODY_LENGTH = 56; static const size_t TEXT_LINK_BODY_LENGTH = 56;
} }
} }
#endif /* COMMON_EMU_LEGACY_H */ #endif /* COMMON_EMU_LEGACY_H */

38
shared_memory/main.cpp
View File

@ -36,6 +36,39 @@
EQEmuLogSys Log; EQEmuLogSys Log;
#ifdef _WINDOWS
#include <direct.h>
#else
#include <unistd.h>
#include <sys/stat.h>
#endif
inline bool MakeDirectory(const std::string &directory_name)
{
#ifdef _WINDOWS
struct _stat st;
if (_stat(directory_name.c_str(), &st) == 0) {
return false;
}
else {
_mkdir(directory_name.c_str());
return true;
}
#else
struct stat st;
if (stat(directory_name.c_str(), &st) == 0) {
return false;
}
else {
mkdir(directory_name.c_str(), 0755);
return true;
}
#endif
return false;
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
RegisterExecutablePlatform(ExePlatformSharedMemory); RegisterExecutablePlatform(ExePlatformSharedMemory);
Log.LoadLogSettingsDefaults(); Log.LoadLogSettingsDefaults();
@ -62,6 +95,11 @@ int main(int argc, char **argv) {
database.LoadLogSettings(Log.log_settings); database.LoadLogSettings(Log.log_settings);
Log.StartFileLogs(); Log.StartFileLogs();
std::string shared_mem_directory = Config->SharedMemDir;
if (MakeDirectory(shared_mem_directory)) {
Log.Out(Logs::General, Logs::Status, "Shared Memory folder doesn't exist, so we created it... '%s'", shared_mem_directory.c_str());
}
database.LoadVariables(); database.LoadVariables();
/* If we're running shared memory and hotfix has no custom name, we probably want to start from scratch... */ /* If we're running shared memory and hotfix has no custom name, we probably want to start from scratch... */

6
zone/map.cpp
View File

@ -302,7 +302,7 @@ Map *Map::LoadMapFile(std::string file) {
bool Map::Load(std::string filename, bool force_mmf_overwrite) bool Map::Load(std::string filename, bool force_mmf_overwrite)
{ {
if (LoadMMF(filename, force_mmf_overwrite)) { if (LoadMMF(filename, force_mmf_overwrite)) {
Log.Out(Logs::General, Logs::Zone_Server, "Loaded .MMF Map File in place of '%s'", filename.c_str()); Log.Out(Logs::General, Logs::Status, "Loaded .MMF Map File in place of '%s'", filename.c_str());
return true; return true;
} }
#else #else
@ -319,7 +319,7 @@ bool Map::Load(std::string filename)
} }
if(version == 0x01000000) { if(version == 0x01000000) {
Log.Out(Logs::General, Logs::Zone_Server, "Loaded V1 Map File :: '%s'", filename.c_str()); Log.Out(Logs::General, Logs::Status, "Loaded V1 Map File :: '%s'", filename.c_str());
bool v = LoadV1(f); bool v = LoadV1(f);
fclose(f); fclose(f);
@ -330,7 +330,7 @@ bool Map::Load(std::string filename)
return v; return v;
} else if(version == 0x02000000) { } else if(version == 0x02000000) {
Log.Out(Logs::General, Logs::Zone_Server, "Loaded V2 Map File :: '%s'", filename.c_str()); Log.Out(Logs::General, Logs::Status, "Loaded V2 Map File :: '%s'", filename.c_str());
bool v = LoadV2(f); bool v = LoadV2(f);
fclose(f); fclose(f);