Make REDO unconditional.

This commit is contained in:
Sean Hunt
2015-02-27 19:24:28 -05:00
committed by Pasi Kallinen
parent 11d11c5de3
commit f27d319e68
18 changed files with 7 additions and 95 deletions

View File

@@ -417,16 +417,13 @@ typedef unsigned char uchar;
#define WALLIFIED_MAZE /* Fancy mazes - Jean-Christophe Collet */
/* monsters & objects */
/* I/O */
#define REDO /* support for redoing last command - DGK */
#if !defined(MAC)
# if !defined(NOCLIPPING)
# define CLIPPING /* allow smaller screens -- ERS */
# endif
#endif
#ifdef REDO
# define DOAGAIN '\001' /* ^A, the "redo" key used in cmd.c and getline.c */
#endif
#define DOAGAIN '\001' /* ^A, the "redo" key used in cmd.c and getline.c */
#define EXP_ON_BOTL /* Show experience on bottom line */
/* #define SCORE_ON_BOTL */ /* added by Gary Erickson (erickson@ucivax) */

View File

@@ -39,9 +39,7 @@ E NEARDATA int warn_obj_cnt; /* count of monsters meeting criteria */
E int x_maze_max, y_maze_max;
E int otg_temp;
#ifdef REDO
E NEARDATA int in_doagain;
#endif
E struct dgn_topology { /* special dungeon levels for speed */
d_level d_oracle_level;

View File

@@ -182,11 +182,9 @@ E int NDECL(wiz_wish);
#endif /* USE_TRAMPOLI */
E void NDECL(reset_occupations);
E void FDECL(set_occupation, (int (*)(void),const char *,int));
#ifdef REDO
E char NDECL(pgetchar);
E void FDECL(pushch, (CHAR_P));
E void FDECL(savech, (CHAR_P));
#endif
E void NDECL(add_debug_extended_commands);
E void FDECL(reset_commands, (BOOLEAN_P));
E void FDECL(rhack, (char *));

View File

@@ -134,12 +134,6 @@ typedef char nhptext;
*/
#define LARGEST_INT 32767
#ifdef REDO
#define Getchar pgetchar
#endif
#include "coord.h"
/*
* Automatic inclusions for the subsidiary files.

View File

@@ -229,11 +229,6 @@ int _RTLENTRY _EXPFUNC read (int __handle, void _FAR *__buf, unsigned __len);
#define ALLOCA_HACK /* used in util/panic.c */
#endif
#ifndef REDO
#undef Getchar
#define Getchar nhgetch
#endif
extern int FDECL(set_win32_option, (const char *, const char *));
#ifdef WIN32CON
#define LEFTBUTTON FROM_LEFT_1ST_BUTTON_PRESSED

View File

@@ -100,11 +100,6 @@
#define sethanguphandler(foo) (void)signal(SIGHUP, (SIG_RET_TYPE)foo)
#endif
#ifndef REDO
# undef Getchar
# define Getchar nhgetch
#endif
void hangup(int i);
#endif /* OS2CONF_H */
#endif /* OS2 */

View File

@@ -249,11 +249,6 @@
#include <fcntl.h>
#ifndef REDO
# undef Getchar
# define Getchar nhgetch
#endif
#ifdef MSDOS
# define TEXTCOLOR /* */
# define PORT_HELP "msdoshlp.txt" /* msdos port specific help file */

View File

@@ -281,9 +281,6 @@
#define HLOCK "perm" /* an empty file used for locking purposes */
#ifndef REDO
#define Getchar nhgetch
#endif
#define tgetch getchar
#ifndef NOSHELL

View File

@@ -234,9 +234,6 @@ typedef __mode_t mode_t;
# define O_TRUNC 0x400
#endif
#ifndef REDO
# define Getchar nhgetch
#endif
#define tgetch vms_getchar
#include "system.h"

View File

@@ -185,11 +185,6 @@ extern void NDECL(toggle_mouse_support);
#define ALLOCA_HACK /* used in util/panic.c */
#endif
#ifndef REDO
#undef Getchar
#define Getchar nhgetch
#endif
#ifdef _MSC_VER
#if 0
#pragma warning(disable:4018) /* signed/unsigned mismatch */