diff options
| -rw-r--r-- | 050scenario.cc | 3 | ||||
| -rw-r--r-- | 072scenario_screen.cc | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/050scenario.cc b/050scenario.cc index 06c14c8e..30e82989 100644 --- a/050scenario.cc +++ b/050scenario.cc @@ -193,6 +193,7 @@ MEMORY_SHOULD_CONTAIN, Recipe_number["memory-should-contain"] = MEMORY_SHOULD_CONTAIN; :(before "End Primitive Recipe Implementations") case MEMORY_SHOULD_CONTAIN: { + if (!Passed) break; //? cout << current_instruction().ingredients.at(0).name << '\n'; //? 1 check_memory(current_instruction().ingredients.at(0).name); break; @@ -355,6 +356,7 @@ TRACE_SHOULD_CONTAIN, Recipe_number["trace-should-contain"] = TRACE_SHOULD_CONTAIN; :(before "End Primitive Recipe Implementations") case TRACE_SHOULD_CONTAIN: { + if (!Passed) break; check_trace(current_instruction().ingredients.at(0).name); break; } @@ -445,6 +447,7 @@ TRACE_SHOULD_NOT_CONTAIN, Recipe_number["trace-should-not-contain"] = TRACE_SHOULD_NOT_CONTAIN; :(before "End Primitive Recipe Implementations") case TRACE_SHOULD_NOT_CONTAIN: { + if (!Passed) break; check_trace_missing(current_instruction().ingredients.at(0).name); break; } diff --git a/072scenario_screen.cc b/072scenario_screen.cc index 5675da5b..a37318c0 100644 --- a/072scenario_screen.cc +++ b/072scenario_screen.cc @@ -148,6 +148,7 @@ SCREEN_SHOULD_CONTAIN, Recipe_number["screen-should-contain"] = SCREEN_SHOULD_CONTAIN; :(before "End Primitive Recipe Implementations") case SCREEN_SHOULD_CONTAIN: { + if (!Passed) break; check_screen(current_instruction().ingredients.at(0).name, -1); break; } @@ -158,6 +159,7 @@ SCREEN_SHOULD_CONTAIN_IN_COLOR, Recipe_number["screen-should-contain-in-color"] = SCREEN_SHOULD_CONTAIN_IN_COLOR; :(before "End Primitive Recipe Implementations") case SCREEN_SHOULD_CONTAIN_IN_COLOR: { + if (!Passed) break; assert(scalar(ingredients.at(0))); check_screen(current_instruction().ingredients.at(1).name, ingredients.at(0).at(0)); break; |