fiddlerwoaroof/crawl - Change RPN4UZZV2GZILMYXCEIUZE5GTUZJA4Y5K7GMZBHZOE27M77PX5MQC

Minor type-safety.

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

Created by haranp on July 14, 2007

RPN4UZZV2GZILMYXCEIUZE5GTUZJA4Y5K7GMZBHZOE27M77PX5MQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tags.cc at line 1573 [3.164589]

B:BD[3.209153] → [3.209153:209200]

        env.shop[i].type = unmarshallByte(th);

[3.209153]

[3.209200]

        env.shop[i].type = static_cast<shop_type>(unmarshallByte(th));

Replacement in crawl-ref/source/stash.cc at line 701 [5.147324]

B:BD[4.660] → [4.660:713]

    if ( shoptype_identifies_stock(this->shoptype) )

[4.600]

[2.190]

    if (shoptype_identifies_stock(static_cast<shop_type>(this->shoptype)))

Replacement in crawl-ref/source/stash.cc at line 720 [5.147324]

B:BD[4.924] → [4.924:975]

    if (shoptype_identifies_stock(this->shoptype))

[4.864]

[2.477]

    if (shoptype_identifies_stock(static_cast<shop_type>(this->shoptype)))

Replacement in crawl-ref/source/stash.cc at line 744 [5.147324]

B:BD[2.821] → [2.821:872]

    if (shoptype_identifies_stock(this->shoptype))

[2.821]

[2.872]

    if (shoptype_identifies_stock(static_cast<shop_type>(this->shoptype)))

Replacement in crawl-ref/source/shopping.h at line 31 [3.758673]
B:BD[6.209] → [4.1443:1489]
```
bool shoptype_identifies_stock(int shoptype);
```
[6.209]
[3.759905]
```
bool shoptype_identifies_stock(shop_type type);
```
Replacement in crawl-ref/source/shopping.cc at line 296 [3.759950]
B:BD[3.767120] → [4.2712:2757]
```
bool shoptype_identifies_stock(int shoptype)
```
[3.767120]
[5.194985]
```
bool shoptype_identifies_stock(shop_type type)
```

Replacement in crawl-ref/source/shopping.cc at line 299 [3.759950]

B:BD[4.2769] → [4.2769:2897]

        shoptype != SHOP_WEAPON_ANTIQUE &&
        shoptype != SHOP_ARMOUR_ANTIQUE &&
        shoptype != SHOP_GENERAL_ANTIQUE;

[4.2769]

[5.195039]

        type != SHOP_WEAPON_ANTIQUE &&
        type != SHOP_ARMOUR_ANTIQUE &&
        type != SHOP_GENERAL_ANTIQUE;

Deletion in crawl-ref/source/shopping.cc at line 307 [3.759950]
B:BD[3.768001] → [3.768001:768002]
Replacement in crawl-ref/source/shopping.cc at line 308 [3.759950]
∅:D[7.168761] → [3.768023:768092]
B:BD[3.768023] → [3.768023:768092]
```
    for (int i = strlen(shoppy); i < 80; i++)
        cprintf(" ");
```
[7.168761]
[3.768092]
```
    clear_to_end_of_line();
```
Replacement in crawl-ref/source/externs.h at line 1207 [3.3270163]
B:BD[3.3281415] → [3.3281415:3281445]
```
    unsigned char       type;
```
[3.3281415]
[3.3281445]
```
    shop_type           type;
```

Replacement in crawl-ref/source/dungeon.cc at line 4304 [3.3429798]

B:BD[3.3640553] → [3.3640553:3640697]

    env.shop[i].type = (force_s_type != SHOP_RANDOM) ? force_s_type 
                                                     : random2(NUM_SHOPS);

[3.3640553]

[3.3640697]

    env.shop[i].type = static_cast<shop_type>(
        (force_s_type != SHOP_RANDOM) ? force_s_type 
                                      : random2(NUM_SHOPS));

Minor type-safety.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tags.cc at line 1573 [3.164589]

Replacement in crawl-ref/source/stash.cc at line 701 [5.147324]

Replacement in crawl-ref/source/stash.cc at line 720 [5.147324]

Replacement in crawl-ref/source/stash.cc at line 744 [5.147324]

Replacement in crawl-ref/source/shopping.h at line 31 [3.758673]

Replacement in crawl-ref/source/shopping.cc at line 296 [3.759950]

Replacement in crawl-ref/source/shopping.cc at line 299 [3.759950]

Deletion in crawl-ref/source/shopping.cc at line 307 [3.759950]

Replacement in crawl-ref/source/shopping.cc at line 308 [3.759950]

Replacement in crawl-ref/source/externs.h at line 1207 [3.3270163]

Replacement in crawl-ref/source/dungeon.cc at line 4304 [3.3429798]