fixed bug with effectinfo.txt loading so that it now loads the proper

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 76be67dc85efa1c15c02918524191c2ea9f8a60e..4121ae391cb2662a5cc83bb0dd4e9de738e6c416 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -925,7 +925,6 @@ void SCR_ScreenShot_f (void)
        static char old_prefix_name[MAX_QPATH];
        char prefix_name[MAX_QPATH];
        char filename[MAX_QPATH];
-       char mapname[MAX_QPATH];
        unsigned char *buffer1;
        unsigned char *buffer2;
        qboolean jpeg = (scr_screenshot_jpeg.integer != 0);
@@ -960,15 +959,10 @@ void SCR_ScreenShot_f (void)
        else
        {
                // TODO maybe make capturevideo and screenshot use similar name patterns?
-               if (scr_screenshot_name_in_mapdir.integer && cl.worldmodel && *cl.worldmodel->name) {
-                       // figure out the map's filename without path or extension
-                       strlcpy(mapname, FS_FileWithoutPath(cl.worldmodel->name), sizeof(mapname));
-                       if (strrchr(mapname, '.'))
-                               *(strrchr(mapname, '.')) = 0;
-                       dpsnprintf (prefix_name, sizeof(prefix_name), "%s/%s", mapname, Sys_TimeString(scr_screenshot_name.string));
-               } else {
+               if (scr_screenshot_name_in_mapdir.integer && cl.worldbasename[0])
+                       dpsnprintf (prefix_name, sizeof(prefix_name), "%s/%s", cl.worldbasename, Sys_TimeString(scr_screenshot_name.string));
+               else
                        dpsnprintf (prefix_name, sizeof(prefix_name), "%s", Sys_TimeString(scr_screenshot_name.string));
-               }
 
                if (strcmp(old_prefix_name, prefix_name))
                {