- disabled the settings.cfg console script so that the newly added config code can take over its duties.

- write the console log to the folder returned by M_GetDocumentsPath and not to the root game directory.
- removed G_ExtPreInit because it has become redundant. The search path setup will have to be redone anyway.
This commit is contained in:
Christoph Oelckers 2019-10-26 13:41:42 +02:00
parent 1e0d49f947
commit cd47582632
15 changed files with 21 additions and 254 deletions

View file

@ -7,7 +7,7 @@
#include "build.h"
#include "baselayer.h"
#include "palette.h"
#include "cmdlib.h"
#include "grpscan.h"
#ifdef _WIN32
@ -211,23 +211,10 @@ void G_SetupGlobalPsky(void)
//////////
static char g_rootDir[BMAX_PATH];
static void G_LoadAddon(void);
int32_t g_groupFileHandle;
struct strllist* CommandPaths, * CommandGrps;
void G_ExtPreInit(int32_t argc,char const * const * argv)
{
#ifdef _WIN32
GetModuleFileNameA(NULL,g_rootDir,BMAX_PATH);
Bcorrectfilename(g_rootDir,1);
//chdir(g_rootDir);
#else
getcwd(g_rootDir,BMAX_PATH);
strcat(g_rootDir,"/");
#endif
}
void G_ExtInit(void)
{
char cwd[BMAX_PATH];
@ -357,8 +344,8 @@ void G_LoadGroups(int32_t autoload)
{
char cwd[BMAX_PATH];
Bstrcat(g_rootDir, g_modDir);
addsearchpath(g_rootDir);
FString g_rootDir = progdir + g_modDir;
addsearchpath(g_rootDir);
// addsearchpath(mod_dir);
char path[BMAX_PATH];