From a0331a9b0eab63a000dcd022fe605d124c573b8d Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 17 Sep 2016 13:00:39 -0700 Subject: 3390 --- 082scenario_screen.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '082scenario_screen.cc') diff --git a/082scenario_screen.cc b/082scenario_screen.cc index 44259cb4..a657627f 100644 --- a/082scenario_screen.cc +++ b/082scenario_screen.cc @@ -253,7 +253,7 @@ void check_screen(const string& expected_contents, const int color) { int screen_location = get_or_insert(Memory, SCREEN)+/*skip refcount*/1; int data_offset = find_element_name(get(Type_ordinal, "screen"), "data", ""); assert(data_offset >= 0); - int screen_data_location = screen_location+data_offset; // type: address:array:char + int screen_data_location = screen_location+data_offset; // type: address:@:char int screen_data_start = get_or_insert(Memory, screen_data_location) + /*skip refcount*/1; // type: array:char int width_offset = find_element_name(get(Type_ordinal, "screen"), "num-columns", ""); int screen_width = get_or_insert(Memory, screen_location+width_offset); @@ -397,7 +397,7 @@ void dump_screen() { int screen_height = get_or_insert(Memory, screen_location+height_offset); int data_offset = find_element_name(get(Type_ordinal, "screen"), "data", ""); assert(data_offset >= 0); - int screen_data_location = screen_location+data_offset; // type: address:array:char + int screen_data_location = screen_location+data_offset; // type: address:@:char int screen_data_start = get_or_insert(Memory, screen_data_location) + /*skip refcount*/1; // type: array:char assert(get_or_insert(Memory, screen_data_start) == screen_width*screen_height); int curr = screen_data_start+1; // skip length -- cgit 1.4.1-2-gfad0