fiddlerwoaroof/crawl - Change LIPV45VFEODRZ36S44VG5YGTCROJWTQ5QDGYP3C7MG2I4F52VKPQC

[2773135] Fixing bug where Options.weapon could specify a weapon that was not an available option for the character.

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

Created by ennewalker on April 19, 2009

LIPV45VFEODRZ36S44VG5YGTCROJWTQ5QDGYP3C7MG2I4F52VKPQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/newgame.cc at line 2382 [3.1132300]

B:BD[3.1168769] → [3.1168769:1168839]

B:BD[3.1168839] → [2.4498:4559]

    if (Options.weapon != WPN_UNKNOWN && Options.weapon != WPN_RANDOM
        && (Options.weapon != WPN_UNARMED || claws_allowed))

[3.1168769]

[3.1168903]

    if (Options.weapon == WPN_UNARMED && claws_allowed)

Replacement in crawl-ref/source/newgame.cc at line 2384 [3.1132300]

B:BD[3.1168909] → [2.4560:4717]

        if (Options.weapon == WPN_UNARMED)
            you.inv[0].quantity = 0; // no weapon
        else
            you.inv[0].sub_type = Options.weapon;

[3.1168909]

[4.217045]

        you.inv[0].quantity = 0; // no weapon

Insertion in crawl-ref/source/newgame.cc at line 2389 [3.1132300]

[3.1168978]

[2.4718]

    if (Options.weapon != WPN_UNKNOWN && Options.weapon != WPN_RANDOM
        && Options.weapon != WPN_UNARMED)
    {
        // If Options.weapon is available, then use it.
        for (int i = 0; i < num_choices; i++)
        {
            if (startwep[i] == Options.weapon
                && startwep_restrictions[i] != CC_BANNED)
            {
                you.inv[0].sub_type = Options.weapon;
                ng_weapon = Options.weapon;
                return (true);
            }
        }
    }