commit b80409202d07732ec201c9816887262b505b81d4
Merge: 66e8dc63 8f6edc1f
Author: James Haley <haleyjd@hotmail.com>
AuthorDate: Tue Jan 26 00:59:02 2010 +0000
Commit: James Haley <haleyjd@hotmail.com>
CommitDate: Tue Jan 26 00:59:02 2010 +0000
Merge from raven-branch
Subversion-branch: /branches/strife-branch
Subversion-revision: 1825
Makefile.am | 1 +
acinclude.m4 | 36 +++++++
configure.in | 57 ++++++++----
msvc/doom.vcproj | 10 +-
msvc/heretic.vcproj | 6 +-
msvc/hexen.vcproj | 2 +
msvc/server.vcproj | 10 +-
msvc/setup.vcproj | 10 +-
pcsound/pcsound.c | 2 +-
pcsound/pcsound_sdl.c | 18 ++--
pkg/Makefile.am | 3 +
pkg/win32/GNUmakefile.am | 37 ++++++++
pkg/win32/README | 4 +
pkg/wince/{Makefile.am => GNUmakefile.am} | 0
src/d_iwad.c | 2 +-
src/d_iwad.h | 2 +-
src/deh_str.c | 4 +-
src/doom/d_main.c | 4 +-
src/doom/d_net.h | 2 +-
src/doom/deh_defs.h | 2 +-
src/doom/deh_main.c | 4 +-
src/doom/deh_ptr.c | 2 +-
src/doom/p_doors.c | 37 +++++++-
src/doom/p_map.c | 3 +-
src/doom/p_spec.c | 150 +++++++++++++++++++++++++++---
src/doomtype.h | 4 +-
src/heretic/am_data.h | 12 +--
src/heretic/am_map.c | 2 +-
src/heretic/doomdef.h | 122 ++++++++++++------------
src/heretic/p_enemy.c | 8 +-
src/heretic/p_mobj.c | 6 +-
src/heretic/p_pspr.c | 12 +--
src/heretic/r_data.c | 20 +++-
src/hexen/am_data.h | 141 ++++++++++++++--------------
src/hexen/m_random.h | 84 ++++++++---------
src/hexen/p_mobj.c | 4 +-
src/hexen/r_data.c | 20 +++-
src/i_cdmus.c | 2 +
src/i_joystick.c | 2 +-
src/i_main.c | 6 +-
src/i_pcsound.c | 18 ++--
src/i_sdlmusic.c | 74 ++++++++-------
src/i_sdlsound.c | 49 +++++++---
src/i_sound.c | 38 +++++---
src/i_system.h | 1 +
src/i_timer.c | 2 +-
src/i_timer.h | 2 +-
src/i_video.c | 102 ++++++++++++--------
src/m_config.c | 9 +-
src/m_misc.c | 8 ++
src/m_misc.h | 1 +
src/net_client.c | 4 +-
src/net_common.c | 4 +-
src/net_defs.h | 4 +-
src/net_gui.c | 2 +-
src/net_loop.c | 4 +-
src/net_sdl.c | 2 +-
src/net_server.c | 14 +--
src/net_server.h | 2 +-
src/setup/Makefile.am | 4 +-
src/setup/execute.c | 123 ++++++++++++++----------
src/setup/joystick.c | 2 +-
src/setup/mainmenu.c | 9 +-
src/setup/mode.c | 12 ++-
src/setup/multiplayer.c | 2 +-
src/setup/setup-manifest.xml.in | 2 +-
src/setup/sound.c | 29 ++++--
src/w_merge.c | 2 +-
textscreen/txt_desktop.c | 4 +-
textscreen/txt_dropdown.c | 2 +-
textscreen/txt_gui.c | 9 +-
textscreen/txt_gui.h | 6 +-
textscreen/txt_inputbox.c | 2 +-
textscreen/txt_io.c | 6 +-
textscreen/txt_io.h | 2 +-
textscreen/txt_main.h | 2 +-
textscreen/txt_scrollpane.c | 76 ++++++++++++++-
textscreen/txt_sdl.c | 49 ++++++++--
textscreen/txt_table.c | 82 ++++++++++++++++
textscreen/txt_table.h | 13 +++
textscreen/txt_widget.c | 4 +-
textscreen/txt_widget.h | 4 +-
textscreen/txt_window_action.c | 2 +-
textscreen/txt_window_action.h | 2 +-
wince/Makefile.am | 2 +-
wince/dummy.c | 8 ++
86 files changed, 1150 insertions(+), 503 deletions(-)