Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move WZ_WRITEDIR to frame.h and use it for the crashdumps as well. 

Closes #3095.
master
cybersphinx 2012-01-31 21:14:41 +01:00
parent 395cb1bf50
commit 5506daef71
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/exceptionhandler/exchndl.cpp
View File

@ -1203,7 +1203,8 @@ void ExchndlSetup(const char *packageVersion)
// NOTE: CSIDL_PERSONAL = C:\Users\user name\Documents
if ( SUCCEEDED( SHGetFolderPathW( NULL, CSIDL_PERSONAL, NULL, SHGFP_TYPE_CURRENT, miniDumpPath ) ))
{
PathAppendW( miniDumpPath, L"Warzone 2100 master\\logs" );
PathAppendW( miniDumpPath, WZ_WRITEDIR);
PathAppendW( miniDumpPath, L"\\logs" );
if( !PathFileExistsW( miniDumpPath ) )
{

8
lib/framework/frame.h
View File

@ -61,6 +61,14 @@ typedef uint16_t PlayerMask;
#error Warzone 2100 is not a MMO.
#endif
#if defined(WZ_OS_WIN)
# define WZ_WRITEDIR "Warzone 2100 master"
#elif defined(WZ_OS_MAC)
# define WZ_WRITEDIR "Warzone 2100 master"
#else
# define WZ_WRITEDIR ".warzone2100-master"
#endif
enum QUEUE_MODE
{
ModeQueue, ///< Sends a message on the game queue, which will get synchronised, by sending a GAME_ message.

8
src/main.cpp
View File

@ -98,14 +98,6 @@ enum FOCUS_STATE
FOCUS_IN, // Window has got the focus
};
#if defined(WZ_OS_WIN)
# define WZ_WRITEDIR "Warzone 2100 master"
#elif defined(WZ_OS_MAC)
# define WZ_WRITEDIR "Warzone 2100 master"
#else
# define WZ_WRITEDIR ".warzone2100-master"
#endif
bool customDebugfile = false; // Default false: user has NOT specified where to store the stdout/err file.
char datadir[PATH_MAX] = ""; // Global that src/clparse.c:ParseCommandLine can write to, so it can override the default datadir on runtime. Needs to be empty on startup for ParseCommandLine to work!