DOS tweaks

diff --git a/.metadata b/.metadata
index 343e131d69acb80a60c875fe0897692084675540..ef65c34bfc149c2db5c5e095e4d4ed8cff72ac1b 100644 (file)
Binary files a/.metadata and b/.metadata differ

diff --git a/Makefile b/Makefile
index 9abd5066e5dc4f443cd8d1f3d6c4cf7071a8e941..5a7a1b9aba81dde4873df3fb95e61e57fec9df24 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -146,6 +146,7 @@ CURSES_OBJECT = $(CURSES_DIR)/ux_init.o \
                $(CURSES_DIR)/ux_pic.o \
                $(CURSES_DIR)/ux_screen.o \
                $(CURSES_DIR)/ux_text.o \
+               $(CURSES_DIR)/ux_blorb.o \
                $(CURSES_DIR)/ux_audio_none.o \
                $(CURSES_DIR)/ux_audio_oss.o
 

diff --git a/src/dos/bcinit.c b/src/dos/bcinit.c
index 8136ba3002d5f0879db56bd877e1eef81891f49a..72780dd0eebaf8f8126068d3a8ad8fc1a01316d2 100644 (file)
--- a/src/dos/bcinit.c
+++ b/src/dos/bcinit.c
@@ -20,7 +20,6 @@ static char information[] =
 "Complies with standard 1.0 of Graham Nelson's specification.\n"\r
 "\n"\r
 "Syntax: frotz [options] story-file\n"\r
-"\n"\r
 "  -a   watch attribute setting  \t -o   watch object movement\n"\r
 "  -A   watch attribute testing  \t -O   watch object locating\n"\r
 "  -b # background colour        \t -p   alter piracy opcode\n"\r
@@ -202,7 +201,7 @@ static void interrupt fast_exit ()
  *\r
  */\r
 \r
-void os_fatal (const char *s)\r
+void os_fatal (const char *s, ...)\r
 {\r
 \r
     if (h_interpreter_number)\r

diff --git a/src/dos/bcinput.c b/src/dos/bcinput.c
index 3ccca00c938db86098cd6857f77cae6fb56e65ed..87a0361664745b8259b607efd282288f9964dc2b 100644 (file)
--- a/src/dos/bcinput.c
+++ b/src/dos/bcinput.c
@@ -463,7 +463,8 @@ static void input_move (zchar newc, zchar oldc)
            cursor_y + 1,
            cursor_x + 1,
            cursor_y + h_font_height,
-           cursor_x + oldwidth - newwidth);
+           cursor_x + oldwidth - newwidth,
+           -1);
 
     switch_scrn_attr (FALSE);
 

diff --git a/src/dos/bcscreen.c b/src/dos/bcscreen.c
index ed42e2e8e9eb98858a1ef9a26c783a150b05a695..0cd60914b070a990f00ae49869a2d400afa338cb 100644 (file)
--- a/src/dos/bcscreen.c
+++ b/src/dos/bcscreen.c
@@ -117,9 +117,14 @@ static void clear_line (int y, int left, int right)
  * Fill a rectangular area of the screen with the current background
  * colour. Top left coordinates are (1,1). The cursor does not move.
  *
+ * The final argument gives the window being changed, -1 if only a
+ * portion of a window is being erased, or -2 if the whole screen is
+ * being erased.  This is not relevant for the DOS interface, and so
+ * this function ignores that argument.
+ *
  */
 
-void os_erase_area (int top, int left, int bottom, int right)
+void os_erase_area (int top, int left, int bottom, int right, int win)
 {
     int y;
 

diff --git a/src/dos/bctext.c b/src/dos/bctext.c
index 1d4e20f5edd8243cd481416192dabedc29112318..1f99c450c400a1da1853cc82cf5d746b72737d37 100644 (file)
--- a/src/dos/bctext.c
+++ b/src/dos/bctext.c
@@ -793,7 +793,8 @@ void os_more_prompt (void)
     os_erase_area (cursor_y + 1,
                   saved_x + 1,
                   cursor_y + h_font_height,
-                  cursor_x + 1);
+                  cursor_x + 1,
+                  -1);
 
     cursor_x = saved_x;