diff --git a/polymer/build/src/polymost.c b/polymer/build/src/polymost.c index de05c442f..b42fb2b25 100644 --- a/polymer/build/src/polymost.c +++ b/polymer/build/src/polymost.c @@ -325,7 +325,7 @@ static void uploadtexture(int doalloc, int xsiz, int ysiz, int intexfmt, int tex # include "lzwnew.h" #endif -static char TEXCACHEDIR[] = "texcache"; +char TEXCACHEDIR[] = "texcache"; typedef struct { char magic[8]; // 'Polymost' diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 29849047f..b872fd4e7 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -10770,6 +10770,16 @@ void app_main(int argc,const char **argv) autoloadgrps(duke3dgrp); } + Bsprintf(tempbuf,"%s/",mod_dir); + getfilenames(tempbuf,"*.grp"); + while (findfiles) { Bsprintf(tempbuf,"%s/%s",mod_dir,findfiles->name); initprintf("Using group file '%s'.\n",tempbuf); initgroupfile(tempbuf); findfiles = findfiles->next; } + Bsprintf(tempbuf,"%s/",mod_dir); + getfilenames(tempbuf,"*.zip"); + while (findfiles) { Bsprintf(tempbuf,"%s/%s",mod_dir,findfiles->name); initprintf("Using group file '%s'.\n",tempbuf); initgroupfile(tempbuf); findfiles = findfiles->next; } + Bsprintf(tempbuf,"%s/",mod_dir); + getfilenames(tempbuf,"*.pk3"); + while (findfiles) { Bsprintf(tempbuf,"%s/%s",mod_dir,findfiles->name); initprintf("Using group file '%s'.\n",tempbuf); initgroupfile(tempbuf); findfiles = findfiles->next; } + loaddefinitions_game(duke3ddef, TRUE); { diff --git a/polymer/eduke32/source/startwin.game.c b/polymer/eduke32/source/startwin.game.c index 76e4daa4b..9400ca216 100644 --- a/polymer/eduke32/source/startwin.game.c +++ b/polymer/eduke32/source/startwin.game.c @@ -71,6 +71,8 @@ static int getfilenames(char *path) #define POPULATE_GAME 4 #define POPULATE_GAMEDIRS 8 +extern char TEXCACHEDIR[]; + static void PopulateForm(int pgs) { HWND hwnd; @@ -184,6 +186,7 @@ static void PopulateForm(int pgs) (void)ComboBox_SetCurSel(hwnd, j); for (dirs=finddirs,i=1; dirs != NULL; dirs=dirs->next,i++) { + if (Bstrcmp(TEXCACHEDIR,dirs->name) == 0) continue; Bsprintf(buf, "%s", dirs->name); j = ComboBox_AddString(hwnd, buf); (void)ComboBox_SetItemData(hwnd, j, i);