diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2016-09-17 14:43:13 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2016-09-17 14:43:13 -0700 |
| commit | 0f2781f8a28881084295663c3e608e5f6f159047 (patch) | |
| tree | 46d0d2df3cbd29c329a314ddf0f8b3a92e1d4d08 /082scenario_screen.cc | |
| parent | 59085fca6083a08f67911a35c02f012c19d7df48 (diff) | |
| download | mu-0f2781f8a28881084295663c3e608e5f6f159047.tar.gz | |
3393
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 a657627f..3e248044 100644 --- a/082scenario_screen.cc +++ b/082scenario_screen.cc @@ -253,8 +253,8 @@ 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:@:char - int screen_data_start = get_or_insert(Memory, screen_data_location) + /*skip refcount*/1; // type: array:char + 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 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", ""); @@ -397,8 +397,8 @@ 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:@:char - int screen_data_start = get_or_insert(Memory, screen_data_location) + /*skip refcount*/1; // type: array:char + 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 assert(get_or_insert(Memory, screen_data_start) == screen_width*screen_height); int curr = screen_data_start+1; // skip length for (int row = 0; row < screen_height; ++row) { |