about summary refs log tree commit diff stats
path: root/html/082scenario_screen.cc.html
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-08-20 20:01:25 -0700
committerKartik K. Agaram <vc@akkartik.com>2016-08-20 20:01:34 -0700
commit8e7b4429787bc2b7fe289f264d09a4b1f5f6b081 (patch)
treeda78a0432f4cc01f9083bda4b04a9cb0e5c46142 /html/082scenario_screen.cc.html
parentc31209c6a14cebad97976b4089fe6a69f074f748 (diff)
downloadmu-8e7b4429787bc2b7fe289f264d09a4b1f5f6b081.tar.gz
3235
Diffstat (limited to 'html/082scenario_screen.cc.html')
-rw-r--r--html/082scenario_screen.cc.html9
1 files changed, 5 insertions, 4 deletions
diff --git a/html/082scenario_screen.cc.html b/html/082scenario_screen.cc.html
index df06104d..d66b7407 100644
--- a/html/082scenario_screen.cc.html
+++ b/html/082scenario_screen.cc.html
@@ -151,10 +151,6 @@ scenario screen-in-scenario-color [
 ]
 <span class="traceContains">+error: expected screen location (0, 0) to be in color 2 instead of 1</span>
 
-<span class="Comment">//: allow naming just for 'screen'</span>
-<span class="Delimiter">:(before &quot;End is_special_name Cases&quot;)</span>
-<span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
-
 <span class="Delimiter">:(scenarios run)</span>
 <span class="Delimiter">:(scenario convert_names_does_not_fail_when_mixing_special_names_and_numeric_locations)</span>
 <span class="Special">% Scenario_testing_scenario = true;</span>
@@ -183,8 +179,13 @@ assert<span class="Delimiter">(</span>Name[tmp_recipe<span class="Delimiter">.</
 <span class="Comment">// Scenario Globals.</span>
 <span class="Normal">const</span> <span class="Normal">int</span> SCREEN = Next_predefined_global_for_scenarios++<span class="Delimiter">;</span>
 <span class="Comment">// End Scenario Globals.</span>
+
+<span class="Comment">//: give 'screen' a fixed location in scenarios</span>
 <span class="Delimiter">:(before &quot;End Special Scenario Variable Names(r)&quot;)</span>
 Name[r][<span class="Constant">&quot;screen&quot;</span>] = SCREEN<span class="Delimiter">;</span>
+<span class="Comment">//: make 'screen' always a raw location in scenarios</span>
+<span class="Delimiter">:(before &quot;End is_special_name Cases&quot;)</span>
+<span class="Normal">if</span> <span class="Delimiter">(</span>s == <span class="Constant">&quot;screen&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">true</span><span class="Delimiter">;</span>
 
 <span class="Delimiter">:(before &quot;End Rewrite Instruction(curr, recipe result)&quot;)</span>
 <span class="Comment">// rewrite `assume-screen width, height` to</span>