about summary refs log tree commit diff stats
path: root/082scenario_screen.cc
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-05-29 13:37:02 -0700
committerKartik K. Agaram <vc@akkartik.com>2016-05-29 13:37:02 -0700
commite8eea70ab1f70822f756be3750817ac5e24bf24d (patch)
tree6d9c1104d9e9d750822152f475eb954556ca87d7 /082scenario_screen.cc
parenteea17dee20781db0e1aabacd736632d1f788994d (diff)
downloadmu-e8eea70ab1f70822f756be3750817ac5e24bf24d.tar.gz
3025 - fix a minor annoyance in edit/
When I floor the down-arrow too much, don't scroll unnecessarily off the
bottom of the screen. But *do* scroll if there's errors to show.
Diffstat (limited to '082scenario_screen.cc')
-rw-r--r--082scenario_screen.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/082scenario_screen.cc b/082scenario_screen.cc
index f90b926b..9c2cfe71 100644
--- a/082scenario_screen.cc
+++ b/082scenario_screen.cc
@@ -149,7 +149,7 @@ Name[r]["screen"] = SCREEN;
 if (curr.name == "assume-screen") {
   curr.name = "new-fake-screen";
   assert(curr.products.empty());
-  curr.products.push_back(reagent("screen:address:screen"));
+  curr.products.push_back(reagent("screen:address:screen/raw"));  // only allowed in scenario blocks
   curr.products.at(0).set_value(SCREEN);
 }
 
@@ -203,7 +203,6 @@ struct raw_string_stream {
 
 :(code)
 void check_screen(const string& expected_contents, const int color) {
-  assert(!current_call().default_space);  // not supported
   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);
@@ -339,7 +338,6 @@ case _DUMP_SCREEN: {
 
 :(code)
 void dump_screen() {
-  assert(!current_call().default_space);  // not supported
   int screen_location = get_or_insert(Memory, SCREEN) + /*skip refcount*/1;
   int width_offset = find_element_name(get(Type_ordinal, "screen"), "num-columns", "");
   int screen_width = get_or_insert(Memory, screen_location+width_offset);