fiddlerwoaroof/crawl - Change 52XHD5LKS6UVLXBYUXMPTMVMTXQ6FBUFXJ2TAW6R7CSJY7OXWVJAC

Acquirement retries were useless because the object sub-type was not being

changed, fixed. We should now see the demon of the infinite void a lot less often.

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

Created by dshaligram on July 9, 2007

52XHD5LKS6UVLXBYUXMPTMVMTXQ6FBUFXJ2TAW6R7CSJY7OXWVJAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/skills2.h at line 49 [3.643583]

B:BD[3.645296] → [4.159427:159494]

int best_skill(int min_skill, int max_skill, int excl_skill = -1);

[3.645296]

[3.645398]

skill_type best_skill(int min_skill, int max_skill, int excl_skill = -1);

Replacement in crawl-ref/source/skills2.cc at line 2042 [3.647133]

B:BD[3.735279] → [4.164001:164064]

int best_skill( int min_skill, int max_skill, int excl_skill )

[3.735279]

[3.735408]

skill_type best_skill( int min_skill, int max_skill, int excl_skill )

Replacement in crawl-ref/source/skills2.cc at line 2072 [3.647133]
B:BD[3.736150] → [3.736150:736168]
```
    return (ret);
```
[3.736150]
[3.736168]
```
    return static_cast<skill_type>(ret);
```

Replacement in crawl-ref/source/effects.cc at line 472 [3.3382105]

B:BD[3.3394597] → [5.3816:3875]

bool acquirement(object_class_type force_class, int agent)

[3.3394597]

[3.3394641]

static int find_acquirement_subtype(object_class_type class_wanted,
                                    int &unique)

Replacement in crawl-ref/source/effects.cc at line 475 [3.3382105]
B:BD[3.3394643] → [3.3394643:3394670]
```
    int thing_created = 0;
```
[3.3394643]
[3.3394670]
```
    ASSERT(class_wanted != OBJ_RANDOM);
    
    int type_wanted = OBJ_RANDOM;
```
Deletion in crawl-ref/source/effects.cc at line 480 [3.3382105]
B:BD[3.3394694] → [3.3394694:3394716]
B:BD[3.3394716] → [5.3876:3925]
∅:D[5.3925] → [3.3394761:3394836]
B:BD[3.3394761] → [3.3394761:3394836]
B:BD[3.3394864] → [3.3394864:3394865]
```
    // Remember lava!
    object_class_type class_wanted = OBJ_RANDOM;
    unsigned char type_wanted = OBJ_RANDOM;
    unsigned char unique = 1;
```

Replacement in crawl-ref/source/effects.cc at line 483 [3.3382105]

B:BD[3.3394952] → [3.3394952:3395027]

    char best_spell = 99;
    char best_any = 99;
    unsigned char keyin;

[3.3394952]

[3.3395027]

    skill_type best_spell = SK_NONE;
    skill_type best_any   = SK_NONE;

Deletion in crawl-ref/source/effects.cc at line 491 [3.3382105]

