git-svn-id: https://svn.eduke32.com/eduke32@1072 1a8010ca-5511-0410-912e-c29ae57300e0

This commit is contained in:
terminx 2008-09-22 07:53:59 +00:00
parent 493c352669
commit e6d8451084
3 changed files with 13 additions and 3 deletions

View File

@ -399,7 +399,7 @@ BFILE* fopenfrompath(const char *fn, const char *mode)
} }
#define MAXGROUPFILES 4 //Warning: Fix groupfil if this is changed #define MAXGROUPFILES 8 //Warning: Fix groupfil if this is changed
#define MAXOPENFILES 64 //Warning: Fix filehan if this is changed #define MAXOPENFILES 64 //Warning: Fix filehan if this is changed
static char toupperlookup[256] = static char toupperlookup[256] =
@ -424,7 +424,7 @@ static char toupperlookup[256] =
static int numgroupfiles = 0; static int numgroupfiles = 0;
static int gnumfiles[MAXGROUPFILES]; static int gnumfiles[MAXGROUPFILES];
static int groupfil[MAXGROUPFILES] = {-1,-1,-1,-1}; static int groupfil[MAXGROUPFILES] = {-1,-1,-1,-1,-1,-1,-1,-1};
static int groupfilpos[MAXGROUPFILES]; static int groupfilpos[MAXGROUPFILES];
static char *gfilelist[MAXGROUPFILES]; static char *gfilelist[MAXGROUPFILES];
static int *gfileoffs[MAXGROUPFILES]; static int *gfileoffs[MAXGROUPFILES];

View File

@ -10618,4 +10618,6 @@ typedef struct _mapundo
mapundo_t *undopos = NULL; mapundo_t *undopos = NULL;
mapundo_t undoredo[UNDODEPTH]; mapundo_t undoredo[UNDODEPTH];
int map_revision = 0;
*/ */

View File

@ -10928,7 +10928,7 @@ void app_main(int argc,const char **argv)
{ {
Bstrcat(root,mod_dir); Bstrcat(root,mod_dir);
addsearchpath(root); addsearchpath(root);
addsearchpath(mod_dir); // addsearchpath(mod_dir);
#if defined(POLYMOST) && defined(USE_OPENGL) #if defined(POLYMOST) && defined(USE_OPENGL)
Bsprintf(tempbuf,"%s/%s",mod_dir,TEXCACHEDIR); Bsprintf(tempbuf,"%s/%s",mod_dir,TEXCACHEDIR);
Bstrcpy(TEXCACHEDIR,tempbuf); Bstrcpy(TEXCACHEDIR,tempbuf);
@ -11084,6 +11084,14 @@ void app_main(int argc,const char **argv)
ud.last_level = -1; ud.last_level = -1;
if (Bstrcasecmp(ud.rtsname,"DUKE.RTS") == 0)
{
if (WW2GI)
Bstrcpy(ud.rtsname, "WW2GI.RTS");
else if (NAM)
Bstrcpy(ud.rtsname, "NAM.RTS");
}
RTS_Init(ud.rtsname); RTS_Init(ud.rtsname);
if (numlumps) initprintf("Using .RTS file '%s'\n",ud.rtsname); if (numlumps) initprintf("Using .RTS file '%s'\n",ud.rtsname);