zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 08:31:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:rheit/zdoom

Browse source
This commit is contained in:
Randy Heit 2013-09-17 17:32:04 -05:00
commit a3e74bb39f
2 changed files with 1 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/g_shared/a_bridge.cpp
View file

@ -75,6 +75,7 @@ void ACustomBridge::Destroy()
thing->Destroy(); thing->Destroy();
} }
} }
Super::Destroy();
} }
// Action functions for the non-Doom bridge -------------------------------- // Action functions for the non-Doom bridge --------------------------------

29
src/m_specialpaths.cpp
View file

@ -461,36 +461,7 @@ FString M_GetSavegamesPath()
#else // Linux, et al. #else // Linux, et al.
FString GetUserFile(const char *file)
{
FString path;
struct stat info;
path = NicePath("~/" GAME_DIR "/");
if (stat(path, &info) == -1)
{
struct stat extrainfo;
// Sanity check for ~/.config
FString configPath = NicePath("~/.config/");
if (stat(configPath, &extrainfo) == -1)
{
if (mkdir(configPath, S_IRUSR | S_IWUSR | S_IXUSR) == -1)
{
I_FatalError("Failed to create ~/.config directory:\n%s", strerror(errno));
}
}
else if (!S_ISDIR(extrainfo.st_mode))
{
I_FatalError("~/.config must be a directory");
}
// This can be removed after a release or two
// Transfer the old zdoom directory to the new location
bool moved = false;
FString oldpath = NicePath("~/.zdoom/");
if (stat #if defined(__unix__)
FString GetUserFile (const char *file) FString GetUserFile (const char *file)
{ {
FString path; FString path;