-bool MapState::CheckTrigger() {
- Trigger *trigger(map->TriggerAt(Vector<int>(controlled->Position())));
- if (trigger) {
- // TODO: run trigger script
- if (trigger->map) {
- ctrl->PushState(new ColorFade(this, 0, 500, true));
- ctrl->PushState(new TransitionState(this, trigger->map, trigger->target));
- ColorFade *fadeOut(new ColorFade(this, 0, 500, false));
- fadeOut->SetLeadOutTime(500);
- ctrl->PushState(fadeOut);
- return true;
- }
- }
- return false;
+bool MapState::CheckLockTrigger() {
+ Trigger *trigger(map->TriggerAt(ToInt(controlled->Position())));
+ if (!trigger || trigger->GetType() != Trigger::TYPE_CONTACT) return false;
+ RunTrigger(*trigger);
+ return true;