Move doom-specific files to a separate directory.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1201

89 files changed, 11 insertions, 58 deletions

diff --git a/configure.in b/configure.in
index e6e12be4..5c008ba1 100644
--- a/configure.in
+++ b/configure.in
@@ -79,6 +79,7 @@ textscreen/examples/Makefile
 setup/Makefile
 man/Makefile
 src/Makefile
+src/doom/Makefile
 src/heretic/Makefile
 src/hexen/Makefile
 pcsound/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 6a85b92a..90e5dedb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,11 @@
 
-SUBDIRS=heretic hexen
+SUBDIRS=doom heretic hexen
 
 gamesdir = $(prefix)/games
 
 games_PROGRAMS = chocolate-doom chocolate-server
 
-AM_CFLAGS = -I../textscreen -I../pcsound @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+AM_CFLAGS = -Idoom -I../textscreen -I../pcsound @SDL_CFLAGS@ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
 
 DEDSERV_FILES=\
 d_dedicated.c                              \
@@ -26,31 +26,13 @@ chocolate_server_SOURCES=$(DEDSERV_FILES)
 chocolate_server_LDADD = @LDFLAGS@ @SDL_LIBS@ @SDLNET_LIBS@ 
 
 MAIN_SOURCE_FILES=\
-am_map.c             am_map.h              \
-d_englsh.h                                 \
-d_event.h                                  \
-d_items.c            d_items.h             \
-d_iwad.c             d_iwad.h              \
-d_main.c             d_main.h              \
-d_net.c              d_net.h               \
-doomdata.h                                 \
-doomdef.c            doomdef.h             \
+                     d_event.h             \
 doomkeys.h                                 \
 doomfeatures.h                             \
-doomstat.c           doomstat.h            \
 doomtype.h                                 \
-d_player.h                                 \
-dstrings.c           dstrings.h            \
-d_textur.h                                 \
-d_think.h                                  \
 d_ticcmd.h                                 \
-f_finale.c           f_finale.h            \
 f_wipe.c             f_wipe.h              \
-g_game.c             g_game.h              \
-hu_lib.c             hu_lib.h              \
-hu_stuff.c           hu_stuff.h            \
 i_main.c                                   \
-info.c               info.h                \
 i_joystick.c         i_joystick.h          \
 i_scale.c            i_scale.h             \
                      i_swap.h              \
@@ -62,49 +44,13 @@ m_bbox.c             m_bbox.h              \
 m_cheat.c            m_cheat.h             \
 m_config.c           m_config.h            \
 m_fixed.c            m_fixed.h             \
-m_menu.c             m_menu.h              \
 m_misc.c             m_misc.h              \
 md5.c                md5.h                 \
 memio.c              memio.h               \
 m_random.c           m_random.h            \
-p_ceilng.c                                 \
-p_doors.c                                  \
-p_enemy.c                                  \
-p_floor.c                                  \
-p_inter.c            p_inter.h             \
-p_lights.c                                 \
-p_local.h                                  \
-p_map.c                                    \
-p_maputl.c                                 \
-p_mobj.c             p_mobj.h              \
-p_plats.c                                  \
-p_pspr.c             p_pspr.h              \
-p_saveg.c            p_saveg.h             \
-p_setup.c            p_setup.h             \
-p_sight.c                                  \
-p_spec.c             p_spec.h              \
-p_switch.c                                 \
-p_telept.c                                 \
-p_tick.c             p_tick.h              \
-p_user.c                                   \
-r_bsp.c              r_bsp.h               \
-r_data.c             r_data.h              \
-r_defs.h                                   \
-r_draw.c             r_draw.h              \
-r_local.h                                  \
-r_main.c             r_main.h              \
-r_plane.c            r_plane.h             \
-r_segs.c             r_segs.h              \
-r_sky.c              r_sky.h               \
-r_state.h                                  \
-r_things.c           r_things.h            \
-sounds.c             sounds.h              \
 s_sound.c            s_sound.h             \
-st_lib.c             st_lib.h              \
-st_stuff.c           st_stuff.h            \
 tables.c             tables.h              \
 v_video.c            v_video.h             \
-wi_stuff.c           wi_stuff.h            \
 w_checksum.c         w_checksum.h          \
 w_wad.c              w_wad.h               \
 w_file.c             w_file.h              \
