X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fmain-cap.c;h=a25025585612173c637f925269c152d7bf20d008;hb=refs%2Fheads%2Fmaster;hp=d6b62e05bb20f10c66af9174294998122d77de19;hpb=1685e8a54b914a74e9c80c1d6c680a6491f0728b;p=hengband%2Fhengband.git

diff --git a/src/main-cap.c b/src/main-cap.c
index d6b62e05b..ab2670675 100644
--- a/src/main-cap.c
+++ b/src/main-cap.c
@@ -2,8 +2,8 @@
 
 /* Purpose: Support for "term.c" using "termcap" calls */
 
-#include "angband.h"
-
+#include "system/angband.h"
+#include "io/exit-panic.h"
 
 #ifdef USE_CAP
 
@@ -41,21 +41,15 @@
  * Mega-Hack -- try to guess when "POSIX" is available.
  * If the user defines two of these, we will probably crash.
  */
-#if !defined(USE_TPOSIX)
-# if !defined(USE_TERMIO) && !defined(USE_TCHARS)
 #  if defined(_POSIX_VERSION)
 #   define USE_TPOSIX
 #  else
-#   if defined(USG) || defined(linux) || defined(SOLARIS)
+#   if defined(linux)
 #    define USE_TERMIO
 #   else
 #    define USE_TCHARS
 #   endif
 #  endif
-# endif
-#endif
-
-
 
 /*
  * POSIX stuff
@@ -323,21 +317,9 @@ static void do_move(int x1, int y1, int x2, int y2)
 		if ((y2 <= 0) && ho) tp(ho);
 		else if ((y2 >= rows-1) && ll) tp(ll);
 		else if ((y2 == y1) && cr) tp(cr);
-#if 0
-		else if ((y2 == y1+1) && cr && dn)
-		{ tp(cr); tp(dn); }
-		else if ((y2 == y1-1) && cr && up)
-		{ tp(cr); tp(up); }
-#endif
 		else do_cm(x2, y2);
 	}
 
-#if 0
-	/* Up/Down one line */
-	else if ((x2 == x1) && (y2 == y1+1) && dn) tp(dn);
-	else if ((x2 == x1) && (y2 == y1-1) && up) tp(up);
-#endif
-
 	/* Default -- go directly there */
 	else do_cm(x2, y2);
 }
@@ -652,18 +634,6 @@ static void keymap_game_prepare(void)
 	game_termio.c_cc[VEOF] = (char)-1;
 	game_termio.c_cc[VEOL] = (char)-1;
 
-#if 0
-	/* Disable the non-posix control characters */
-	game_termio.c_cc[VEOL2] = (char)-1;
-	game_termio.c_cc[VSWTCH] = (char)-1;
-	game_termio.c_cc[VDSUSP] = (char)-1;
-	game_termio.c_cc[VREPRINT] = (char)-1;
-	game_termio.c_cc[VDISCARD] = (char)-1;
-	game_termio.c_cc[VWERASE] = (char)-1;
-	game_termio.c_cc[VLNEXT] = (char)-1;
-	game_termio.c_cc[VSTATUS] = (char)-1;
-#endif
-
 	/* Normally, block until a character is read */
 	game_termio.c_cc[VMIN] = 1;
 	game_termio.c_cc[VTIME] = 0;