fiddlerwoaroof/crawl - Change SFZIXVGFMK5PBXFUCDXSKTFZGOSVLQSMC2AB4WPXAWBY762RBHRQC

store.{cc,h}: Handle level_id and level_pos

level_id and level_pos instances can now be stored in CrawlHashTables and CrawlVectors.

Created by Matthew Cline on October 29, 2009

SFZIXVGFMK5PBXFUCDXSKTFZGOSVLQSMC2AB4WPXAWBY762RBHRQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/store.h at line 22 [4.142]
[3.254]
[4.649]
```
struct level_pos;
class level_id;
```
Insertion in crawl-ref/source/store.h at line 47 [4.142]
[4.1058]
[4.1058]
```
    SV_LEV_ID,
    SV_LEV_POS,
```

Insertion in crawl-ref/source/store.h at line 95 [4.142]

[4.2137]

    CrawlStoreValue(const level_id &val);
    CrawlStoreValue(const level_pos &val);

Insertion in crawl-ref/source/store.h at line 130 [4.142]

[4.3228]

    level_id       &get_level_id();
    level_pos      &get_level_pos();

Replacement in crawl-ref/source/store.h at line 133 [4.142]

B:BD[4.3229] → [4.3229:3502]

    bool           get_bool()   const;
    char           get_byte()   const;
    short          get_short()  const;
    long           get_long()   const;
    float          get_float()  const;
    std::string    get_string() const;
    coord_def      get_coord()  const;

[4.3229]

[4.3502]

    bool           get_bool()      const;
    char           get_byte()      const;
    short          get_short()     const;
    long           get_long()      const;
    float          get_float()     const;
    std::string    get_string()    const;
    coord_def      get_coord()     const;
    level_id       get_level_id()  const;
    level_pos      get_level_pos() const;

Insertion in crawl-ref/source/store.h at line 190 [4.142]
[3.523]
[3.523]
```
    operator level_id&();
    operator level_pos&();
```
Insertion in crawl-ref/source/store.h at line 203 [4.142]
[4.5170]
[3.530]
```
    &operator level_id();
    &operator level_pos();
```

Replacement in crawl-ref/source/store.h at line 207 [4.142]

B:BD[4.5171] → [4.5171:5308]

    operator bool() const;
    operator char() const;
    operator short() const;
    operator long() const;
    operator float() const;

[4.5171]

[4.5308]

    operator bool()        const;
    operator char()        const;
    operator short()       const;
    operator long()        const;
    operator float()       const;

Replacement in crawl-ref/source/store.h at line 213 [4.142]

B:BD[4.5342] → [4.5342:5374]

    operator coord_def() const;

[4.5342]

[4.5374]

    operator coord_def()   const;
    operator level_id()    const;
    operator level_pos()   const;

Insertion in crawl-ref/source/store.h at line 229 [4.142]

[4.5999]

    CrawlStoreValue &operator = (const level_id &val);
    CrawlStoreValue &operator = (const level_pos &val);

Insertion in crawl-ref/source/store.cc at line 14 [4.12569]
[4.12954]
[4.12954]
```
#include "travel.h"
#include <algorithm>
```

Insertion in crawl-ref/source/store.cc at line 89 [4.12569]

