fiddlerwoaroof/crawl - Change QX7GM3YZFUBCXTLQIKF27YOPKYR2655HYRWSNTDXXI6CTH4XEP7AC

Fix [2151183]: SIGHUP with the range view annotator active maintained

the annotated colours when saving. Fixed by adding the ability to store arbitrary exit hooks to be executed on (unusual) shutdown; for now they're executed FIFO, but it should probably be LIFO with a stack. Anyway the only thing that uses this now is the range view annotator. Oh, and it only works if you're using libunix.cc.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8999 c06c8d41-db1a-0410-9941-cceddc491573

Created by haranp on February 8, 2009

QX7GM3YZFUBCXTLQIKF27YOPKYR2655HYRWSNTDXXI6CTH4XEP7AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/state.h at line 18 [5.42804]

[2.721]

[4.1191]

class crawl_exit_hook
{
public:
    crawl_exit_hook();
    virtual ~crawl_exit_hook();
    virtual void restore_state() = 0;
};

Insertion in crawl-ref/source/state.h at line 87 [5.42804]

[6.1844]

    // Hooks to call if get shut down unexpectedly.
    std::vector<crawl_exit_hook*> exit_hooks;

Insertion in crawl-ref/source/libunix.cc at line 338 [8.2550041]

[7.1257]

        // Clean up all the hooks.
        for (unsigned i = 0; i < crawl_state.exit_hooks.size(); ++i)
            crawl_state.exit_hooks[i]->restore_state();
        crawl_state.exit_hooks.clear();

Insertion in crawl-ref/source/externs.h at line 1682 [8.3270163]
[9.3068]
[10.16999]
```
class crawl_exit_hook;
```
Replacement in crawl-ref/source/externs.h at line 1732 [8.3270163]
B:BD[11.15937] → [11.15937:15974]
```
    // Sort of like player::atribute
```
[11.15937]
[11.15974]
```
    // Sort of like player::attribute
```

Insertion in crawl-ref/source/directn.h at line 17 [8.3696722]

[5.95812]

[12.2827]

#include "state.h"
class range_view_annotator : public crawl_exit_hook
{
public:
    range_view_annotator(int range);
    virtual ~range_view_annotator();
    virtual void restore_state();
private:
    bool do_anything;
    FixedArray<int, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER> orig_colours;
    int orig_mon_colours[MAX_MONSTERS];
};

Deletion in crawl-ref/source/directn.h at line 44 [8.3696722]

∅:D[12.3066] → [8.3697098:3697398]

B:BD[8.3697098] → [8.3697098:3697398]

// last updated 12may2000 {dlb}
/* ***********************************************************************
 * called from: acr - debug - effects - it_use3 - item_use - spells1 -
 *              spells2 - spells3 - spells4
 * *********************************************************************** */

Replacement in crawl-ref/source/directn.cc at line 23 [8.3697945]
B:BD[8.3698626] → [13.6924:6944]
```
 #include <conio.h>
```
[8.3698626]
[8.3698645]
```
#include <conio.h>
```

Replacement in crawl-ref/source/directn.cc at line 721 [8.3697945]

B:BD[14.6859] → [15.2772:2799]

class range_view_annotator

[14.6859]

[15.2799]

crawl_exit_hook::crawl_exit_hook()
{
    crawl_state.exit_hooks.push_back(this);
}
crawl_exit_hook::~crawl_exit_hook()

Replacement in crawl-ref/source/directn.cc at line 728 [8.3697945]

B:BD[15.2801] → [15.2801:2847]

B:BD[15.2847] → [16.2710:2789]

public:
    range_view_annotator(int range) {
        do_anything = (range >= 0);
        if (range < 0)
            return;

[15.2801]

[16.2789]

    crawl_state.exit_hooks.erase(std::remove(crawl_state.exit_hooks.begin(),
                                             crawl_state.exit_hooks.end(),
                                             this),
                                 crawl_state.exit_hooks.end());
}

Insertion in crawl-ref/source/directn.cc at line 734 [8.3697945]

[16.2790]

