fiddlerwoaroof/crawl - Change 7VCVH6XKT4L4PSCBF6XRYV3WQQDVGDMA73RHPV6IOWMQ2S7B5XAQC

Some cleanup (replacing you.duration[DUR_CONF] with you.confused())

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

Created by haranp on October 3, 2008

7VCVH6XKT4L4PSCBF6XRYV3WQQDVGDMA73RHPV6IOWMQ2S7B5XAQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 1064 [5.39949]
B:BD[5.63347] → [6.131:174]
```
    if (kbhit() || you.duration[DUR_CONF])
```
[5.63347]
[5.63376]
```
    if (kbhit() || you.confused())
```
Replacement in crawl-ref/source/traps.cc at line 901 [9.5308]
∅:D[7.1595] → [8.1938:1970]
B:BD[8.1938] → [8.1938:1970]
```
    if (you.duration[DUR_CONF])
```
[7.1595]
[8.1970]
```
    if (you.confused())
```
Replacement in crawl-ref/source/spl-cast.cc at line 634 [12.293070]
∅:D[10.201] → [11.1189:1221]
B:BD[13.127217] → [11.1189:1221]
```
    if (you.duration[DUR_CONF])
```
[10.201]
[14.161]
```
    if (you.confused())
```
Replacement in crawl-ref/source/spl-book.cc at line 1192 [12.397614]
B:BD[12.426672] → [11.1224:1256]
```
    if (you.duration[DUR_CONF])
```
[12.426672]
[15.165]
```
    if (you.confused())
```

Replacement in crawl-ref/source/spells3.cc at line 1241 [12.531613]

