summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2008-09-07 20:33:36 +0000
committerSimon Howard2008-09-07 20:33:36 +0000
commitcf7b4fab6313cd2162cb0bd3f28596fbdc2fffd3 (patch)
tree3af7945fdf4a94387fe8cac9c2e4db589cbc88c3
parent20ea83f058cb0ad8463ee6304df974b4ec55404a (diff)
downloadchocolate-doom-cf7b4fab6313cd2162cb0bd3f28596fbdc2fffd3.tar.gz
chocolate-doom-cf7b4fab6313cd2162cb0bd3f28596fbdc2fffd3.tar.bz2
chocolate-doom-cf7b4fab6313cd2162cb0bd3f28596fbdc2fffd3.zip
Move m_bbox.[ch], f_wipe.[ch] to doom/
Subversion-branch: /branches/raven-branch Subversion-revision: 1209
-rw-r--r--src/Makefile.am2
-rw-r--r--src/doom/Makefile.am2
-rw-r--r--src/doom/f_wipe.c (renamed from src/f_wipe.c)0
-rw-r--r--src/doom/f_wipe.h (renamed from src/f_wipe.h)0
-rw-r--r--src/doom/m_bbox.c (renamed from src/m_bbox.c)0
-rw-r--r--src/doom/m_bbox.h (renamed from src/m_bbox.h)0
6 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index e0a17534..a91de106 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,6 @@ doomkeys.h \
doomfeatures.h \
doomtype.h \
d_ticcmd.h \
-f_wipe.c f_wipe.h \
i_main.c \
i_joystick.c i_joystick.h \
i_scale.c i_scale.h \
@@ -40,7 +39,6 @@ i_system.c i_system.h \
i_timer.c i_timer.h \
i_video.c i_video.h \
m_argv.c m_argv.h \
-m_bbox.c m_bbox.h \
m_cheat.c m_cheat.h \
m_config.c m_config.h \
m_fixed.c m_fixed.h \
diff --git a/src/doom/Makefile.am b/src/doom/Makefile.am
index dfba05a7..4d95266e 100644
--- a/src/doom/Makefile.am
+++ b/src/doom/Makefile.am
@@ -17,10 +17,12 @@ dstrings.c dstrings.h \
d_textur.h \
d_think.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 \
info.c info.h \
+m_bbox.c m_bbox.h \
m_menu.c m_menu.h \
p_ceilng.c \
p_doors.c \
diff --git a/src/f_wipe.c b/src/doom/f_wipe.c
index 2ab66848..2ab66848 100644
--- a/src/f_wipe.c
+++ b/src/doom/f_wipe.c
diff --git a/src/f_wipe.h b/src/doom/f_wipe.h
index 9045be3f..9045be3f 100644
--- a/src/f_wipe.h
+++ b/src/doom/f_wipe.h
diff --git a/src/m_bbox.c b/src/doom/m_bbox.c
index 02389209..02389209 100644
--- a/src/m_bbox.c
+++ b/src/doom/m_bbox.c
diff --git a/src/m_bbox.h b/src/doom/m_bbox.h
index 3788044b..3788044b 100644
--- a/src/m_bbox.h
+++ b/src/doom/m_bbox.h