[4.14495]

        break;
    }
    case SV_LEV_ID:
    {
        level_id* id;
        id = new level_id(*static_cast<level_id*>(other.val.ptr));
        val.ptr = static_cast<void*>(id);
        break;
    }
    case SV_LEV_POS:
    {
        level_pos* pos;
        pos = new level_pos(*static_cast<level_pos*>(other.val.ptr));
        val.ptr = static_cast<void*>(pos);

Insertion in crawl-ref/source/store.cc at line 197 [4.12569]

[4.16152]

CrawlStoreValue::CrawlStoreValue(const level_id &_val)
    : type(SV_LEV_ID), flags(SFLAG_UNSET)
{
    val.ptr = NULL;
    get_level_id() = _val;
}
CrawlStoreValue::CrawlStoreValue(const level_pos &_val)
    : type(SV_LEV_POS), flags(SFLAG_UNSET)
{
    val.ptr = NULL;
    get_level_pos() = _val;
}

Insertion in crawl-ref/source/store.cc at line 288 [4.12569]

[4.17476]

    case SV_LEV_ID:
    {
        level_id* id = static_cast<level_id*>(val.ptr);
        delete id;
        val.ptr = NULL;
        break;
    }
    case SV_LEV_POS:
    {
        level_pos* pos = static_cast<level_pos*>(val.ptr);
        delete pos;
        val.ptr = NULL;
        break;
    }

Replacement in crawl-ref/source/store.cc at line 372 [4.12569]

B:BD[5.918] → [5.918:948]

    case NUM_STORE_VAL_TYPES:

[5.918]

[5.948]

    case SV_LEV_ID:
        COPY_PTR(level_id);
        break;
     case SV_LEV_POS:
        COPY_PTR(level_pos);
        break;
     case NUM_STORE_VAL_TYPES:

Insertion in crawl-ref/source/store.cc at line 475 [4.12569]

[4.19938]

        break;
    }
    case SV_LEV_ID:
    {
        level_id* id = static_cast<level_id*>(val.ptr);
        id->save(th);

Insertion in crawl-ref/source/store.cc at line 485 [4.12569]

[4.19960]

    case SV_LEV_POS:
    {
        level_pos* pos = static_cast<level_pos*>(val.ptr);
        pos->save(th);
        break;
    }

Insertion in crawl-ref/source/store.cc at line 568 [4.12569]

[4.21391]


        break;
    }
    case SV_LEV_ID:
    {
        level_id* id = new level_id();
        id->load(th);
        val.ptr = (void*) id;

Insertion in crawl-ref/source/store.cc at line 581 [4.12569]

[4.21414]

    case SV_LEV_POS:
    {
        level_pos* pos = new level_pos();
        pos->load(th);
        val.ptr = (void*) pos;
        break;
    }

Insertion in crawl-ref/source/store.cc at line 776 [4.12569]

[4.26030]

}
level_id &CrawlStoreValue::get_level_id()
{
    GET_VAL_PTR(SV_LEV_ID, level_id*, new level_id());

Insertion in crawl-ref/source/store.cc at line 783 [4.12569]

[4.26033]

level_pos &CrawlStoreValue::get_level_pos()
{
    GET_VAL_PTR(SV_LEV_POS, level_pos*, new level_pos());
}

Insertion in crawl-ref/source/store.cc at line 865 [4.12569]

[4.27495]

level_id CrawlStoreValue::get_level_id() const
{
    GET_CONST_SETUP(SV_LEV_ID);
    return *((level_id*)val.ptr);
}
level_pos CrawlStoreValue::get_level_pos() const
{
    GET_CONST_SETUP(SV_LEV_POS);
    return *((level_pos*)val.ptr);
}

Replacement in crawl-ref/source/store.cc at line 892 [4.12569]

∅:D[2.314] → [6.150:960]

B:BD[3.552] → [6.150:960]

CrawlStoreValue::operator bool&()                       { return get_bool();   }
CrawlStoreValue::operator char&()                       { return get_byte();   }
CrawlStoreValue::operator short&()                      { return get_short();  }
CrawlStoreValue::operator float&()                      { return get_float();  }
CrawlStoreValue::operator long&()                       { return get_long();   }
CrawlStoreValue::operator std::string&()                { return get_string(); }
CrawlStoreValue::operator coord_def&()                  { return get_coord();  }
CrawlStoreValue::operator CrawlHashTable&()             { return get_table();  }
CrawlStoreValue::operator CrawlVector&()                { return get_vector(); }
CrawlStoreValue::operator item_def&()                   { return get_item();   }

[2.314]

[3.1198]

CrawlStoreValue::operator bool&()                   { return get_bool();      }
CrawlStoreValue::operator char&()                   { return get_byte();      }
CrawlStoreValue::operator short&()                  { return get_short();     }
CrawlStoreValue::operator float&()                  { return get_float();     }
CrawlStoreValue::operator long&()                   { return get_long();      }
CrawlStoreValue::operator std::string&()            { return get_string();    }
CrawlStoreValue::operator coord_def&()              { return get_coord();     }
CrawlStoreValue::operator CrawlHashTable&()         { return get_table();     }
CrawlStoreValue::operator CrawlVector&()            { return get_vector();    }
CrawlStoreValue::operator item_def&()               { return get_item();      }
CrawlStoreValue::operator level_id&()               { return get_level_id();  }
CrawlStoreValue::operator level_pos&()              { return get_level_pos(); }

Insertion in crawl-ref/source/store.cc at line 953 [4.12569]
[4.28442]
[4.28442]
```
}
&CrawlStoreValue::operator level_id()
{
    return get_level_id();
```
Insertion in crawl-ref/source/store.cc at line 959 [4.12569]
[4.28444]
[3.1205]
```
&CrawlStoreValue::operator level_pos()
{
    return get_level_pos();
}
```

Insertion in crawl-ref/source/store.cc at line 1017 [4.12569]

[4.29255]

CrawlStoreValue::operator level_id() const
{
    return get_level_id();
}
CrawlStoreValue::operator level_pos() const
{
    return get_level_pos();
}

Insertion in crawl-ref/source/store.cc at line 1095 [4.12569]

[4.30580]

CrawlStoreValue &CrawlStoreValue::operator = (const level_id &_val)
{
    get_level_id() = _val;
    return (*this);
}
CrawlStoreValue &CrawlStoreValue::operator = (const level_pos &_val)
{
    get_level_pos() = _val;
    return (*this);
}

Insertion in crawl-ref/source/store.cc at line 1307 [4.12569]

[4.34682]


        if (type != SV_NONE)
            ASSERT(type == val.type);

Insertion in crawl-ref/source/store.cc at line 1316 [4.12569]
[4.34784]
[4.34784]
```
        case SV_LEV_ID:
        case SV_LEV_POS:
```

Insertion in crawl-ref/source/store.cc at line 1327 [4.12569]

[4.35019]


            nested->assert_validity();
            break;
        }
        case SV_VEC:
        {
            ASSERT(val.val.ptr != NULL);
            CrawlVector* nested;
            nested = static_cast<CrawlVector*>(val.val.ptr);

Insertion in crawl-ref/source/store.cc at line 1595 [4.12569]

[4.40313]

        if (type != SV_NONE)
            ASSERT(val.type == SV_NONE || val.type == type);

Insertion in crawl-ref/source/store.cc at line 1609 [4.12569]
[4.40660]
[4.40660]
```
        case SV_LEV_ID:
        case SV_LEV_POS:
```

Replacement in crawl-ref/source/store.cc at line 1618 [4.12569]

B:BD[4.40795] → [4.40795:40889]

            CrawlVector* nested;
            nested = static_cast<CrawlVector*>(val.val.ptr);

[4.40795]

[4.40889]

            CrawlHashTable* nested;
            nested = static_cast<CrawlHashTable*>(val.val.ptr);

Deletion in crawl-ref/source/store.cc at line 1656 [4.12569]
B:BD[4.41492] → [4.41492:41493]

Insertion in crawl-ref/source/store.cc at line 1714 [4.12569]

[4.42589]

#ifdef DEBUG
    if (type != SV_NONE)
        ASSERT(type == val.type);
    switch (val.type)
    {
    case SV_STR:
    case SV_COORD:
    case SV_ITEM:
    case SV_LEV_ID:
    case SV_LEV_POS:
        ASSERT(val.val.ptr != NULL);
        break;
    case SV_HASH:
    {
        ASSERT(val.val.ptr != NULL);
        CrawlHashTable* nested;
        nested = static_cast<CrawlHashTable*>(val.val.ptr);
        nested->assert_validity();
        break;
    }
    case SV_VEC:
    {
        ASSERT(val.val.ptr != NULL);
        CrawlVector* nested;
        nested = static_cast<CrawlVector*>(val.val.ptr);
        nested->assert_validity();
        break;
    }
    default:
        break;
    }
#endif

Insertion in crawl-ref/source/store.cc at line 1767 [4.12569]
[4.42939]
[4.42939]
```
    assert_validity();
```