[WIP] FIX: Incomplete objects tree for some games

frotz/Makefile

@@ -12,6 +12,7 @@ CC ?= gcc
 
 # Enable compiler warnings. This is an absolute minimum.
 CFLAGS += -Wall -Wextra -std=gnu99 -fPIC -Werror=implicit-function-declaration
+CFLAGS = -w
 
 # Define your optimization flags.
 #
@@ -20,7 +21,8 @@ CFLAGS += -Wall -Wextra -std=gnu99 -fPIC -Werror=implicit-function-declaration
 # OPTS = -O3 -fomit-frame-pointer -falign-functions=2 -falign-loops=2 -falign-jumps=2 -fPIC
 OPTS = -O3 -fPIC
 # These are handy for debugging.
-# OPTS = $(CFLAGS) -g -fPIC
+# OPTS = $(CFLAGS) -O3 -g -fPIC  # With optimization (faster code)
+# OPTS = $(CFLAGS) -g -fPIC		 # Without optimization (slower code)
 # These are handy for profiling
 # OPTS = $(CFLAGS) -pg -fPIC
 

frotz/src/common/frotz.h

@@ -550,21 +550,6 @@ extern char *option_zcode_path;	/* dg */
 
 extern long reserve_mem;
 
-// Keep track of the last n=16 changes to object tree
-extern int move_diff_cnt;
-extern zword move_diff_objs[16];
-extern zword move_diff_dest[16];
-
-// Keep track of the last n=16 changes to obj attributes
-extern int attr_diff_cnt;
-extern zword attr_diff_objs[16];
-extern zword attr_diff_nb[16];
-
-// Keep track of the last n=16 clears of obj attributes
-extern int attr_clr_cnt;
-extern zword attr_clr_objs[16];
-extern zword attr_clr_nb[16];
-
 // Keep track of up to n=16 changes to special ram locations defined by the game
 extern int ram_diff_cnt;
 extern zword ram_diff_addr[16];

frotz/src/common/object.c

@@ -34,16 +34,6 @@
 #define O4_PROPERTY_OFFSET 12
 #define O4_SIZE 14
 
