The ON_SIGHTING macro is possible to cause to disallow undo

[SkyOne]

Well, it is not a huge problem, so I post it here (instead of reporting it to Gna-project).
I think that the location of the [else] + [allow_undo] tag in the ON_SIGHTING macro is not really correct. It should be inside of the [if] tag with the [have_unit] tag.

After I moved it, the scenario allows me undo as well. Here is how I changed:

Spoiler:

Code: Select all

#define FOAP_ON_SIGHTING ID SIGHTING_SIDE SIGHTED_FILTER ACTION_WML
    [event]
        name=SIGHTED_{ID}_trigger_action_WML

        {ACTION_WML}
    [/event]

    [event]
        name=moveto,recruit,recall,attack,post advance,side turn
        first_time_only=no

        [filter]
            side={SIGHTING_SIDE}

            [or]
                {SIGHTED_FILTER}
            [/or]
        [/filter]

        [if]
            [variable]
                name=SIGHTED_{ID}_finished
                not_equals=yes
            [/variable]

            [then]
                [store_side]
                    side={SIGHTING_SIDE}
                    variable=stored_sighting_side
                [/store_side]

                [if]
                    [have_unit]
                        {SIGHTED_FILTER}

                        [filter_vision]
                            viewing_side={SIGHTING_SIDE}
                        [/filter_vision]
                    [/have_unit]

                    [and]
                        [variable]
                            name=stored_sighting_side.fog
                            boolean_equals=yes
                        [/variable]

                        [or]
                            [variable]
                                name=stored_sighting_side.shroud
                                boolean_equals=yes
                            [/variable]
                        [/or]
                    [/and]

                    [then]
                        [fire_event]
                            name=SIGHTED_{ID}_trigger_action_WML

                            [primary_unit]
                                side={SIGHTING_SIDE}

                                [filter_location]
                                    [filter]
                                        {SIGHTED_FILTER}

                                        [not]
                                            side={SIGHTING_SIDE}
                                        [/not]
                                    [/filter]

                                    radius="$($this_unit.max_moves + 1)"
                                [/filter_location]
                            [/primary_unit]

                            [secondary_unit]
                                {SIGHTED_FILTER}

                                [filter_vision]
                                    viewing_side={SIGHTING_SIDE}
                                [/filter_vision]
                            [/secondary_unit]
                        [/fire_event]

                        [set_variable]
                            name=SIGHTED_{ID}_finished
                            value=yes
                        [/set_variable]
                    [/then]
                    # added
                    [else]
                        [allow_undo]
                        [/allow_undo]
                    [/else]
                [/if]

                [clear_variable]
                    name=stored_sighting_side
                [/clear_variable]
            [/then]
            # removed
            #[else]
            #    [allow_undo]
            #    [/allow_undo]
            #[/else]
        [/if]
    [/event]

    [event]
        name=victory

        [clear_variable]
            name=SIGHTED_{ID}_finished
        [/clear_variable]
    [/event]
#enddef

[Anonymissimus]

Should already be fixed (from 1.10.1 onwards).

[JaMiT]

After I moved it, the scenario allows me undo as well.

Did you try undoing a move after the ON_SIGHTING triggers your event? Since you moved the [else] instead of copying it, you have just shifted the problem from before the triggering to after. (The solution in 1.10.1 allows undoing as an else clause to both if's.) To make your custom macro work as intended, you should restore the [else] tag you removed.

[SkyOne]

Should already be fixed (from 1.10.1 onwards).

Thank you.

After I moved it, the scenario allows me undo as well.

Did you try undoing a move after the ON_SIGHTING triggers your event? Since you moved the [else] instead of copying it, you have just shifted the problem from before the triggering to after. (The solution in 1.10.1 allows undoing as an else clause to both if's.) To make your custom macro work as intended, you should restore the [else] tag you removed.

Uh-oh, it seems you are right.
Thanks for telling it. Now, there is a reason to update the new editions. That is an advantage of UMC.