remove Other/Any follow action types

This commit is contained in:
Paul Davis 2022-01-20 18:55:44 -07:00
parent fdedbe24ec
commit 5ade0927dd
3 changed files with 0 additions and 34 deletions

View file

@ -831,8 +831,6 @@ struct FollowAction {
ReverseTrigger, /* any "prev" skipping empties */ ReverseTrigger, /* any "prev" skipping empties */
FirstTrigger, FirstTrigger,
LastTrigger, LastTrigger,
AnyTrigger,
OtherTrigger,
JumpTrigger, JumpTrigger,
}; };

View file

@ -866,8 +866,6 @@ setup_enum_writer ()
REGISTER_CLASS_ENUM (FollowAction, ReverseTrigger); REGISTER_CLASS_ENUM (FollowAction, ReverseTrigger);
REGISTER_CLASS_ENUM (FollowAction, FirstTrigger); REGISTER_CLASS_ENUM (FollowAction, FirstTrigger);
REGISTER_CLASS_ENUM (FollowAction, LastTrigger); REGISTER_CLASS_ENUM (FollowAction, LastTrigger);
REGISTER_CLASS_ENUM (FollowAction, AnyTrigger);
REGISTER_CLASS_ENUM (FollowAction, OtherTrigger);
REGISTER_CLASS_ENUM (FollowAction, JumpTrigger); REGISTER_CLASS_ENUM (FollowAction, JumpTrigger);
REGISTER (_FollowAction); REGISTER (_FollowAction);

View file

@ -3117,36 +3117,6 @@ TriggerBox::determine_next_trigger (uint32_t current)
} }
break; break;
case FollowAction::AnyTrigger:
while (true) {
n = _pcg.rand (all_triggers.size());
if (!all_triggers[n]->region()) {
continue;
}
if (all_triggers[n]->active()) {
continue;
}
break;
}
return n;
case FollowAction::OtherTrigger:
while (true) {
n = _pcg.rand (all_triggers.size());
if ((uint32_t) n == current) {
continue;
}
if (!all_triggers[n]->region()) {
continue;
}
if (all_triggers[n]->active()) {
continue;
}
break;
}
return n;
case FollowAction::JumpTrigger: case FollowAction::JumpTrigger:
for (std::size_t n = 0; n < default_triggers_per_box; ++n) { for (std::size_t n = 0; n < default_triggers_per_box; ++n) {
if (fa.targets.test (n) && all_triggers[n]->region()) { if (fa.targets.test (n) && all_triggers[n]->region()) {