-int move_diff_cnt;
-zword move_diff_objs[16];
-zword move_diff_dest[16];
-int attr_diff_cnt;
-zword attr_diff_objs[16];
-zword attr_diff_nb[16];
-int attr_clr_cnt;
-zword attr_clr_objs[16];
-zword attr_clr_nb[16];
-
 /*
  * object_address
  *
@@ -451,14 +441,6 @@ void z_clear_attr (void)
     if (zargs[1] > ((h_version <= V3) ? 31 : 47))
 	runtime_error (ERR_ILL_ATTR);
 
-    /* If we are monitoring attribute assignment display a short note */
-
-    if (attr_clr_cnt < 16) {
-      attr_clr_objs[attr_clr_cnt] = zargs[0];
-      attr_clr_nb[attr_clr_cnt] = zargs[1];
-      attr_clr_cnt++;
-    }
-
     if (f_setup.attribute_assignment) {
 	stream_mssg_on ();
 	print_string ("@clear_attr ");
@@ -1063,14 +1045,6 @@ void z_insert_obj (void)
     zword obj1_addr;
     zword obj2_addr;
 
-    /* If we are monitoring object movements display a short note */
-
-    if (move_diff_cnt < 16) {
-      move_diff_objs[move_diff_cnt] = obj1;
-      move_diff_dest[move_diff_cnt] = obj2;
-      move_diff_cnt++;
-    }
-
     if (f_setup.object_movement) {
 	stream_mssg_on ();
 	print_string ("@move_obj ");
@@ -1194,7 +1168,6 @@ void z_put_prop (void)
  */
 void z_remove_obj (void)
 {
-    /* If we are monitoring object movements display a short note */
 
     if (f_setup.object_movement) {
 	stream_mssg_on ();
@@ -1229,14 +1202,6 @@ void z_set_attr (void)
     if (zargs[1] > ((h_version <= V3) ? 31 : 47))
 	runtime_error (ERR_ILL_ATTR);
 
-    /* If we are monitoring attribute assignment display a short note */
-
-    if (attr_diff_cnt < 16) {
-      attr_diff_objs[attr_diff_cnt] = zargs[0];
-      attr_diff_nb[attr_diff_cnt] = zargs[1];
-      attr_diff_cnt++;
-    }
-
     if (f_setup.attribute_assignment) {
 	stream_mssg_on ();
 	print_string ("@set_attr ");

frotz/src/common/process.c

@@ -890,6 +890,7 @@ void z_nop (void)
 void z_quit (void)
 {
     finished = 9999;
+    emulator_halted = 2;
 
 }/* z_quit */
 

frotz/src/common/screen.c

@@ -1554,7 +1554,7 @@ void z_show_status (void)
     /* One V5 game (Wishbringer Solid Gold) contains this opcode by
        accident, so just return if the version number does not fit */
 
-    if (h_version >= V4)
+    if (h_version >= V4 || h_config & CONFIG_NOSTATUSLINE)
 	return;
 
     /* Read all relevant global variables from the memory of the

frotz/src/dumb/dumb_frotz.h

@@ -44,6 +44,7 @@ void dumb_set_picture_cell(int row, int col, char c);
 void dumb_row_to_str(char *s);
 void dumb_clear_output(void);
 char* dumb_get_screen(void);
+char* dumb_get_lower_screen(void);
 void dumb_clear_screen(void);
 
 /* dumb-pic.c */

frotz/src/dumb/dumb_output.c

@@ -50,9 +50,13 @@ static cell make_cell(int style, char c) {return (style << 8) | (0xff & c);}
 static char cell_char(cell c) {return c & 0xff;}
 static int cell_style(cell c) {return c >> 8;}
 
+#define UPPER_SCREEN_BUFF_SIZE 256
 #define SCREEN_BUFF_SIZE 8192
-static char screen_buffer[SCREEN_BUFF_SIZE];
+static char screen_buffer[SCREEN_BUFF_SIZE];  // aka window 0 (lower screen)
+static char upper_screen_buffer[UPPER_SCREEN_BUFF_SIZE];  // aka window 1 (upper screen)
+
 char* screen_buffer_ptr = screen_buffer;
+char* upper_screen_buffer_ptr = upper_screen_buffer;
 
 /* A cell's style is REVERSE_STYLE, normal (0), or PICTURE_STYLE.
  * PICTURE_STYLE means the character is part of an ascii image outline
@@ -114,7 +118,12 @@ int os_string_width (const zchar *s)
 
 void os_set_cursor(int row, int col)
 {
-    cursor_row = row - 1; cursor_col = col - 1;
+	//printf("\n--> win:%d\trow:%d\tcol:%d MAX_COLS:%d<--\n", cwin, row, col, h_screen_cols);
+	if (cwin == 1 && row == 1) {
+		upper_screen_buffer_ptr = upper_screen_buffer + (col-1);
+	}
+
+    cursor_row = row - 1; cursor_col = col - 1;  // 0-index
     if (cursor_row >= h_screen_rows)
 	cursor_row = h_screen_rows - 1;
 }
@@ -148,9 +157,16 @@ void os_set_text_style(int x)
 /* put a character in the cell at the cursor and advance the cursor.  */
 static void dumb_display_char(char c)
 {
-  if ((screen_buffer_ptr - screen_buffer) < (SCREEN_BUFF_SIZE - 1)) {
-    *screen_buffer_ptr++ = c;
-  }
+	if (cwin == 1 && cursor_row == 0) {
+		if ((upper_screen_buffer_ptr - upper_screen_buffer) < (UPPER_SCREEN_BUFF_SIZE - 1)) {
+			*upper_screen_buffer_ptr++ = c;
+		}
+	}
+	else {
+		if ((screen_buffer_ptr - screen_buffer) < (SCREEN_BUFF_SIZE - 1)) {
+			*screen_buffer_ptr++ = c;
+		}
+	}
 }
 
 void dumb_display_user_input(char *s)
@@ -210,7 +226,7 @@ void os_display_string (const zchar *s)
     }
 }
 
-void os_erase_area (int top, int left, int bottom, int right, int UNUSED (win))
+void os_erase_area (int top, int left, int bottom, int right, int win)
 {
     int row, col;
     top--; left--; bottom--; right--;
@@ -222,9 +238,16 @@ void os_erase_area (int top, int left, int bottom, int right, int UNUSED (win))
 
 void os_scroll_area (int top, int left, int bottom, int right, int units)
 {
-  if ((screen_buffer_ptr - screen_buffer) < (SCREEN_BUFF_SIZE - 1)) {
-    *screen_buffer_ptr++ = '\n';
-  }
+	if (cwin == 1) {
+		if ((upper_screen_buffer_ptr - upper_screen_buffer) < (UPPER_SCREEN_BUFF_SIZE - 1)) {
+			*upper_screen_buffer_ptr++ = '\n';
+		}
+	}
+	else {
+		if ((screen_buffer_ptr - screen_buffer) < (SCREEN_BUFF_SIZE - 1)) {
+			*screen_buffer_ptr++ = '\n';
+		}
+	}
 }
 
 int os_font_data(int font, int *height, int *width)
@@ -522,6 +545,7 @@ void dumb_init_output(void)
 {
     if (h_version == V3) {
 	h_config |= CONFIG_SPLITSCREEN;
+	h_config |= CONFIG_NOSTATUSLINE;
 	h_flags &= ~OLD_SOUND_FLAG;
     }
 
@@ -548,6 +572,7 @@ void dumb_init_output(void)
 }
 
 char* dumb_get_screen(void) {
+  flush_buffer();
   *screen_buffer_ptr = '\0';
   return screen_buffer;
 }
@@ -556,6 +581,26 @@ void dumb_clear_screen(void) {
   screen_buffer_ptr = screen_buffer;
 }
 
+
+char* dumb_get_lower_screen(void) {
+  flush_buffer();
+  *screen_buffer_ptr = '\0';
+  return screen_buffer;
+}
+
+void dumb_clear_lower_screen(void) {
+  screen_buffer_ptr = screen_buffer;
+}
+
+char* dumb_get_upper_screen(void) {
+  upper_screen_buffer[UPPER_SCREEN_BUFF_SIZE-1] = '\0';
+  return upper_screen_buffer;
+}
+
+void dumb_clear_upper_screen(void) {
+  upper_screen_buffer_ptr = upper_screen_buffer;
+}
+
 void dumb_free(void) {
 	if (screen_data) {
       free(screen_data);

frotz/src/games/acorncourt.c

@@ -1,4 +1,4 @@
-/* 
+/*
 Copyright (C) 2018 Microsoft Corporation
 
 This program is free software; you can redistribute it and/or
@@ -103,11 +103,11 @@ int acorn_ignore_attr_clr(zword obj_num, zword attr_idx) {
 }
 
 void acorn_clean_world_objs(zobject* objs) {
-    int i;
-    char mask;
-    mask = ~(1 << 6);
-    // Clear attr 25
-    for (i=1; i<=acorn_get_num_world_objs(); ++i) {
-        objs[i].attr[3] &= mask;
-    }
+  // Zero out attribute 25 for all objects.
+  // attr[0]  attr[1]  attr[2]  attr[3]
+  // 11111111 11111111 11111111 10111111
+  char mask3 = 0b10111111;  // Attr 25.
+  for (int i=1; i<=acorn_get_num_world_objs(); ++i) {
+      objs[i].attr[3] &= mask3;
+  }
 }

frotz/src/games/advent.c

@@ -1,4 +1,4 @@
-/* 
+/*
 Copyright (C) 2018 Microsoft Corporation
 
 This program is free software; you can redistribute it and/or
@@ -24,16 +24,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // Adventure: http://ifdb.tads.org/viewgame?id=fft6pu91j85y4acv
 
-const zword advent_special_ram_addrs[5] = {
+const zword advent_special_ram_addrs[3] = {
   15198, // Kill dragon
-  15191, // Pour water on plant
-  15287, // Give food to bear
+  // 15191, // Pour water on plant
+  //15287, // Give food to bear
   15282, // Bear following you
   15642, // FEE/FIE/FOE/FOO
 };
 
 zword* advent_ram_addrs(int *n) {
-    *n = 5;
+    *n = 3;
     return advent_special_ram_addrs;
 }
 
@@ -84,7 +84,7 @@ int advent_max_score() {
 }
 
 int advent_get_num_world_objs() {
-  return 255;
+  return 276;
 }
 
 int advent_ignore_moved_obj(zword obj_num, zword dest_num) {
@@ -104,4 +104,11 @@ int advent_ignore_attr_clr(zword obj_num, zword attr_idx) {
 }
 
 void advent_clean_world_objs(zobject* objs) {
+  // Zero out attribute 25 for all objects.
+  // attr[0]  attr[1]  attr[2]  attr[3]
+  // 11111111 11111111 11111111 10111111
+  char mask = 0b10111111;  // Attr 25.
+  for (int i=1; i<=advent_get_num_world_objs(); ++i) {
+      objs[i].attr[3] &= mask;
+  }
 }

frotz/src/games/adventureland.c

@@ -24,12 +24,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // Adventureland: http://ifdb.tads.org/viewgame?id=dy4ok8sdlut6ddj7
 
-const zword adventureland_special_ram_addrs[1] = {
-  1231 // Activated take/drink water
+const zword adventureland_special_ram_addrs[0] = {
+  // 1231 // Activated take/drink water
 };
 
 zword* adventureland_ram_addrs(int *n) {
-    *n = 1;
+    *n = 0;
     return adventureland_special_ram_addrs;
 }
 
@@ -88,23 +88,23 @@ int adventureland_ignore_moved_obj(zword obj_num, zword dest_num) {
 }
 
 int adventureland_ignore_attr_diff(zword obj_num, zword attr_idx) {
-  if (attr_idx == 2 || attr_idx == 25)
-    return 1;
+  // if (attr_idx == 2 || attr_idx == 25)
+  //   return 1;
   return 0;
 }
 
 int adventureland_ignore_attr_clr(zword obj_num, zword attr_idx) {
-  if (attr_idx == 2 || attr_idx == 25)
-    return 1;
+  // if (attr_idx == 2 || attr_idx == 25)
+  //   return 1;
   return 0;
 }
 
 void adventureland_clean_world_objs(zobject* objs) {
-    int i;
-    char mask;
-    mask = ~(1 << 6) & ~(1 << 7);
-    // Clear attr 24 & 25
-    for (i=1; i<=adventureland_get_num_world_objs(); ++i) {
-        objs[i].attr[3] &= mask;
-    }
+  // Zero out attribute 25 for all objects.
+  // attr[0]  attr[1]  attr[2]  attr[3]
+  // 11111111 11111111 11111111 10111111
+  // char mask3 = 0b10111111;  // Attr 25.
+  // for (int i=1; i<=adventureland_get_num_world_objs(); ++i) {
+  //     objs[i].attr[3] &= mask3;
+  // }
 }