]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - menu.c
fix bug with rtlights on vertex texture blend surfaces (such as in
[xonotic/darkplaces.git] / menu.c
diff --git a/menu.c b/menu.c
index 5ba0fe60fe70c50de504e6afa2a0951dc5619193..e13a43f490be568dea52facc62f6ef0abe76ac9b 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -2777,6 +2777,7 @@ video_resolution_t video_resolutions[] =
 {"WideScreen 16x9"           ,  683, 384, 683, 384, 1     },
 {"WideScreen 16x9"           ,  960, 540, 640, 360, 1     },
 {"WideScreen 16x9"           , 1280, 720, 640, 360, 1     },
+{"WideScreen 16x9"           , 1360, 768, 680, 384, 1     },
 {"WideScreen 16x9"           , 1366, 768, 683, 384, 1     },
 {"WideScreen 16x9"           , 1920,1080, 640, 360, 1     },
 {"WideScreen 16x9"           , 2560,1440, 640, 360, 1     },
@@ -4466,19 +4467,9 @@ void ModList_RebuildList(void)
 {
        int i,j;
        stringlist_t list;
-       int basedirlength; 
 
        stringlistinit(&list);
-       if (fs_basedir[0])
-       {
-               listdirectory(&list, fs_basedir);
-               basedirlength = strlen( fs_basedir );
-       }
-       else
-       {
-               listdirectory(&list, "./");
-               basedirlength = 2;
-       }
+       listdirectory(&list, fs_basedir, "");
        stringlistsort(&list);
        modlist_count = 0;
        modlist_numenabled = fs_numgamedirs;
@@ -4493,7 +4484,7 @@ void ModList_RebuildList(void)
                if (FS_CheckNastyPath (list.strings[i], true)) continue;
                if (!FS_CheckGameDir(list.strings[i])) continue;
 
-               strlcpy (modlist[modlist_count].dir, list.strings[i] + basedirlength, sizeof(modlist[modlist_count].dir));
+               strlcpy (modlist[modlist_count].dir, list.strings[i], sizeof(modlist[modlist_count].dir));
                //check currently loaded mods
                modlist[modlist_count].loaded = false;
                if (fs_numgamedirs)