range_view_annotator::range_view_annotator(int range)
{
    do_anything = (range >= 0);
    if (do_anything)
    {

Insertion in crawl-ref/source/directn.cc at line 771 [8.3697945]
[15.3315]
[17.2572]
```
}
```
Replacement in crawl-ref/source/directn.cc at line 773 [8.3697945]
∅:D[17.2573] → [15.3316:3346]
∅:D[16.3521] → [15.3316:3346]
B:BD[15.3316] → [15.3316:3346]
```
    ~range_view_annotator() {
```
[17.2573]
[16.3522]
```
range_view_annotator::~range_view_annotator()
{
    restore_state();
    viewwindow(true, false);
}
```

Replacement in crawl-ref/source/directn.cc at line 779 [8.3697945]

B:BD[16.3523] → [16.3523:3569]

        if (!do_anything)
            return;

[16.3523]

[16.3569]

void range_view_annotator::restore_state()
{
    if (!do_anything)
        return;

Replacement in crawl-ref/source/directn.cc at line 784 [8.3697945]

B:BD[16.3570] → [16.3570:3603]

∅:D[16.3603] → [15.3346:3367]

B:BD[15.3346] → [15.3346:3367]

B:BD[15.3367] → [18.4207:4329]

        // Restore grid colours.
        coord_def c;
        const coord_def offset(ENV_SHOW_OFFSET, ENV_SHOW_OFFSET);
        for ( c.x = 0; c.x < ENV_SHOW_DIAMETER; ++c.x )

[16.3570]

[15.3408]

    // Restore grid colours.
    coord_def c;
    const coord_def offset(ENV_SHOW_OFFSET, ENV_SHOW_OFFSET);
    for ( c.x = 0; c.x < ENV_SHOW_DIAMETER; ++c.x )
    {
        for ( c.y = 0; c.y < ENV_SHOW_DIAMETER; ++c.y )

Replacement in crawl-ref/source/directn.cc at line 791 [8.3697945]

B:BD[15.3418] → [18.4330:4390]

∅:D[18.4390] → [15.3463:3573]

B:BD[15.3463] → [15.3463:3573]

B:BD[15.3573] → [16.3642:3717]

∅:D[16.3717] → [15.3652:3666]

B:BD[15.3652] → [15.3652:3666]

            for ( c.y = 0; c.y < ENV_SHOW_DIAMETER; ++c.y )
            {
                const int old_colour = orig_colours(c);
                if ( old_colour != -1 )
                    env.grid_colours(you.pos() + c - offset) = old_colour;
            }

[15.3418]

[15.3666]

            const int old_colour = orig_colours(c);
            if ( old_colour != -1 )
                env.grid_colours(you.pos() + c - offset) = old_colour;

Insertion in crawl-ref/source/directn.cc at line 795 [8.3697945]
[15.3676]
[16.3718]
```
    }
```

Replacement in crawl-ref/source/directn.cc at line 797 [8.3697945]

B:BD[16.3719] → [16.3719:3899]

        // Restore monster colours.
        for (int i = 0; i < MAX_MONSTERS; ++i)
            if (orig_mon_colours[i] != -1)
                menv[i].colour = orig_mon_colours[i];

[16.3719]

[16.3899]

    // Restore monster colours.
    for (int i = 0; i < MAX_MONSTERS; ++i)
        if (orig_mon_colours[i] != -1)
            menv[i].colour = orig_mon_colours[i];

Replacement in crawl-ref/source/directn.cc at line 802 [8.3697945]
B:BD[16.3900] → [16.3900:3920]
∅:D[16.3920] → [15.3676:3724]
B:BD[15.3676] → [15.3676:3724]
B:BD[15.3724] → [16.3921:3943]
B:BD[16.3943] → [18.4391:4463]
∅:D[18.4463] → [16.3944:3984]
B:BD[15.3764] → [16.3944:3984]
∅:D[16.3984] → [15.3764:3767]
B:BD[15.3764] → [15.3764:3767]
```
        // Repaint.
        viewwindow(true, false);
    }
private:
    bool do_anything;
    FixedArray<int, ENV_SHOW_DIAMETER, ENV_SHOW_DIAMETER> orig_colours;
    int orig_mon_colours[MAX_MONSTERS];
};
```
[16.3900]
[15.3767]
```
    do_anything = false;
}
```

Replacement in crawl-ref/source/crash-u.cc at line 153 [3.3988]

B:BD[3.7296] → [3.7296:7343]

        fprintf(stderr, "Out of memroy." EOL);

[3.7296]

[3.7343]

        fprintf(stderr, "Out of memory." EOL);