mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-11 07:11:39 +00:00
Add GRP/DEF code from eduke32
# Conflicts: # platform/Windows/exhumed.vcxproj # platform/Windows/exhumed.vcxproj.filters # source/platform/win32/startwin.game.cpp
This commit is contained in:
nukeykt
Christoph Oelckers
parent
1dd696df18
commit
5298e97fc5
3 changed files with 516 additions and 3 deletions
|
|
@ -51,6 +51,7 @@
|
|||
#include "trigdat.h"
|
||||
#include "record.h"
|
||||
#include "lighting.h"
|
||||
#include "grpscan.h"
|
||||
#include <string.h>
|
||||
#include <cstdio> // for printf
|
||||
#include <cstdlib>
|
||||
|
|
@ -446,9 +447,52 @@ buildvfs_kfd kopen4loadfrommod(const char *fileName, char searchfirst)
|
|||
return (kFile == buildvfs_kfd_invalid) ? kopen4load(fileName, searchfirst) : kFile;
|
||||
}
|
||||
|
||||
struct grpfile_t const *g_selectedGrp;
|
||||
|
||||
int32_t g_gameType = GAMEFLAG_POWERSLAVE;
|
||||
|
||||
// g_gameNamePtr can point to one of: grpfiles[].name (string literal), string
|
||||
// literal, malloc'd block (XXX: possible leak)
|
||||
const char *g_gameNamePtr = NULL;
|
||||
|
||||
// grp handling
|
||||
|
||||
static const char *defaultgamegrp = "STUFF.DAT";
|
||||
static const char *defaultdeffilename = "powerslave.def";
|
||||
|
||||
// g_grpNamePtr can ONLY point to a malloc'd block (length BMAX_PATH)
|
||||
char *g_grpNamePtr = NULL;
|
||||
|
||||
void clearGrpNamePtr(void)
|
||||
{
|
||||
Xfree(g_grpNamePtr);
|
||||
// g_grpNamePtr assumed to be assigned to right after
|
||||
}
|
||||
|
||||
const char *G_DefaultGrpFile(void)
|
||||
{
|
||||
return defaultgamegrp;
|
||||
}
|
||||
const char *G_DefaultDefFile(void)
|
||||
{
|
||||
return defaultdeffilename;
|
||||
}
|
||||
|
||||
const char *G_GrpFile(void)
|
||||
{
|
||||
return (g_grpNamePtr == NULL) ? G_DefaultGrpFile() : g_grpNamePtr;
|
||||
}
|
||||
|
||||
const char *G_DefFile(void)
|
||||
{
|
||||
return (g_defNamePtr == NULL) ? G_DefaultDefFile() : g_defNamePtr;
|
||||
}
|
||||
|
||||
int32_t g_commandSetup = 0;
|
||||
int32_t g_noSetup = 0;
|
||||
int32_t g_noAutoLoad = 0;
|
||||
int g_useCwd;
|
||||
int32_t g_groupFileHandle;
|
||||
|
||||
void G_ExtPreInit(int32_t argc,char const * const * argv)
|
||||
{
|
||||
|
|
@ -464,6 +508,466 @@ void G_ExtPreInit(int32_t argc,char const * const * argv)
|
|||
#endif
|
||||
}
|
||||
|
||||
void G_ExtInit(void)
|
||||
{
|
||||
char cwd[BMAX_PATH];
|
||||
|
||||
#ifdef EDUKE32_OSX
|
||||
char *appdir = Bgetappdir();
|
||||
addsearchpath(appdir);
|
||||
Xfree(appdir);
|
||||
#endif
|
||||
|
||||
#ifdef USE_PHYSFS
|
||||
strncpy(cwd, PHYSFS_getBaseDir(), ARRAY_SIZE(cwd));
|
||||
cwd[ARRAY_SIZE(cwd)-1] = '\0';
|
||||
#else
|
||||
if (buildvfs_getcwd(cwd, ARRAY_SIZE(cwd)) && Bstrcmp(cwd, "/") != 0)
|
||||
#endif
|
||||
addsearchpath(cwd);
|
||||
|
||||
if (CommandPaths)
|
||||
{
|
||||
int32_t i;
|
||||
struct strllist *s;
|
||||
while (CommandPaths)
|
||||
{
|
||||
s = CommandPaths->next;
|
||||
i = addsearchpath(CommandPaths->str);
|
||||
if (i < 0)
|
||||
{
|
||||
initprintf("Failed adding %s for game data: %s\n", CommandPaths->str,
|
||||
i==-1 ? "not a directory" : "no such directory");
|
||||
}
|
||||
|
||||
Xfree(CommandPaths->str);
|
||||
Xfree(CommandPaths);
|
||||
CommandPaths = s;
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(_WIN32) && !defined(EDUKE32_STANDALONE)
|
||||
if (buildvfs_exists("user_profiles_enabled"))
|
||||
#else
|
||||
if (g_useCwd == 0 && !buildvfs_exists("user_profiles_disabled"))
|
||||
#endif
|
||||
{
|
||||
char *homedir;
|
||||
int32_t asperr;
|
||||
|
||||
if ((homedir = Bgethomedir()))
|
||||
{
|
||||
Bsnprintf(cwd, ARRAY_SIZE(cwd), "%s/"
|
||||
#if defined(_WIN32)
|
||||
APPNAME
|
||||
#elif defined(GEKKO)
|
||||
"apps/" APPBASENAME
|
||||
#else
|
||||
".config/" APPBASENAME
|
||||
#endif
|
||||
,homedir);
|
||||
asperr = addsearchpath(cwd);
|
||||
if (asperr == -2)
|
||||
{
|
||||
if (buildvfs_mkdir(cwd,S_IRWXU) == 0) asperr = addsearchpath(cwd);
|
||||
else asperr = -1;
|
||||
}
|
||||
if (asperr == 0)
|
||||
buildvfs_chdir(cwd);
|
||||
Xfree(homedir);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void G_ScanGroups(void)
|
||||
{
|
||||
ScanGroups();
|
||||
|
||||
g_selectedGrp = NULL;
|
||||
|
||||
char const * const currentGrp = G_GrpFile();
|
||||
|
||||
for (grpfile_t const *fg = foundgrps; fg; fg=fg->next)
|
||||
{
|
||||
if (!Bstrcasecmp(fg->filename, currentGrp))
|
||||
{
|
||||
g_selectedGrp = fg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (g_selectedGrp == NULL)
|
||||
g_selectedGrp = foundgrps;
|
||||
}
|
||||
|
||||
static int32_t G_TryLoadingGrp(char const * const grpfile)
|
||||
{
|
||||
int32_t i;
|
||||
|
||||
if ((i = initgroupfile(grpfile)) == -1)
|
||||
initprintf("Warning: could not find main data file \"%s\"!\n", grpfile);
|
||||
else
|
||||
initprintf("Using \"%s\" as main game data file.\n", grpfile);
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
static int32_t G_LoadGrpDependencyChain(grpfile_t const * const grp)
|
||||
{
|
||||
if (!grp)
|
||||
return -1;
|
||||
|
||||
if (grp->type->dependency && grp->type->dependency != grp->type->crcval)
|
||||
G_LoadGrpDependencyChain(FindGroup(grp->type->dependency));
|
||||
|
||||
int32_t const i = G_TryLoadingGrp(grp->filename);
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
void G_LoadGroups(int32_t autoload)
|
||||
{
|
||||
if (g_modDir[0] != '/')
|
||||
{
|
||||
char cwd[BMAX_PATH];
|
||||
|
||||
Bstrcat(g_rootDir, g_modDir);
|
||||
addsearchpath(g_rootDir);
|
||||
// addsearchpath(mod_dir);
|
||||
|
||||
char path[BMAX_PATH];
|
||||
|
||||
if (buildvfs_getcwd(cwd, BMAX_PATH))
|
||||
{
|
||||
Bsnprintf(path, sizeof(path), "%s/%s", cwd, g_modDir);
|
||||
if (!Bstrcmp(g_rootDir, path))
|
||||
{
|
||||
if (addsearchpath(path) == -2)
|
||||
if (buildvfs_mkdir(path, S_IRWXU) == 0)
|
||||
addsearchpath(path);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef USE_OPENGL
|
||||
Bsnprintf(path, sizeof(path), "%s/%s", g_modDir, TEXCACHEFILE);
|
||||
Bstrcpy(TEXCACHEFILE, path);
|
||||
#endif
|
||||
}
|
||||
|
||||
const char *grpfile;
|
||||
int32_t i;
|
||||
|
||||
if ((i = G_LoadGrpDependencyChain(g_selectedGrp)) != -1)
|
||||
{
|
||||
grpfile = g_selectedGrp->filename;
|
||||
|
||||
clearGrpNamePtr();
|
||||
g_grpNamePtr = dup_filename(grpfile);
|
||||
|
||||
grpinfo_t const * const type = g_selectedGrp->type;
|
||||
|
||||
g_gameType = type->game;
|
||||
g_gameNamePtr = type->name;
|
||||
|
||||
if (type->defname && g_defNamePtr == NULL)
|
||||
g_defNamePtr = dup_filename(type->defname);
|
||||
}
|
||||
else
|
||||
{
|
||||
grpfile = G_GrpFile();
|
||||
i = G_TryLoadingGrp(grpfile);
|
||||
}
|
||||
|
||||
if (autoload)
|
||||
{
|
||||
G_LoadGroupsInDir("autoload");
|
||||
|
||||
if (i != -1)
|
||||
G_DoAutoload(grpfile);
|
||||
}
|
||||
|
||||
if (g_modDir[0] != '/')
|
||||
G_LoadGroupsInDir(g_modDir);
|
||||
|
||||
loaddefinitions_game(G_DefFile(), TRUE);
|
||||
|
||||
struct strllist *s;
|
||||
|
||||
int const bakpathsearchmode = pathsearchmode;
|
||||
pathsearchmode = 1;
|
||||
|
||||
while (CommandGrps)
|
||||
{
|
||||
int32_t j;
|
||||
|
||||
s = CommandGrps->next;
|
||||
|
||||
if ((j = initgroupfile(CommandGrps->str)) == -1)
|
||||
initprintf("Could not find file \"%s\".\n", CommandGrps->str);
|
||||
else
|
||||
{
|
||||
g_groupFileHandle = j;
|
||||
initprintf("Using file \"%s\" as game data.\n", CommandGrps->str);
|
||||
if (autoload)
|
||||
G_DoAutoload(CommandGrps->str);
|
||||
}
|
||||
|
||||
Xfree(CommandGrps->str);
|
||||
Xfree(CommandGrps);
|
||||
CommandGrps = s;
|
||||
}
|
||||
pathsearchmode = bakpathsearchmode;
|
||||
}
|
||||
|
||||
//////////
|
||||
|
||||
struct strllist *CommandPaths, *CommandGrps;
|
||||
|
||||
void G_AddGroup(const char *buffer)
|
||||
{
|
||||
char buf[BMAX_PATH];
|
||||
|
||||
struct strllist *s = (struct strllist *)Xcalloc(1,sizeof(struct strllist));
|
||||
|
||||
Bstrcpy(buf, buffer);
|
||||
|
||||
if (Bstrchr(buf,'.') == 0)
|
||||
Bstrcat(buf,".grp");
|
||||
|
||||
s->str = Xstrdup(buf);
|
||||
|
||||
if (CommandGrps)
|
||||
{
|
||||
struct strllist *t;
|
||||
for (t = CommandGrps; t->next; t=t->next) ;
|
||||
t->next = s;
|
||||
return;
|
||||
}
|
||||
CommandGrps = s;
|
||||
}
|
||||
|
||||
void G_AddPath(const char *buffer)
|
||||
{
|
||||
struct strllist *s = (struct strllist *)Xcalloc(1,sizeof(struct strllist));
|
||||
s->str = Xstrdup(buffer);
|
||||
|
||||
if (CommandPaths)
|
||||
{
|
||||
struct strllist *t;
|
||||
for (t = CommandPaths; t->next; t=t->next) ;
|
||||
t->next = s;
|
||||
return;
|
||||
}
|
||||
CommandPaths = s;
|
||||
}
|
||||
|
||||
//////////
|
||||
|
||||
// loads all group (grp, zip, pk3/4) files in the given directory
|
||||
void G_LoadGroupsInDir(const char *dirname)
|
||||
{
|
||||
static const char *extensions[] = { "*.grp", "*.zip", "*.ssi", "*.pk3", "*.pk4" };
|
||||
char buf[BMAX_PATH];
|
||||
fnlist_t fnlist = FNLIST_INITIALIZER;
|
||||
|
||||
for (auto & extension : extensions)
|
||||
{
|
||||
CACHE1D_FIND_REC *rec;
|
||||
|
||||
fnlist_getnames(&fnlist, dirname, extension, -1, 0);
|
||||
|
||||
for (rec=fnlist.findfiles; rec; rec=rec->next)
|
||||
{
|
||||
Bsnprintf(buf, sizeof(buf), "%s/%s", dirname, rec->name);
|
||||
initprintf("Using group file \"%s\".\n", buf);
|
||||
initgroupfile(buf);
|
||||
}
|
||||
|
||||
fnlist_clearnames(&fnlist);
|
||||
}
|
||||
}
|
||||
|
||||
void G_DoAutoload(const char *dirname)
|
||||
{
|
||||
char buf[BMAX_PATH];
|
||||
|
||||
Bsnprintf(buf, sizeof(buf), "autoload/%s", dirname);
|
||||
G_LoadGroupsInDir(buf);
|
||||
}
|
||||
|
||||
//////////
|
||||
|
||||
enum gametokens
|
||||
{
|
||||
T_INCLUDE = 0,
|
||||
T_INTERFACE = 0,
|
||||
T_LOADGRP = 1,
|
||||
T_MODE = 1,
|
||||
T_CACHESIZE = 2,
|
||||
T_ALLOW = 2,
|
||||
T_NOAUTOLOAD,
|
||||
T_INCLUDEDEFAULT,
|
||||
T_MUSIC,
|
||||
T_SOUND,
|
||||
T_FILE,
|
||||
T_CUTSCENE,
|
||||
T_ANIMSOUNDS,
|
||||
T_NOFLOORPALRANGE,
|
||||
T_ID,
|
||||
T_MINPITCH,
|
||||
T_MAXPITCH,
|
||||
T_PRIORITY,
|
||||
T_TYPE,
|
||||
T_DISTANCE,
|
||||
T_VOLUME,
|
||||
T_DELAY,
|
||||
T_RENAMEFILE,
|
||||
T_GLOBALGAMEFLAGS,
|
||||
T_ASPECT,
|
||||
T_FORCEFILTER,
|
||||
T_FORCENOFILTER,
|
||||
T_TEXTUREFILTER,
|
||||
T_NEWGAMECHOICES,
|
||||
T_CHOICE,
|
||||
T_NAME,
|
||||
T_LOCKED,
|
||||
T_HIDDEN,
|
||||
T_USERCONTENT,
|
||||
};
|
||||
|
||||
int exhumed_globalflags;
|
||||
|
||||
static int parsedefinitions_game(scriptfile *, int);
|
||||
|
||||
static void parsedefinitions_game_include(const char *fileName, scriptfile *pScript, const char *cmdtokptr, int const firstPass)
|
||||
{
|
||||
scriptfile *included = scriptfile_fromfile(fileName);
|
||||
|
||||
if (!included)
|
||||
{
|
||||
if (!Bstrcasecmp(cmdtokptr,"null") || pScript == NULL) // this is a bit overboard to prevent unused parameter warnings
|
||||
{
|
||||
// initprintf("Warning: Failed including %s as module\n", fn);
|
||||
}
|
||||
/*
|
||||
else
|
||||
{
|
||||
initprintf("Warning: Failed including %s on line %s:%d\n",
|
||||
fn, script->filename,scriptfile_getlinum(script,cmdtokptr));
|
||||
}
|
||||
*/
|
||||
}
|
||||
else
|
||||
{
|
||||
parsedefinitions_game(included, firstPass);
|
||||
scriptfile_close(included);
|
||||
}
|
||||
}
|
||||
|
||||
static int parsedefinitions_game(scriptfile *pScript, int firstPass)
|
||||
{
|
||||
int token;
|
||||
char *pToken;
|
||||
|
||||
static const tokenlist tokens[] =
|
||||
{
|
||||
{ "include", T_INCLUDE },
|
||||
{ "#include", T_INCLUDE },
|
||||
{ "includedefault", T_INCLUDEDEFAULT },
|
||||
{ "#includedefault", T_INCLUDEDEFAULT },
|
||||
{ "loadgrp", T_LOADGRP },
|
||||
{ "cachesize", T_CACHESIZE },
|
||||
{ "noautoload", T_NOAUTOLOAD },
|
||||
{ "renamefile", T_RENAMEFILE },
|
||||
{ "globalgameflags", T_GLOBALGAMEFLAGS },
|
||||
};
|
||||
|
||||
do
|
||||
{
|
||||
token = getatoken(pScript, tokens, ARRAY_SIZE(tokens));
|
||||
pToken = pScript->ltextptr;
|
||||
|
||||
switch (token)
|
||||
{
|
||||
case T_LOADGRP:
|
||||
{
|
||||
char *fileName;
|
||||
|
||||
pathsearchmode = 1;
|
||||
if (!scriptfile_getstring(pScript,&fileName) && firstPass)
|
||||
{
|
||||
if (initgroupfile(fileName) == -1)
|
||||
initprintf("Could not find file \"%s\".\n", fileName);
|
||||
else
|
||||
{
|
||||
initprintf("Using file \"%s\" as game data.\n", fileName);
|
||||
if (!g_noAutoLoad && !gSetup.noautoload)
|
||||
G_DoAutoload(fileName);
|
||||
}
|
||||
}
|
||||
|
||||
pathsearchmode = 0;
|
||||
}
|
||||
break;
|
||||
case T_CACHESIZE:
|
||||
{
|
||||
int32_t cacheSize;
|
||||
|
||||
if (scriptfile_getnumber(pScript, &cacheSize) || !firstPass)
|
||||
break;
|
||||
|
||||
if (cacheSize > 0)
|
||||
MAXCACHE1DSIZE = cacheSize << 10;
|
||||
}
|
||||
break;
|
||||
case T_INCLUDE:
|
||||
{
|
||||
char *fileName;
|
||||
|
||||
if (!scriptfile_getstring(pScript, &fileName))
|
||||
parsedefinitions_game_include(fileName, pScript, pToken, firstPass);
|
||||
|
||||
break;
|
||||
}
|
||||
case T_INCLUDEDEFAULT:
|
||||
{
|
||||
parsedefinitions_game_include(G_DefaultDefFile(), pScript, pToken, firstPass);
|
||||
break;
|
||||
}
|
||||
case T_NOAUTOLOAD:
|
||||
if (firstPass)
|
||||
g_noAutoLoad = 1;
|
||||
break;
|
||||
case T_GLOBALGAMEFLAGS: scriptfile_getnumber(pScript, &exhumed_globalflags); break;
|
||||
case T_EOF: return 0;
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
while (1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int loaddefinitions_game(const char *fileName, int32_t firstPass)
|
||||
{
|
||||
scriptfile *pScript = scriptfile_fromfile(fileName);
|
||||
|
||||
if (pScript)
|
||||
parsedefinitions_game(pScript, firstPass);
|
||||
|
||||
for (char const * m : g_defModules)
|
||||
parsedefinitions_game_include(m, NULL, "null", firstPass);
|
||||
|
||||
if (pScript)
|
||||
scriptfile_close(pScript);
|
||||
|
||||
scriptfile_clearsymbols();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
////////
|
||||
|
||||
#define kSpiritX = 106;
|
||||
#define kSpiritY = 97;
|
||||
|
||||
|
|
@ -1724,7 +2228,7 @@ int app_main(int argc, char const* const* argv)
|
|||
if (Bstrcmp(setupfilename, kSetupFilename))
|
||||
initprintf("Using config file \"%s\".\n",setupfilename);
|
||||
|
||||
//G_ScanGroups();
|
||||
G_ScanGroups();
|
||||
|
||||
#ifdef STARTUP_SETUP_WINDOW
|
||||
if (readSetup < 0 || (!g_noSetup && gSetup.forcesetup) || g_commandSetup)
|
||||
|
|
@ -1737,6 +2241,8 @@ int app_main(int argc, char const* const* argv)
|
|||
}
|
||||
#endif
|
||||
|
||||
G_LoadGroups(!g_noAutoLoad && !gSetup.noautoload);
|
||||
|
||||
// Decrypt strings code would normally be here
|
||||
#if 0
|
||||
|
||||
|
|
|
|||
|
|
@ -189,7 +189,6 @@ extern int bVanilla;
|
|||
extern int mouseaiming, aimmode, mouseflip;
|
||||
extern int runkey_mode, auto_run;
|
||||
|
||||
extern char g_modDir[BMAX_PATH];
|
||||
enum {
|
||||
kPalNormal = 0,
|
||||
kPalNoDim,
|
||||
|
|
@ -205,4 +204,12 @@ enum {
|
|||
kPalBrite2
|
||||
};
|
||||
|
||||
extern char g_modDir[BMAX_PATH];
|
||||
|
||||
extern struct grpfile_t const* g_selectedGrp;
|
||||
|
||||
extern int loaddefinitions_game(const char* fn, int32_t preload);
|
||||
void G_LoadGroupsInDir(const char* dirname);
|
||||
void G_DoAutoload(const char* dirname);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -426,7 +426,7 @@ void ResetEngine()
|
|||
|
||||
void InstallEngine()
|
||||
{
|
||||
initgroupfile("stuff.dat");
|
||||
// initgroupfile("stuff.dat");
|
||||
|
||||
char *cwd;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue