fiddlerwoaroof/crawl - Change NJW656RNYNY7VZVOK52U3U5AVJR2E33N4I4KBEEJY3MZIPG35QCAC

Add miscellaneous minor fixes.

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

Created by dolorous on November 18, 2008

NJW656RNYNY7VZVOK52U3U5AVJR2E33N4I4KBEEJY3MZIPG35QCAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/shopping.cc at line 286 [6.759950]

B:BD[5.2719] → [5.2719:2771]

                      (you.gold == 1) ? "" : "s" );

[5.2719]

[7.2901]

                      you.gold == 1 ? "" : "s" );

Replacement in crawl-ref/source/shopping.cc at line 295 [6.759950]

B:BD[5.3046] → [5.3046:3096]

                      (you.gold == 1) ? "" : "s",

[5.3046]

[5.3096]

                      you.gold == 1 ? "" : "s",

Replacement in crawl-ref/source/shopping.cc at line 306 [6.759950]

B:BD[5.3453] → [5.3453:3503]

                      (you.gold == 1) ? "" : "s",

[5.3453]

[5.3503]

                      you.gold == 1 ? "" : "s",

Replacement in crawl-ref/source/religion.cc at line 2443 [6.804403]

B:BD[4.7233] → [4.7233:7280]

                if (you.penance[GOD_ELYVILON])

[4.7233]

[4.7280]

                if (player_under_penance())

Replacement in crawl-ref/source/religion.cc at line 5718 [6.804403]
B:BD[8.3149] → [8.3149:3172]
```
        if (!you.gold)
```
[8.3149]
[8.3172]
```
        if (you.gold == 0)
```

Replacement in crawl-ref/source/religion.cc at line 5727 [6.804403]

B:BD[8.3371] → [9.5219:5300]

        const int donation_value = (int) (you.gold/200 * log((double)you.gold));

[8.3371]

[8.3438]

        const int donation_value =
            (int)(you.gold / MAX_PIETY * log((double)you.gold));

Deletion in crawl-ref/source/religion.cc at line 5745 [6.804403]
B:BD[10.3085] → [9.5301:5365]
∅:D[9.5365] → [11.3670:3671]
B:BD[10.3143] → [11.3670:3671]
```
        const int estimated_piety = you.piety + donation_value;
```

Replacement in crawl-ref/source/religion.cc at line 5749 [6.804403]

B:BD[12.2768] → [12.2768:2802]

        if (you.penance[GOD_ZIN])

[12.2768]

[12.2802]

        const int estimated_piety = you.piety + you.duration[DUR_PIETY_POOL];
        if (player_under_penance())

Replacement in crawl-ref/source/ouch.cc at line 610 [6.1104358]

B:BD[6.1116170] → [13.4155:4227]

∅:D[13.4227] → [6.1116242:1116272]

B:BD[6.1116242] → [6.1116242:1116272]

    // Because you.experience is unsigned long, if it's going to be -ve
    // must die straightaway.

[6.1116170]

[6.1116272]

    // Because you.experience is unsigned long, if it's going to be
    // negative, must die straightaway.

Replacement in crawl-ref/source/items.cc at line 1503 [6.2584728]

B:BD[2.2681] → [2.2681:2736]

                 you.gold, (you.gold > 1) ? "s" : "");

[2.2681]

[6.2614616]

                 you.gold, you.gold > 1 ? "s" : "");

Replacement in crawl-ref/source/acr.cc at line 2413 [6.4397395]

B:BD[3.3864] → [3.3864:3915]

             you.gold, (you.gold > 1) ? "s" : "");

[3.3864]

[14.3748]

             you.gold, you.gold > 1 ? "s" : "");

Replacement in crawl-ref/source/acr.cc at line 2860 [6.4397395]
∅:D[15.17855] → [8.7042:7085]
B:BD[8.7042] → [8.7042:7085]
```
        if (!you.duration[DUR_PIETY_POOL])
```
[15.17855]
[8.7085]
```
        if (you.duration[DUR_PIETY_POOL] == 0)
```
Deletion in crawl-ref/source/acr.cc at line 2865 [6.4397395]
B:BD[6.4454902] → [15.17856:17857]