fiddlerwoaroof/crawl - Change 5CGIHK2MZLWM63N2VCQTALRO5AB6HV2GB6ERJFI3MKCISOVKSBKQC

[2722438] Fixing crash when viewing shop contents. shop_item* was being blindly casted to monsters*, which didn't play well with a non-existent virtual function table. Fixed by creating a ShopItemEntry and a MonstersMenuEntry class to differentiate the meaning of MenuEntry::data and to avoid crashes in the future by having MenuEntry::get_tiles() be a no-op.

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

Created by ennewalker on March 30, 2009

5CGIHK2MZLWM63N2VCQTALRO5AB6HV2GB6ERJFI3MKCISOVKSBKQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/stash.h at line 148 [3.138156]

[3.141652]

    // Messy!
    struct shop_item
    {
        item_def item;
        unsigned price;
    };

Deletion in crawl-ref/source/stash.h at line 164 [3.138156]
B:BD[3.141788] → [3.141788:141829]
B:BD[3.141829] → [4.574:597]
∅:D[4.597] → [3.141857:141888]
B:BD[3.141857] → [3.141857:141888]
```
    // Messy!
    struct shop_item
    {
        item_def item;
        unsigned price;
    };
```

Insertion in crawl-ref/source/stash.cc at line 914 [3.147324]

[3.164633]


class ShopItemEntry : public InvEntry
{
public:
    ShopItemEntry(const ShopInfo::shop_item &it,
                  const std::string &item_name,
                  menu_letter hotkey) : InvEntry(it.item)
    {
        text = item_name;
        add_hotkey(hotkey);
    }
};

Replacement in crawl-ref/source/stash.cc at line 952 [3.147324]

B:BD[3.165367] → [3.165367:165646]

            MenuEntry *me = new MenuEntry(shop_item_name(items[i]),
                                          MEL_ITEM,
                                          1,
                                          hotkey++);
            me->data = const_cast<shop_item *>( &items[i] );

[3.165367]

[3.165646]

            MenuEntry *me = new ShopItemEntry(items[i],
                                              shop_item_name(items[i]),
                                              hotkey++);

Insertion in crawl-ref/source/menu.h at line 163 [3.255942]

[5.3084]

[3.258418]

};
class MonsterMenuEntry : public MenuEntry
{
public:
    MonsterMenuEntry(const std::string &str, const monsters* mon, int hotkey);
#ifdef USE_TILE
    virtual bool get_tiles(std::vector<tile_def>& tileset) const;
#endif

Insertion in crawl-ref/source/menu.cc at line 688 [3.261322]

[6.5388]

MonsterMenuEntry::MonsterMenuEntry(const std::string &str, const monsters* mon, int hotkey) :
    MenuEntry(str, MEL_ITEM, 1, hotkey)
{
    data = (void*)mon;
    quantity = 1;
}

Replacement in crawl-ref/source/menu.cc at line 698 [3.261322]

B:BD[6.5470] → [6.5470:5496]

    // Is this a monster?

[6.5470]

[6.5496]

    return false;
}
bool MonsterMenuEntry::get_tiles(std::vector<tile_def>& tileset) const
{

Replacement in crawl-ref/source/invent.cc at line 516 [7.2920632]

B:BD[2.6466] → [2.6466:6496]

        if (c != coord_def())

[2.6466]

[2.6496]

        if (c.x == 0)
        {
            // Store items.
            tileset.push_back(tile_def(TILE_ITEM_SLOT, TEX_DUNGEON));
        }
        else if (c != coord_def())

Replacement in crawl-ref/source/directn.cc at line 589 [7.3697945]

B:BD[8.7279] → [9.7047:7122]

∅:D[10.3487] → [8.7362:7415]

∅:D[9.7122] → [8.7362:7415]

B:BD[8.7362] → [8.7362:7415]

B:BD[8.7450] → [8.7450:7525]

                    me = new MenuEntry(prefix + str, MEL_ITEM, 1, hotkey);
                    me->data = (void*) list_mons[i];
                    me->quantity = 1; // Hack to make monsters selectable.

[8.7279]

[8.7525]

                    me = new MonsterMenuEntry(prefix+str, list_mons[i], hotkey);