Move setup/ into src/ and merge with main codebase. Remove duplicated

code. Split out I_Endoom to separate i_endoom.c file.

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

1 files changed, 0 insertions, 46 deletions

diff --git a/setup/txt_joybinput.h b/setup/txt_joybinput.h
deleted file mode 100644
index b2920b88..00000000
--- a/setup/txt_joybinput.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Emacs style mode select   -*- C++ -*- 
-//-----------------------------------------------------------------------------
-//
-// Copyright(C) 2007 Simon Howard
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
-//
-
-#ifndef TXT_JOYB_INPUT_H
-#define TXT_JOYB_INPUT_H
-
-typedef struct txt_joystick_input_s txt_joystick_input_t;
-
-#include "txt_widget.h"
-#include "txt_window.h"
-
-//
-// A joystick input is like an input box.  When selected, a box pops up
-// allowing a joystick button to be pressed to select it.
-//
-
-struct txt_joystick_input_s
-{
-    txt_widget_t widget;
-    int *variable;
-    txt_window_t *prompt_window;
-};
-
-txt_joystick_input_t *TXT_NewJoystickInput(int *variable);
-
-#endif /* #ifndef TXT_JOYB_INPUT_H */
-
-