minor update to texture flags and logic stuff

[xonotic/darkplaces.git] / common.c

diff --git a/common.c b/common.c
index 7ce4b548eb07e34e1fc647e26208349e2ade7244..0f413b2ddde0cc493ed19b662cfde10571388041 100644 (file)
--- a/common.c
+++ b/common.c
@@ -36,8 +36,6 @@ mempool_t *pak_mempool;
 
 qboolean com_modified;   // set true if using non-id files
 
-qboolean msg_suppress_1 = 0;
-
 void COM_InitFilesystem (void);
 
 char com_token[1024];
@@ -52,6 +50,7 @@ char com_cmdline[CMDLINE_LENGTH];
 int gamemode;
 char *gamename;
 char *gamedirname;
+char com_modname[MAX_OSPATH];
 
 /*
 
@@ -1386,7 +1385,7 @@ void COM_AddGameDirectory (char *dir)
        list = listdirectory(dir);
        for (current = list;current;current = current->next)
        {
-               if (matchpattern(current->text, "*.pak"))
+               if (matchpattern(current->text, "*.pak", true))
                {
                        sprintf (pakfile, "%s/%s", dir, current->text);
                        pak = COM_LoadPackFile (pakfile);
@@ -1427,10 +1426,12 @@ void COM_InitFilesystem (void)
                com_basedir[i-1] = 0;
 
 // start up with GAMENAME by default (id1)
+       strcpy(com_modname, GAMENAME);
        COM_AddGameDirectory (va("%s/"GAMENAME, com_basedir));
        if (gamedirname[0])
        {
                com_modified = true;
+               strcpy(com_modname, gamedirname);
                COM_AddGameDirectory (va("%s/%s", com_basedir, gamedirname));
        }
 
@@ -1440,6 +1441,7 @@ void COM_InitFilesystem (void)
        if (i && i < com_argc-1)
        {
                com_modified = true;
+               strcpy(com_modname, com_argv[i+1]);
                COM_AddGameDirectory (va("%s/%s", com_basedir, com_argv[i+1]));
        }