moved scr_screenshot_name declaration from cl_screen.c to fs.c because fs.c depends...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5723 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_screen.c b/cl_screen.c
index 90b8f25d6793be98faeb2361a0636cab5c4372d7..917ddab5ba758f0f74a258610a209a75d316c18a 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -22,7 +22,7 @@ cvar_t vid_pixelaspect = {CVAR_SAVE, "vid_pixelaspect", "1"};
 cvar_t scr_screenshot_jpeg = {CVAR_SAVE, "scr_screenshot_jpeg","1"};
 cvar_t scr_screenshot_jpeg_quality = {CVAR_SAVE, "scr_screenshot_jpeg_quality","0.9"};
 cvar_t scr_screenshot_gamma = {CVAR_SAVE, "scr_screenshot_gamma","2.2"};
-cvar_t scr_screenshot_name = {0, "scr_screenshot_name","dp"};
+// scr_screenshot_name is defined in fs.c
 cvar_t cl_capturevideo = {0, "cl_capturevideo", "0"};
 cvar_t cl_capturevideo_sound = {0, "cl_capturevideo_sound", "0"};
 cvar_t cl_capturevideo_fps = {0, "cl_capturevideo_fps", "30"};

diff --git a/fs.c b/fs.c
index 1ff670a0586adcaea7e1265be3242c6afeba30dd..fcd5b7d02916dd79567a0f7c890c554af6dc9793 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -279,6 +279,8 @@ char fs_basedir[MAX_OSPATH];
 
 qboolean fs_modified;   // set true if using non-id files
 
+cvar_t scr_screenshot_name = {0, "scr_screenshot_name","dp"};
+
 
 /*
 =============================================================================