From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 13 Sep 2005 01:33:51 +0000 (+0000)
Subject: moved scr_screenshot_name declaration from cl_screen.c to fs.c because fs.c depends... 
X-Git-Tag: xonotic-v0.1.0preview~4558
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c802cf19ac7dd577687a30d000580e538311444;p=xonotic%2Fdarkplaces.git

moved scr_screenshot_name declaration from cl_screen.c to fs.c because fs.c depends on it and creates it


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 90b8f25d..917ddab5 100644
--- 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 1ff670a0..fcd5b7d0 100644
--- 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"};
+
 
 /*
 =============================================================================