diff options
Diffstat (limited to '082scenario_screen.cc')
| -rw-r--r-- | 082scenario_screen.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/082scenario_screen.cc b/082scenario_screen.cc index 0c75fb6c..31cbfcc9 100644 --- a/082scenario_screen.cc +++ b/082scenario_screen.cc @@ -250,11 +250,11 @@ struct raw_string_stream { :(code) void check_screen(const string& expected_contents, const int color) { - int screen_location = get_or_insert(Memory, SCREEN)+/*skip refcount*/1; + int screen_location = get_or_insert(Memory, SCREEN); 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:character - int screen_data_start = get_or_insert(Memory, screen_data_location) + /*skip refcount*/1; // type: array:character + int screen_data_start = get_or_insert(Memory, screen_data_location); // type: array:character int width_offset = find_element_name(get(Type_ordinal, "screen"), "num-columns", ""); int screen_width = get_or_insert(Memory, screen_location+width_offset); int height_offset = find_element_name(get(Type_ordinal, "screen"), "num-rows", ""); @@ -385,7 +385,7 @@ case _DUMP_SCREEN: { :(code) void dump_screen() { - int screen_location = get_or_insert(Memory, SCREEN) + /*skip refcount*/1; + int screen_location = get_or_insert(Memory, SCREEN); int width_offset = find_element_name(get(Type_ordinal, "screen"), "num-columns", ""); int screen_width = get_or_insert(Memory, screen_location+width_offset); int height_offset = find_element_name(get(Type_ordinal, "screen"), "num-rows", ""); @@ -393,7 +393,7 @@ void dump_screen() { 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:character - int screen_data_start = get_or_insert(Memory, screen_data_location) + /*skip refcount*/1; // type: array:character + int screen_data_start = get_or_insert(Memory, screen_data_location); // type: array:character assert(get_or_insert(Memory, screen_data_start) == screen_width*screen_height); int top_index_offset = find_element_name(get(Type_ordinal, "screen"), "top-idx", ""); int top_index = get_or_insert(Memory, screen_location+top_index_offset); |