@@ -171,7 +117,13 @@ else
 chocolate_doom_SOURCES=$(SOURCE_FILES)
 endif
 
-chocolate_doom_LDADD = ../textscreen/libtextscreen.a ../pcsound/libpcsound.a @LDFLAGS@ @SDL_LIBS@ @SDLMIXER_LIBS@ @SDLNET_LIBS@ 
+chocolate_doom_LDADD = doom/libdoom.a                  \
+                       ../textscreen/libtextscreen.a   \
+		       ../pcsound/libpcsound.a         \
+		       @LDFLAGS@                       \
+		       @SDL_LIBS@                      \
+		       @SDLMIXER_LIBS@                 \
+		       @SDLNET_LIBS@ 
 
 EXTRA_DIST =                        \
         icon.c                      \
diff --git a/src/am_map.c b/src/doom/am_map.c
index 5fbe748a..5fbe748a 100644
--- a/src/am_map.c
+++ b/src/doom/am_map.c
diff --git a/src/am_map.h b/src/doom/am_map.h
index af390d1b..af390d1b 100644
--- a/src/am_map.h
+++ b/src/doom/am_map.h
diff --git a/src/d_englsh.h b/src/doom/d_englsh.h
index de8ff7f0..de8ff7f0 100644
--- a/src/d_englsh.h
+++ b/src/doom/d_englsh.h
diff --git a/src/d_items.c b/src/doom/d_items.c
index 8f12be9f..8f12be9f 100644
--- a/src/d_items.c
+++ b/src/doom/d_items.c
diff --git a/src/d_items.h b/src/doom/d_items.h
index ffc34582..ffc34582 100644
--- a/src/d_items.h
+++ b/src/doom/d_items.h
diff --git a/src/d_iwad.c b/src/doom/d_iwad.c
index 032679e6..032679e6 100644
--- a/src/d_iwad.c
+++ b/src/doom/d_iwad.c
diff --git a/src/d_iwad.h b/src/doom/d_iwad.h
index 281d3467..281d3467 100644
--- a/src/d_iwad.h
+++ b/src/doom/d_iwad.h
diff --git a/src/d_main.c b/src/doom/d_main.c
index 2ab329bf..2ab329bf 100644
--- a/src/d_main.c
+++ b/src/doom/d_main.c
diff --git a/src/d_main.h b/src/doom/d_main.h
index 14536447..14536447 100644
--- a/src/d_main.h
+++ b/src/doom/d_main.h
diff --git a/src/d_net.c b/src/doom/d_net.c
index 4e87a813..4e87a813 100644
--- a/src/d_net.c
+++ b/src/doom/d_net.c
diff --git a/src/d_net.h b/src/doom/d_net.h
index df3d2d4b..df3d2d4b 100644
--- a/src/d_net.h
+++ b/src/doom/d_net.h
diff --git a/src/d_player.h b/src/doom/d_player.h
index 46b9b6c0..46b9b6c0 100644
--- a/src/d_player.h
+++ b/src/doom/d_player.h
diff --git a/src/d_textur.h b/src/doom/d_textur.h
index 084a5b1b..084a5b1b 100644
--- a/src/d_textur.h
+++ b/src/doom/d_textur.h
diff --git a/src/d_think.h b/src/doom/d_think.h
index 1405230d..1405230d 100644
--- a/src/d_think.h
+++ b/src/doom/d_think.h
diff --git a/src/doomdata.h b/src/doom/doomdata.h
index 66733aea..66733aea 100644
--- a/src/doomdata.h
+++ b/src/doom/doomdata.h
diff --git a/src/doomdef.c b/src/doom/doomdef.c
index 1ad48525..1ad48525 100644
--- a/src/doomdef.c
+++ b/src/doom/doomdef.c
diff --git a/src/doomdef.h b/src/doom/doomdef.h
index 52964242..52964242 100644
--- a/src/doomdef.h
+++ b/src/doom/doomdef.h
diff --git a/src/doomstat.c b/src/doom/doomstat.c
index 22804459..22804459 100644
--- a/src/doomstat.c
+++ b/src/doom/doomstat.c
diff --git a/src/doomstat.h b/src/doom/doomstat.h
index 4fc174cd..4fc174cd 100644
--- a/src/doomstat.h
+++ b/src/doom/doomstat.h
diff --git a/src/dstrings.c b/src/doom/dstrings.c
index 01a438ae..01a438ae 100644
--- a/src/dstrings.c
+++ b/src/doom/dstrings.c
diff --git a/src/dstrings.h b/src/doom/dstrings.h
index bdc6b2ce..bdc6b2ce 100644
--- a/src/dstrings.h
+++ b/src/doom/dstrings.h
diff --git a/src/f_finale.c b/src/doom/f_finale.c
index 1a3a85ca..1a3a85ca 100644
--- a/src/f_finale.c
+++ b/src/doom/f_finale.c
diff --git a/src/f_finale.h b/src/doom/f_finale.h
index 69e1732f..69e1732f 100644
--- a/src/f_finale.h
+++ b/src/doom/f_finale.h
diff --git a/src/g_game.c b/src/doom/g_game.c
index 44e77a74..44e77a74 100644
--- a/src/g_game.c
+++ b/src/doom/g_game.c
diff --git a/src/g_game.h b/src/doom/g_game.h
index 65fb06b0..65fb06b0 100644
--- a/src/g_game.h
+++ b/src/doom/g_game.h
diff --git a/src/hu_lib.c b/src/doom/hu_lib.c
index a6b00f3f..a6b00f3f 100644
--- a/src/hu_lib.c
+++ b/src/doom/hu_lib.c
diff --git a/src/hu_lib.h b/src/doom/hu_lib.h
index 21b6f8c5..21b6f8c5 100644
--- a/src/hu_lib.h
+++ b/src/doom/hu_lib.h
diff --git a/src/hu_stuff.c b/src/doom/hu_stuff.c
index 886236ba..886236ba 100644
--- a/src/hu_stuff.c
+++ b/src/doom/hu_stuff.c
diff --git a/src/hu_stuff.h b/src/doom/hu_stuff.h
index 310201f6..310201f6 100644
--- a/src/hu_stuff.h
+++ b/src/doom/hu_stuff.h
diff --git a/src/info.c b/src/doom/info.c
index c21a4a4c..c21a4a4c 100644
--- a/src/info.c
+++ b/src/doom/info.c
diff --git a/src/info.h b/src/doom/info.h
index f94af13f..f94af13f 100644
--- a/src/info.h
+++ b/src/doom/info.h
diff --git a/src/m_menu.c b/src/doom/m_menu.c
index aab2afce..aab2afce 100644
--- a/src/m_menu.c
+++ b/src/doom/m_menu.c
diff --git a/src/m_menu.h b/src/doom/m_menu.h
index c06fe981..c06fe981 100644
--- a/src/m_menu.h
+++ b/src/doom/m_menu.h
diff --git a/src/p_ceilng.c b/src/doom/p_ceilng.c
index 58b9eb06..58b9eb06 100644
--- a/src/p_ceilng.c
+++ b/src/doom/p_ceilng.c
diff --git a/src/p_doors.c b/src/doom/p_doors.c
index b681a8d0..b681a8d0 100644
--- a/src/p_doors.c
+++ b/src/doom/p_doors.c
diff --git a/src/p_enemy.c b/src/doom/p_enemy.c
index 4729dbc5..4729dbc5 100644
--- a/src/p_enemy.c
+++ b/src/doom/p_enemy.c
diff --git a/src/p_floor.c b/src/doom/p_floor.c
index edeb44a1..edeb44a1 100644
--- a/src/p_floor.c
+++ b/src/doom/p_floor.c
diff --git a/src/p_inter.c b/src/doom/p_inter.c
index dda55c37..dda55c37 100644
--- a/src/p_inter.c
+++ b/src/doom/p_inter.c
diff --git a/src/p_inter.h b/src/doom/p_inter.h
index 066e8573..066e8573 100644
--- a/src/p_inter.h
+++ b/src/doom/p_inter.h
diff --git a/src/p_lights.c b/src/doom/p_lights.c
index 5ea03903..5ea03903 100644
--- a/src/p_lights.c
+++ b/src/doom/p_lights.c
diff --git a/src/p_local.h b/src/doom/p_local.h
index 5ffefa3a..5ffefa3a 100644
--- a/src/p_local.h
+++ b/src/doom/p_local.h
diff --git a/src/p_map.c b/src/doom/p_map.c
index 42f2a60f..42f2a60f 100644
--- a/src/p_map.c
+++ b/src/doom/p_map.c
diff --git a/src/p_maputl.c b/src/doom/p_maputl.c
index 4ab5d1d5..4ab5d1d5 100644
--- a/src/p_maputl.c
+++ b/src/doom/p_maputl.c
diff --git a/src/p_mobj.c b/src/doom/p_mobj.c
index 15025139..15025139 100644
--- a/src/p_mobj.c
+++ b/src/doom/p_mobj.c
diff --git a/src/p_mobj.h b/src/doom/p_mobj.h
index 145b009b..145b009b 100644
--- a/src/p_mobj.h
+++ b/src/doom/p_mobj.h
diff --git a/src/p_plats.c b/src/doom/p_plats.c
index 03d1acbc..03d1acbc 100644
--- a/src/p_plats.c
+++ b/src/doom/p_plats.c
diff --git a/src/p_pspr.c b/src/doom/p_pspr.c
index fe32c53f..fe32c53f 100644
--- a/src/p_pspr.c
+++ b/src/doom/p_pspr.c
diff --git a/src/p_pspr.h b/src/doom/p_pspr.h
index 1ae7433b..1ae7433b 100644
--- a/src/p_pspr.h
+++ b/src/doom/p_pspr.h
diff --git a/src/p_saveg.c b/src/doom/p_saveg.c
index e557e494..e557e494 100644
--- a/src/p_saveg.c
+++ b/src/doom/p_saveg.c
diff --git a/src/p_saveg.h b/src/doom/p_saveg.h
index 3a96cc3e..3a96cc3e 100644
--- a/src/p_saveg.h
+++ b/src/doom/p_saveg.h
diff --git a/src/p_setup.c b/src/doom/p_setup.c
index 5cf7a628..5cf7a628 100644
--- a/src/p_setup.c
+++ b/src/doom/p_setup.c
diff --git a/src/p_setup.h b/src/doom/p_setup.h
index 2241c1c3..2241c1c3 100644
--- a/src/p_setup.h
+++ b/src/doom/p_setup.h
diff --git a/src/p_sight.c b/src/doom/p_sight.c
index e192567b..e192567b 100644
--- a/src/p_sight.c
+++ b/src/doom/p_sight.c
diff --git a/src/p_spec.c b/src/doom/p_spec.c
index 27042b5d..27042b5d 100644
--- a/src/p_spec.c
+++ b/src/doom/p_spec.c
diff --git a/src/p_spec.h b/src/doom/p_spec.h
index f5b57032..f5b57032 100644
--- a/src/p_spec.h
+++ b/src/doom/p_spec.h
diff --git a/src/p_switch.c b/src/doom/p_switch.c
index 28b59fae..28b59fae 100644
--- a/src/p_switch.c
+++ b/src/doom/p_switch.c
diff --git a/src/p_telept.c b/src/doom/p_telept.c
index abd307c5..abd307c5 100644
--- a/src/p_telept.c
+++ b/src/doom/p_telept.c
diff --git a/src/p_tick.c b/src/doom/p_tick.c
index 9429cf20..9429cf20 100644
--- a/src/p_tick.c
+++ b/src/doom/p_tick.c
diff --git a/src/p_tick.h b/src/doom/p_tick.h
index 06934bb8..06934bb8 100644
--- a/src/p_tick.h
+++ b/src/doom/p_tick.h
diff --git a/src/p_user.c b/src/doom/p_user.c
index 2ff7f818..2ff7f818 100644
--- a/src/p_user.c
+++ b/src/doom/p_user.c
diff --git a/src/r_bsp.c b/src/doom/r_bsp.c
index 47194d96..47194d96 100644
--- a/src/r_bsp.c
+++ b/src/doom/r_bsp.c
diff --git a/src/r_bsp.h b/src/doom/r_bsp.h
index 284f9cf6..284f9cf6 100644
--- a/src/r_bsp.h
+++ b/src/doom/r_bsp.h
diff --git a/src/r_data.c b/src/doom/r_data.c
index d03becd5..d03becd5 100644
--- a/src/r_data.c
+++ b/src/doom/r_data.c
diff --git a/src/r_data.h b/src/doom/r_data.h
index c987284c..c987284c 100644
--- a/src/r_data.h
+++ b/src/doom/r_data.h
diff --git a/src/r_defs.h b/src/doom/r_defs.h
index 4e0d85b7..4e0d85b7 100644
--- a/src/r_defs.h
+++ b/src/doom/r_defs.h
diff --git a/src/r_draw.c b/src/doom/r_draw.c
index 6813ea59..6813ea59 100644
--- a/src/r_draw.c
+++ b/src/doom/r_draw.c
diff --git a/src/r_draw.h b/src/doom/r_draw.h
index adaacd60..adaacd60 100644
--- a/src/r_draw.h
+++ b/src/doom/r_draw.h
diff --git a/src/r_local.h b/src/doom/r_local.h
index 8b97bdb0..8b97bdb0 100644
--- a/src/r_local.h
+++ b/src/doom/r_local.h
diff --git a/src/r_main.c b/src/doom/r_main.c
index e6a08691..e6a08691 100644
--- a/src/r_main.c
+++ b/src/doom/r_main.c
diff --git a/src/r_main.h b/src/doom/r_main.h
index edc5dbbb..edc5dbbb 100644
--- a/src/r_main.h
+++ b/src/doom/r_main.h
diff --git a/src/r_plane.c b/src/doom/r_plane.c
index 400821d5..400821d5 100644
--- a/src/r_plane.c
+++ b/src/doom/r_plane.c
diff --git a/src/r_plane.h b/src/doom/r_plane.h
index 2783443d..2783443d 100644
--- a/src/r_plane.h
+++ b/src/doom/r_plane.h
diff --git a/src/r_segs.c b/src/doom/r_segs.c
index 5150b694..5150b694 100644
--- a/src/r_segs.c
+++ b/src/doom/r_segs.c
diff --git a/src/r_segs.h b/src/doom/r_segs.h
index 197859ed..197859ed 100644
--- a/src/r_segs.h
+++ b/src/doom/r_segs.h
diff --git a/src/r_sky.c b/src/doom/r_sky.c
index 689dc113..689dc113 100644
--- a/src/r_sky.c
+++ b/src/doom/r_sky.c
diff --git a/src/r_sky.h b/src/doom/r_sky.h
index d436ce66..d436ce66 100644
--- a/src/r_sky.h
+++ b/src/doom/r_sky.h
diff --git a/src/r_state.h b/src/doom/r_state.h
index 535753c1..535753c1 100644
--- a/src/r_state.h
+++ b/src/doom/r_state.h
diff --git a/src/r_things.c b/src/doom/r_things.c
index 68f4b2fe..68f4b2fe 100644
--- a/src/r_things.c
+++ b/src/doom/r_things.c
diff --git a/src/r_things.h b/src/doom/r_things.h
index d0fce4e4..d0fce4e4 100644
--- a/src/r_things.h
+++ b/src/doom/r_things.h
diff --git a/src/sounds.c b/src/doom/sounds.c
index 6f315023..6f315023 100644
--- a/src/sounds.c
+++ b/src/doom/sounds.c
diff --git a/src/sounds.h b/src/doom/sounds.h
index 325d1d63..325d1d63 100644
--- a/src/sounds.h
+++ b/src/doom/sounds.h
diff --git a/src/st_lib.c b/src/doom/st_lib.c
index 11299a91..11299a91 100644
--- a/src/st_lib.c
+++ b/src/doom/st_lib.c
diff --git a/src/st_lib.h b/src/doom/st_lib.h
index bf9a6f87..bf9a6f87 100644
--- a/src/st_lib.h
+++ b/src/doom/st_lib.h
diff --git a/src/st_stuff.c b/src/doom/st_stuff.c
index f92d2dda..f92d2dda 100644
--- a/src/st_stuff.c
+++ b/src/doom/st_stuff.c
diff --git a/src/st_stuff.h b/src/doom/st_stuff.h
index c6b56fd6..c6b56fd6 100644
--- a/src/st_stuff.h
+++ b/src/doom/st_stuff.h
diff --git a/src/wi_stuff.c b/src/doom/wi_stuff.c
index 938d6915..938d6915 100644
--- a/src/wi_stuff.c
+++ b/src/doom/wi_stuff.c
diff --git a/src/wi_stuff.h b/src/doom/wi_stuff.h
index 7d3a84b9..7d3a84b9 100644
--- a/src/wi_stuff.h
+++ b/src/doom/wi_stuff.h