B:BD[12.548694] → [11.1565:1632]

    bool is_controlled = (allow_control && !you.duration[DUR_CONF]

[12.548694]

[16.1115]

    bool is_controlled = (allow_control && !you.confused()

Replacement in crawl-ref/source/spells1.cc at line 84 [12.616635]
B:BD[17.6557] → [17.6557:6611]
```
    else if (you.duration[DUR_CONF] && !wizard_blink)
```
[17.6557]
[12.618089]
```
    else if (you.confused() && !wizard_blink)
```
Replacement in crawl-ref/source/spells1.cc at line 220 [12.616635]
∅:D[18.247] → [11.1709:1775]
B:BD[12.620182] → [11.1709:1775]
```
    else if (player_control_teleport() && !you.duration[DUR_CONF]
```
[18.247]
[12.620245]
```
    else if (player_control_teleport() && !you.confused()
```

Replacement in crawl-ref/source/spells1.cc at line 874 [12.616635]

B:BD[19.381] → [19.381:442]

    if (you.disease || you.rotting || you.duration[DUR_CONF]

[19.381]

[19.442]

    if (you.disease || you.rotting || you.confused()

Replacement in crawl-ref/source/player.cc at line 119 [12.962854]
B:BD[20.18050] → [3.2652:2709]
```
    if (cloud != EMPTY_CLOUD && !you.duration[DUR_CONF])
```
[20.18050]
[21.2748]
```
    if (cloud != EMPTY_CLOUD && !you.confused())
```

Replacement in crawl-ref/source/player.cc at line 228 [12.962854]

B:BD[13.339629] → [11.4112:4174]

            if (stepped && !force && !you.duration[DUR_CONF])

[13.339629]

[13.339677]

            if (stepped && !force && !you.confused())

Replacement in crawl-ref/source/player.cc at line 3547 [12.962854]
B:BD[12.1028262] → [11.4810:4842]
```
    if (you.duration[DUR_CONF])
```
[12.1028262]
[12.1028280]
```
    if (you.confused())
```
Replacement in crawl-ref/source/player.cc at line 3857 [12.962854]
B:BD[12.1033479] → [11.4922:4954]
```
    if (you.duration[DUR_CONF])
```
[12.1033479]
[4.3374]
```
    if (you.confused())
```
Replacement in crawl-ref/source/output.cc at line 684 [12.1088282]
B:BD[22.12823] → [22.12823:12855]
```
    if (you.duration[DUR_CONF])
```
[12.1095926]
[22.12855]
```
    if (you.confused())
```
Replacement in crawl-ref/source/output.cc at line 2135 [12.1088282]
B:BD[23.4658] → [11.9035:9067]
```
    if (you.duration[DUR_CONF])
```
[23.4658]
[23.4676]
```
    if (you.confused())
```
Replacement in crawl-ref/source/output.cc at line 2141 [12.1088282]
∅:D[24.807] → [11.9068:9105]
∅:D[25.5529] → [11.9068:9105]
B:BD[23.4707] → [11.9068:9105]
```
    if (you.duration[DUR_PARALYSIS])
```
[25.5529]
[23.4730]
```
    if (you.paralysed())
```
Replacement in crawl-ref/source/misc.cc at line 1490 [12.1933596]
B:BD[26.1917] → [27.18770:18804]
```
        && you.duration[DUR_CONF]
```
[26.1917]
[2.2586]
```
        && you.confused()
```
Replacement in crawl-ref/source/misc.cc at line 1926 [12.1933596]
B:BD[26.2158] → [27.19039:19073]
```
        && you.duration[DUR_CONF]
```
[26.2158]
[28.4993]
```
        && you.confused()
```
Replacement in crawl-ref/source/item_use.cc at line 1918 [12.2781507]
B:BD[29.5031] → [29.5031:5077]
```
    if (!teleport && !you.duration[DUR_CONF])
```
[29.5031]
[29.5077]
```
    if (!teleport && !you.confused())
```
Replacement in crawl-ref/source/item_use.cc at line 1967 [12.2781507]
B:BD[13.742223] → [11.11503:11535]
```
    if (you.duration[DUR_CONF])
```
[13.742223]
[12.2813417]
```
    if (you.confused())
```
Replacement in crawl-ref/source/item_use.cc at line 3520 [12.2781507]
∅:D[30.11615] → [11.11857:11889]
B:BD[12.2842441] → [11.11857:11889]
```
    if (you.duration[DUR_CONF])
```
[30.11615]
[12.2842459]
```
    if (you.confused())
```

Replacement in crawl-ref/source/item_use.cc at line 4349 [12.2781507]

B:BD[31.16023] → [31.16023:16094]

        && (which_scroll != SCR_IMMOLATION || you.duration[DUR_CONF]))

[31.16023]

[12.2859994]

        && (which_scroll != SCR_IMMOLATION || you.confused()))

Replacement in crawl-ref/source/item_use.cc at line 4361 [12.2781507]
B:BD[12.2860236] → [11.11966:12002]
```
        if (you.duration[DUR_CONF])
```
[12.2860236]
[12.2860258]
```
        if (you.confused())
```
Deletion in crawl-ref/source/it_use3.cc at line 732 [12.2870456]
B:BD[12.2892797] → [12.2892797:2892814]
```
    int use = 0;
```

Replacement in crawl-ref/source/it_use3.cc at line 736 [12.2870456]

B:BD[12.2892882] → [32.8649:8775]

    use = (!you.duration[DUR_CONF] ? random2(you.skills[SK_EVOCATIONS] * 6)
                                   : random2(5));

[12.2892882]

[12.2892961]

    int use = (!you.confused() ? random2(you.skills[SK_EVOCATIONS] * 6)
                               : random2(5));

Deletion in crawl-ref/source/it_use3.cc at line 1018 [12.2870456]
B:BD[12.2901489] → [12.2901489:2901533]
```
    int use = 0;
    int proportional = 0;
```

Replacement in crawl-ref/source/it_use3.cc at line 1022 [12.2870456]

B:BD[12.2901601] → [11.12213:12306]

    use = ((!you.duration[DUR_CONF]) ? random2(you.skills[SK_EVOCATIONS] * 6) : random2(6));

[12.2901601]

[12.2901680]

    int use = ((!you.confused()) ? random2(you.skills[SK_EVOCATIONS] * 6)
                                 : random2(6));

Replacement in crawl-ref/source/it_use3.cc at line 1041 [12.2870456]

B:BD[12.2902073] → [12.2902073:2902166]

        proportional = you.magic_points * 100;
        proportional /= you.max_magic_points;

[12.2902073]

[12.2902166]

        int proportional = (you.magic_points * 100) / you.max_magic_points;

Replacement in crawl-ref/source/fight.cc at line 4092 [12.3140790]

B:BD[33.6712] → [34.4311:4375]

    if (!you.received_weapon_warning && !you.duration[DUR_CONF]

[33.6712]

[35.7029]

    if (!you.received_weapon_warning && !you.confused()

Replacement in crawl-ref/source/beam.cc at line 580 [12.4128068]
B:BD[36.7789] → [36.7789:7821]
```
    if (you.duration[DUR_CONF])
```
[36.7789]
[37.8559]
```
    if (you.confused())
```
Insertion in crawl-ref/source/acr.cc at line 677 [12.4397395]
[38.23223]
[39.6230]
```
        set_mp( you.max_magic_points, false);
```

Replacement in crawl-ref/source/acr.cc at line 1649 [12.4397395]

B:BD[40.3273] → [40.3273:3334]

    if (you.duration[DUR_BEHELD] && !you.duration[DUR_CONF])

[40.3273]

[40.3334]

    if (you.duration[DUR_BEHELD] && !you.confused())

Replacement in crawl-ref/source/acr.cc at line 3464 [12.4397395]

B:BD[41.3462] → [42.106872:106943]

    if ((!check_confused || !you.duration[DUR_CONF]) && move.origin())

[41.3462]

[41.3547]

    if ((!check_confused || !you.confused()) && move.origin())

Replacement in crawl-ref/source/acr.cc at line 3473 [12.4397395]
∅:D[41.3713] → [11.19444:19515]
B:BD[12.4464655] → [11.19444:19515]
```
    if (check_confused && you.duration[DUR_CONF] && !one_chance_in(3))
```
[41.3713]
[13.1279467]
```
    if (check_confused && you.confused() && !one_chance_in(3))
```
Replacement in crawl-ref/source/acr.cc at line 3646 [12.4397395]
B:BD[41.3768] → [42.108129:108179]
```
    if (!you.duration[DUR_CONF] && move.origin())
```
[41.3768]
[41.3824]
```
    if (!you.confused() && move.origin())
```
Replacement in crawl-ref/source/acr.cc at line 3661 [12.4397395]
B:BD[12.4466711] → [41.4157:4210]
```
    if (you.duration[DUR_CONF] && !one_chance_in(3))
```
[12.4466711]
[41.4210]
```
    if (you.confused() && !one_chance_in(3))
```
Replacement in crawl-ref/source/acr.cc at line 4049 [12.4397395]
∅:D[20.65864] → [11.19983:20015]
B:BD[12.4473080] → [11.19983:20015]
```
    if (you.duration[DUR_CONF])
```
[20.65864]
[12.4473131]
```
    if (you.confused())
```
Replacement in crawl-ref/source/acr.cc at line 4080 [12.4397395]
∅:D[43.3112] → [44.18908:18974]
∅:D[45.3356] → [44.18908:18974]
∅:D[46.3487] → [44.18908:18974]
B:BD[44.18908] → [44.18908:18974]
```
                                       && !you.duration[DUR_CONF]
```
[46.3487]
[20.66299]
```
                                       && !you.confused()
```
Replacement in crawl-ref/source/acr.cc at line 4087 [12.4397395]
∅:D[38.25548] → [47.2850:2911]
∅:D[20.66459] → [47.2850:2911]
B:BD[48.11088] → [47.2850:2911]
```
    if (you.duration[DUR_BEHELD] && !you.duration[DUR_CONF])
```
[20.66459]
[45.3357]
```
    if (you.duration[DUR_BEHELD] && !you.confused())
```

Replacement in crawl-ref/source/abl-show.cc at line 445 [12.4494389]

B:BD[49.5255] → [11.20125:20202]

        if (you.duration[DUR_CONF] && !testbits(abil.flags, ABFLAG_CONF_OK))

[49.5255]

[5.553318]

        if (you.confused() && !testbits(abil.flags, ABFLAG_CONF_OK))

Replacement in crawl-ref/source/abl-show.cc at line 859 [12.4494389]
B:BD[50.6464] → [51.8660:8692]
```
    if (you.duration[DUR_CONF])
```
[50.6464]
[12.4506807]
```
    if (you.confused())
```

Some cleanup (replacing you.duration[DUR_CONF] with you.confused())

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/travel.cc at line 1064 [5.39949]

Replacement in crawl-ref/source/traps.cc at line 901 [9.5308]

Replacement in crawl-ref/source/spl-cast.cc at line 634 [12.293070]

Replacement in crawl-ref/source/spl-book.cc at line 1192 [12.397614]

Replacement in crawl-ref/source/spells3.cc at line 1241 [12.531613]

Replacement in crawl-ref/source/spells1.cc at line 84 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 220 [12.616635]

Replacement in crawl-ref/source/spells1.cc at line 874 [12.616635]

Replacement in crawl-ref/source/player.cc at line 119 [12.962854]

Replacement in crawl-ref/source/player.cc at line 228 [12.962854]

Replacement in crawl-ref/source/player.cc at line 3547 [12.962854]

Replacement in crawl-ref/source/player.cc at line 3857 [12.962854]

Replacement in crawl-ref/source/output.cc at line 684 [12.1088282]

Replacement in crawl-ref/source/output.cc at line 2135 [12.1088282]

Replacement in crawl-ref/source/output.cc at line 2141 [12.1088282]

Replacement in crawl-ref/source/misc.cc at line 1490 [12.1933596]

Replacement in crawl-ref/source/misc.cc at line 1926 [12.1933596]

Replacement in crawl-ref/source/item_use.cc at line 1918 [12.2781507]

Replacement in crawl-ref/source/item_use.cc at line 1967 [12.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3520 [12.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4349 [12.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4361 [12.2781507]

Deletion in crawl-ref/source/it_use3.cc at line 732 [12.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 736 [12.2870456]

Deletion in crawl-ref/source/it_use3.cc at line 1018 [12.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 1022 [12.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 1041 [12.2870456]

Replacement in crawl-ref/source/fight.cc at line 4092 [12.3140790]

Replacement in crawl-ref/source/beam.cc at line 580 [12.4128068]

Insertion in crawl-ref/source/acr.cc at line 677 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 1649 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 3464 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 3473 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 3646 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 3661 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 4049 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 4080 [12.4397395]

Replacement in crawl-ref/source/acr.cc at line 4087 [12.4397395]

Replacement in crawl-ref/source/abl-show.cc at line 445 [12.4494389]

Replacement in crawl-ref/source/abl-show.cc at line 859 [12.4494389]