B:BD[3.3395235] → [3.3395235:3395628]


    if (force_class == OBJ_RANDOM)
    {
        mpr("This is a scroll of acquirement!");
      query:
        mpr( "[a|A] Weapon  [b|B] Armour  [c|C] Jewellery      [d|D] Book" );
        mpr( "[e|E] Staff   [f|F] Food    [g|G] Miscellaneous  [h|H] Gold" );
        //mpr("[r|R] - Just give me something good.");
        mpr("What kind of item would you like to acquire? ", MSGCH_PROMPT);

Deletion in crawl-ref/source/effects.cc at line 492 [3.3382105]
B:BD[3.3395629] → [4.938179:938216]
∅:D[4.938216] → [3.3395655:3395656]
B:BD[3.3395655] → [3.3395655:3395656]
B:BD[3.3395656] → [4.938217:938243]
∅:D[4.938243] → [3.3395698:3395738]
B:BD[3.3395698] → [3.3395698:3395738]
B:BD[3.3395738] → [4.938244:938275]
∅:D[4.938275] → [3.3395785:3395824]
B:BD[3.3395785] → [3.3395785:3395824]
B:BD[3.3395824] → [4.938276:938307]
∅:D[4.938307] → [3.3395871:3395913]
B:BD[3.3395871] → [3.3395871:3395913]
B:BD[3.3395913] → [4.938308:938339]
∅:D[4.938339] → [3.3395960:3395998]
B:BD[3.3395960] → [3.3395960:3395998]
B:BD[3.3395998] → [4.938340:938371]
∅:D[4.938371] → [3.3396045:3396084]
B:BD[3.3396045] → [3.3396045:3396084]
B:BD[3.3396084] → [4.938372:938403]
∅:D[4.938403] → [3.3396131:3396168]
B:BD[3.3396131] → [3.3396131:3396168]
B:BD[3.3396168] → [4.938404:938435]
∅:D[4.938435] → [3.3396215:3396258]
B:BD[3.3396215] → [3.3396215:3396258]
B:BD[3.3396258] → [4.938436:938467]
∅:D[4.938467] → [3.3396305:3396394]
B:BD[3.3396305] → [3.3396305:3396394]
```
        keyin = tolower( get_ch() );
        if (keyin == 'a')
            class_wanted = OBJ_WEAPONS;
        else if (keyin == 'b')
            class_wanted = OBJ_ARMOUR;
        else if (keyin == 'c')
            class_wanted = OBJ_JEWELLERY;
        else if (keyin == 'd')
            class_wanted = OBJ_BOOKS;
        else if (keyin == 'e')
            class_wanted = OBJ_STAVES;
        else if (keyin == 'f')
            class_wanted = OBJ_FOOD;
        else if (keyin == 'g')
            class_wanted = OBJ_MISCELLANY;
        else if (keyin == 'h')
            class_wanted = OBJ_GOLD;
    }
    else
        class_wanted = force_class;
```
Deletion in crawl-ref/source/effects.cc at line 1090 [3.3382105]
B:BD[3.3417111] → [3.3417111:3417112]
Replacement in crawl-ref/source/effects.cc at line 1091 [3.3382105]
B:BD[3.3417133] → [3.3417133:3417187]
```
                mesclr();
                goto query;
```
[3.3417133]
[3.3417187]
```
                break;
```

Insertion in crawl-ref/source/effects.cc at line 1099 [3.3382105]

[3.3417335]

[4.941947]

    return (type_wanted);
}
bool acquirement(object_class_type class_wanted, int agent)
{
    int thing_created = 0;
    // Remember lava!
    int type_wanted = OBJ_RANDOM;
    int unique = 1;
    while (class_wanted == OBJ_RANDOM)
    {
        mesclr();
        mpr("This is a scroll of acquirement!");
        mpr( "[a|A] Weapon  [b|B] Armour  [c|C] Jewellery      [d|D] Book" );
        mpr( "[e|E] Staff   [f|F] Food    [g|G] Miscellaneous  [h|H] Gold" );
        mpr("What kind of item would you like to acquire? ", MSGCH_PROMPT);
        const int keyin = tolower( get_ch() );
        if (keyin == 'a')
            class_wanted = OBJ_WEAPONS;
        else if (keyin == 'b')
            class_wanted = OBJ_ARMOUR;
        else if (keyin == 'c')
            class_wanted = OBJ_JEWELLERY;
        else if (keyin == 'd')
            class_wanted = OBJ_BOOKS;
        else if (keyin == 'e')
            class_wanted = OBJ_STAVES;
        else if (keyin == 'f')
            class_wanted = OBJ_FOOD;
        else if (keyin == 'g')
            class_wanted = OBJ_MISCELLANY;
        else if (keyin == 'h')
            class_wanted = OBJ_GOLD;
    }

Replacement in crawl-ref/source/effects.cc at line 1147 [3.3382105]

B:BD[6.16173] → [2.1006:1071]

        for (int item_tries = 0; item_tries < 200; item_tries++)

[6.16173]

[6.16238]

        for (int item_tries = 0; item_tries < 40; item_tries++)

Insertion in crawl-ref/source/effects.cc at line 1149 [3.3382105]

[6.16248]

            unique = 1;
            type_wanted = find_acquirement_subtype(class_wanted, unique);

Acquirement retries were useless because the object sub-type was not being

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/skills2.h at line 49 [3.643583]

Replacement in crawl-ref/source/skills2.cc at line 2042 [3.647133]

Replacement in crawl-ref/source/skills2.cc at line 2072 [3.647133]

Replacement in crawl-ref/source/effects.cc at line 472 [3.3382105]

Replacement in crawl-ref/source/effects.cc at line 475 [3.3382105]

Deletion in crawl-ref/source/effects.cc at line 480 [3.3382105]

Replacement in crawl-ref/source/effects.cc at line 483 [3.3382105]

Deletion in crawl-ref/source/effects.cc at line 491 [3.3382105]

Deletion in crawl-ref/source/effects.cc at line 492 [3.3382105]

Deletion in crawl-ref/source/effects.cc at line 1090 [3.3382105]

Replacement in crawl-ref/source/effects.cc at line 1091 [3.3382105]

Insertion in crawl-ref/source/effects.cc at line 1099 [3.3382105]

Replacement in crawl-ref/source/effects.cc at line 1147 [3.3382105]

Insertion in crawl-ref/source/effects.cc at line 1149 [3.3382105]