summaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
authorSimon Howard2010-11-24 22:43:37 +0000
committerSimon Howard2010-11-24 22:43:37 +0000
commit288d322c0b679675a80c0fc763b1063613c77ce5 (patch)
tree020ec93e9f2a79cc3c10d5c261cc1d59f85221b2 /setup
parentcf82ce9d7bb8d71ae583753aab642c5ba4ee8d06 (diff)
downloadchocolate-doom-288d322c0b679675a80c0fc763b1063613c77ce5.tar.gz
chocolate-doom-288d322c0b679675a80c0fc763b1063613c77ce5.tar.bz2
chocolate-doom-288d322c0b679675a80c0fc763b1063613c77ce5.zip
Add configuration file parameter and command line option to specify the
screen pixel depth. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2166
Diffstat (limited to 'setup')
-rw-r--r--setup/configfile.c1
-rw-r--r--setup/display.c1
-rw-r--r--setup/display.h1
3 files changed, 3 insertions, 0 deletions
diff --git a/setup/configfile.c b/setup/configfile.c
index 2a3cb845..885bbd8f 100644
--- a/setup/configfile.c
+++ b/setup/configfile.c
@@ -265,6 +265,7 @@ static default_t extra_defaults_list[] =
{"startup_delay", &startup_delay, DEFAULT_INT, 0, 0},
{"screen_width", &screen_width, DEFAULT_INT, 0, 0},
{"screen_height", &screen_height, DEFAULT_INT, 0, 0},
+ {"screen_bpp", &screen_bpp, DEFAULT_INT, 0, 0},
{"grabmouse", &grabmouse, DEFAULT_INT, 0, 0},
{"novert", &novert, DEFAULT_INT, 0, 0},
{"mouse_acceleration", &mouse_acceleration, DEFAULT_FLOAT, 0, 0},
diff --git a/setup/display.c b/setup/display.c
index 596b8a43..f9e2f712 100644
--- a/setup/display.c
+++ b/setup/display.c
@@ -75,6 +75,7 @@ int aspect_ratio_correct = 1;
int fullscreen = 1;
int screen_width = 320;
int screen_height = 200;
+int screen_bpp = 8;
int startup_delay = 1000;
int show_endoom = 1;
diff --git a/setup/display.h b/setup/display.h
index f0c76184..2419e807 100644
--- a/setup/display.h
+++ b/setup/display.h
@@ -26,6 +26,7 @@ extern int autoadjust_video_settings;
extern int aspect_ratio_correct;
extern int fullscreen;
extern int screen_width, screen_height;
+extern int screen_bpp;
extern int startup_delay;
extern int show_endoom;
extern char *video_driver;