commit efd15d965dee947a04727bb62f4e2092cf28732f
Merge: 4d17ab36 11024d82
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Sep 11 23:40:44 2011 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sun Sep 11 23:40:44 2011 +0000
Merge from raven-branch.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2367
BUGS | 13 -
COPYING | 41 +-
ChangeLog | 255 ++++
HACKING | 2 +
INSTALL | 173 ---
Makefile.am | 31 +-
NEWS | 76 +-
NOT-BUGS | 40 +-
README | 11 +-
README.OPL | 2 +
TODO | 2 +
autogen.sh | 16 +-
codeblocks/config.h | 9 +-
codeblocks/game-res.rc | 10 +-
codeblocks/setup-res.rc | 8 +-
configure.in | 8 +-
data/.gitignore | 4 +
data/Makefile.am | 21 +
data/README | 4 +
man/INSTALL.template | 253 ++++
man/Makefile.am | 11 +-
man/simplecpp | 211 +++
msvc/config.h | 9 +-
msvc/win32.rc | 10 +-
opl/opl_win32.c | 31 +-
pkg/Makefile.am | 3 +
pkg/config.make.in | 2 -
pkg/osx/AppController.m | 8 +
pkg/osx/Execute.h | 1 +
pkg/osx/Execute.m | 23 +
pkg/osx/GNUmakefile | 34 +-
pkg/osx/IWADController.h | 1 +
pkg/osx/IWADController.m | 39 +
pkg/osx/LauncherManager.h | 7 +
pkg/osx/LauncherManager.m | 30 +
pkg/osx/Resources/launcher.nib/designable.nib | 1794 ++++++++++++++++-------
pkg/osx/Resources/launcher.nib/keyedobjects.nib | Bin 24936 -> 30957 bytes
pkg/osx/disk/background.png | Bin 0 -> 42578 bytes
pkg/osx/disk/dir.DS_Store | Bin 0 -> 8196 bytes
pkg/osx/dmgfix | 64 +
pkg/win32/GNUmakefile | 4 +
rpm.spec.in | 51 +-
src/Makefile.am | 22 +-
src/d_iwad.c | 46 +-
src/d_iwad.h | 1 +
src/d_mode.h | 1 +
src/deh_io.c | 2 +-
src/doom-screensaver.desktop.in | 12 +-
src/doom.desktop.in | 7 +
src/doom/d_main.c | 97 +-
src/doom/d_net.c | 3 +-
src/doom/doom.desktop.in | 7 +
src/doom/doomstat.c | 2 +-
src/doom/g_game.c | 7 +
src/doom/m_menu.c | 1 +
src/doom/p_map.c | 59 +-
src/doom/p_setup.c | 27 +-
src/doom/st_stuff.c | 9 +-
src/heretic/d_main.c | 30 +-
src/heretic/doomdef.h | 4 +-
src/heretic/g_game.c | 46 +-
src/heretic/mn_menu.c | 31 +-
src/hexen/h2_main.c | 13 +-
src/i_endoom.c | 2 +-
src/i_oplmusic.c | 9 +-
src/i_scale.c | 16 +
src/i_system.c | 151 +-
src/i_system.h | 2 +
src/i_video.c | 2 +-
src/m_config.c | 37 +
src/m_config.h | 1 +
src/m_misc.c | 25 +-
src/net_server.c | 1 +
src/setup/Makefile.am | 6 +
src/setup/display.c | 222 ++-
src/setup/joystick.c | 3 +
src/setup/setup-manifest.xml.in | 25 +-
src/setup/setup.desktop.in | 7 +
src/setup/sound.c | 2 +-
src/setup/txt_joybinput.c | 21 +-
src/setup/txt_joybinput.h | 1 +
src/setup/txt_keyinput.c | 21 +-
src/setup/txt_keyinput.h | 1 +
src/setup/txt_mouseinput.c | 20 +-
src/setup/txt_mouseinput.h | 1 +
textscreen/txt_button.c | 8 +-
textscreen/txt_checkbox.c | 8 +-
textscreen/txt_desktop.c | 10 +
textscreen/txt_desktop.h | 9 +
textscreen/txt_dropdown.c | 27 +-
textscreen/txt_gui.c | 4 +-
textscreen/txt_gui.h | 4 +
textscreen/txt_inputbox.c | 8 +-
textscreen/txt_label.c | 2 +-
textscreen/txt_main.h | 24 +-
textscreen/txt_radiobutton.c | 8 +-
textscreen/txt_scrollpane.c | 40 +-
textscreen/txt_sdl.c | 86 +-
textscreen/txt_separator.c | 26 +-
textscreen/txt_separator.h | 10 +-
textscreen/txt_spinctrl.c | 10 +-
textscreen/txt_table.c | 7 +
textscreen/txt_widget.c | 62 +
textscreen/txt_widget.h | 34 +-
textscreen/txt_window.c | 15 +-
textscreen/txt_window_action.c | 19 +-
106 files changed, 3567 insertions(+), 1169 deletions(-)
diff --cc configure.in
index ebbdfbde,4bb95a47..325a707e
--- a/configure.in
+++ b/configure.in
@@@ -162,8 -164,8 +165,9 @@@ src/hexen/Makefil
src/resource.rc
src/setup-res.rc
src/setup/Makefile
+ src/setup/setup.desktop
src/setup/setup-manifest.xml
+src/strife/Makefile
textscreen/Makefile
textscreen/examples/Makefile
wince/Makefile
diff --cc src/setup/display.c
index df264749,72f3c057..d9b34ccc
--- a/src/setup/display.c
+++ b/src/setup/display.c
@@@ -579,6 -590,60 +590,60 @@@ static void UpdateVideoDriver(TXT_UNCAS
#endif
+ static void AdvancedDisplayConfig(TXT_UNCAST_ARG(widget),
+ TXT_UNCAST_ARG(modes_table))
+ {
+ TXT_CAST_ARG(txt_table_t, modes_table);
+ txt_window_t *window;
+ txt_checkbox_t *ar_checkbox;
+
+ window = TXT_NewWindow("Advanced display options");
+
+ TXT_SetColumnWidths(window, 35);
+
+ TXT_AddWidgets(window,
+ ar_checkbox = TXT_NewCheckBox("Fix aspect ratio",
+ &aspect_ratio_correct),
+ NULL);
+
+ if (gamemission == heretic || gamemission == hexen)
+ {
+ TXT_AddWidget(window,
+ TXT_NewCheckBox("Graphical startup", &graphical_startup));
+ }
+
- if (gamemission == doom || gamemission == heretic)
++ if (gamemission == doom || gamemission == heretic || gamemission == strife)
+ {
+ TXT_AddWidget(window,
+ TXT_NewCheckBox("Show ENDOOM screen on exit",
+ &show_endoom));
+ }
+
+ TXT_SignalConnect(ar_checkbox, "changed", GenerateModesTable, modes_table);
+
+ // On Windows, there is an extra control to change between
+ // the Windows GDI and DirectX video drivers.
+
+ #if defined(_WIN32) && !defined(_WIN32_WCE)
+ {
+ txt_radiobutton_t *dx_button, *gdi_button;
+
+ TXT_AddWidgets(window,
+ TXT_NewSeparator("Windows video driver"),
+ dx_button = TXT_NewRadioButton("DirectX",
+ &use_directx, 1),
+ gdi_button = TXT_NewRadioButton("Windows GDI",
+ &use_directx, 0),
+ NULL);
+
+ TXT_SignalConnect(dx_button, "selected",
+ UpdateVideoDriver, modes_table);
+ TXT_SignalConnect(gdi_button, "selected",
+ UpdateVideoDriver, modes_table);
+ SetWin32VideoDriver();
+ }
+ #endif
+ }
void ConfigDisplay(void)
{