fiddlerwoaroof/crawl - Change FEMG2L5AKPPUVYNAHL4KSFP577SRC67O7PFZKKPIXWRSFN7XNJNQC

Add minor cosmetic fixes.

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

Created by dolorous on July 18, 2009

FEMG2L5AKPPUVYNAHL4KSFP577SRC67O7PFZKKPIXWRSFN7XNJNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/newgame.cc at line 93 [4.1132300]

B:BD[4.1136229] → [5.14210:14372]

static void _give_random_potion( int slot );
static void _give_random_secondary_armour( int slot );
static bool _give_wanderer_weapon( int slot, int wpn_skill );

[4.1136229]

[5.14372]

static void _give_random_potion(int slot);
static void _give_random_secondary_armour(int slot);
static bool _give_wanderer_weapon(int slot, int wpn_skill);

Replacement in crawl-ref/source/newgame.cc at line 907 [4.1132300]
∅:D[6.574] → [7.193:257]
∅:D[3.3234] → [7.193:257]
∅:D[8.4831] → [7.193:257]
B:BD[9.5304] → [7.193:257]
```
                    set_equip_race( you.inv[i], ISFLAG_ELVEN );
```
[3.3234]
[3.3235]
```
                    set_equip_race(you.inv[i], ISFLAG_ELVEN);
```

Replacement in crawl-ref/source/newgame.cc at line 910 [4.1132300]

∅:D[6.599] → [7.258:324]

∅:D[8.4886] → [7.258:324]

B:BD[9.5472] → [7.258:324]

                    set_equip_race( you.inv[i], ISFLAG_DWARVEN );

[8.4886]

[8.4887]

                    set_equip_race(you.inv[i], ISFLAG_DWARVEN);

Replacement in crawl-ref/source/newgame.cc at line 912 [4.1132300]
∅:D[6.624] → [9.5600:5665]
∅:D[8.4940] → [9.5600:5665]
B:BD[9.5600] → [9.5600:5665]
```
                    set_equip_race( you.inv[i], ISFLAG_ORCISH );
```
[8.4940]
[9.5710]
```
                    set_equip_race(you.inv[i], ISFLAG_ORCISH);
```
Replacement in crawl-ref/source/newgame.cc at line 3337 [4.1132300]
B:BD[4.1189085] → [5.20391:20435]
```
static void _give_random_potion( int slot )
```
[4.1189085]
[4.1189567]
```
static void _give_random_potion(int slot)
```
Replacement in crawl-ref/source/newgame.cc at line 3358 [4.1132300]
B:BD[4.1189776] → [4.1189776:1189824]
```
        you.inv[ slot ].sub_type = POT_HEALING;
```
[4.1189776]
[4.1189824]
```
        you.inv[slot].sub_type = POT_HEALING;
```
Replacement in crawl-ref/source/newgame.cc at line 3362 [4.1132300]
B:BD[4.1189863] → [4.1189863:1189915]
```
        you.inv[ slot ].sub_type = POT_HEAL_WOUNDS;
```
[4.1189863]
[4.1189915]
```
        you.inv[slot].sub_type = POT_HEAL_WOUNDS;
```
Replacement in crawl-ref/source/newgame.cc at line 3365 [4.1132300]
B:BD[4.1189942] → [4.1189942:1189988]
```
        you.inv[ slot ].sub_type = POT_SPEED;
```
[4.1189942]
[4.1189988]
```
        you.inv[slot].sub_type = POT_SPEED;
```
Replacement in crawl-ref/source/newgame.cc at line 3368 [4.1132300]
B:BD[4.1190015] → [4.1190015:1190061]
```
        you.inv[ slot ].sub_type = POT_MIGHT;
```
[4.1190015]
[4.1190061]
```
        you.inv[slot].sub_type = POT_MIGHT;
```
Replacement in crawl-ref/source/newgame.cc at line 3371 [4.1132300]
B:BD[4.1190088] → [4.1190088:1190141]
```
        you.inv[ slot ].sub_type = POT_BERSERK_RAGE;
```
[4.1190088]
[4.1190141]
```
        you.inv[slot].sub_type = POT_BERSERK_RAGE;
```
Replacement in crawl-ref/source/newgame.cc at line 3376 [4.1132300]
B:BD[4.1190165] → [5.20436:20490]
```
static void _give_random_secondary_armour( int slot )
```
[4.1190165]
[4.1191045]
```
static void _give_random_secondary_armour(int slot)
```

Replacement in crawl-ref/source/newgame.cc at line 3378 [4.1132300]

B:BD[4.1191047] → [10.7987:8022]

∅:D[10.8022] → [4.1191081:1191125]

B:BD[4.1191081] → [4.1191081:1191125]

B:BD[4.1191125] → [10.8023:8128]

    you.inv[ slot ].quantity  = 1;
    you.inv[ slot ].base_type = OBJ_ARMOUR;
    you.inv[ slot ].special   = 0;
    you.inv[ slot ].plus      = 0;
    you.inv[ slot ].plus2     = 0;

[4.1191047]

[4.1191255]

    you.inv[slot].quantity  = 1;
    you.inv[slot].base_type = OBJ_ARMOUR;
    you.inv[slot].special   = 0;
    you.inv[slot].plus      = 0;
    you.inv[slot].plus2     = 0;

Replacement in crawl-ref/source/newgame.cc at line 3389 [4.1132300]

B:BD[2.201] → [2.201:251]

            you.inv[ slot ].sub_type = ARM_BOOTS;

[2.201]

[2.251]

            you.inv[slot].sub_type = ARM_BOOTS;

Replacement in crawl-ref/source/newgame.cc at line 3397 [4.1132300]

B:BD[2.313] → [2.313:364]

            you.inv[ slot ].sub_type = ARM_HELMET;

[2.313]

[2.364]

            you.inv[slot].sub_type = ARM_HELMET;

Replacement in crawl-ref/source/newgame.cc at line 3405 [4.1132300]

B:BD[2.427] → [2.427:478]

            you.inv[ slot ].sub_type = ARM_GLOVES;

[2.427]

[2.478]

            you.inv[slot].sub_type = ARM_GLOVES;

Replacement in crawl-ref/source/newgame.cc at line 3411 [4.1132300]
∅:D[8.19932] → [11.2205:2251]
B:BD[11.2205] → [11.2205:2251]
```
        you.inv[ slot ].sub_type = ARM_CLOAK;
```
[8.19932]
[11.2251]
```
        you.inv[slot].sub_type = ARM_CLOAK;
```
Replacement in crawl-ref/source/newgame.cc at line 3418 [4.1132300]
∅:D[10.8174] → [5.20491:20552]
B:BD[4.1191779] → [5.20491:20552]
```
static bool _give_wanderer_weapon( int slot, int wpn_skill )
```
[10.8174]
[4.1191839]
```
static bool _give_wanderer_weapon(int slot, int wpn_skill)
```
Replacement in crawl-ref/source/newgame.cc at line 3422 [4.1132300]
B:BD[4.1191864] → [4.1191864:1191915]
```
    // Slot's always zero, but we pass it anyways.
```
[4.1191864]
[4.1191915]
```
    // Slot's always zero, but we pass it anyway.
```

Replacement in crawl-ref/source/newgame.cc at line 3426 [4.1132300]

B:BD[4.1192025] → [10.8175:8210]

∅:D[10.8210] → [4.1192059:1192104]

B:BD[4.1192059] → [4.1192059:1192104]

B:BD[4.1192104] → [10.8211:8316]

    you.inv[ slot ].quantity  = 1;
    you.inv[ slot ].base_type = OBJ_WEAPONS;
    you.inv[ slot ].plus      = 0;
    you.inv[ slot ].plus2     = 0;
    you.inv[ slot ].special   = 0;

[4.1192025]

[4.1192238]

    you.inv[slot].quantity  = 1;
    you.inv[slot].base_type = OBJ_WEAPONS;
    you.inv[slot].plus      = 0;
    you.inv[slot].plus2     = 0;
    you.inv[slot].special   = 0;

Replacement in crawl-ref/source/newgame.cc at line 3436 [4.1132300]
B:BD[4.1192356] → [4.1192356:1192401]
```
        you.inv[ slot ].sub_type = WPN_CLUB;
```
[4.1192356]
[4.1192441]
```
        you.inv[slot].sub_type = WPN_CLUB;
```
Replacement in crawl-ref/source/newgame.cc at line 3440 [4.1132300]
B:BD[4.1192479] → [4.1192479:1192525]
```
        you.inv[ slot ].sub_type = WPN_SPEAR;
```
[4.1192479]
[4.1192525]
```
        you.inv[slot].sub_type = WPN_SPEAR;
```
Replacement in crawl-ref/source/newgame.cc at line 3444 [4.1132300]
B:BD[4.1192567] → [4.1192567:1192614]
```
        you.inv[ slot ].sub_type = WPN_DAGGER;
```
[4.1192567]
[4.1192614]
```
        you.inv[slot].sub_type = WPN_DAGGER;
```
Replacement in crawl-ref/source/newgame.cc at line 3448 [4.1132300]
B:BD[4.1192648] → [4.1192648:1192697]
```
        you.inv[ slot ].sub_type = WPN_HAND_AXE;
```
[4.1192648]
[4.1192697]
```
        you.inv[slot].sub_type = WPN_HAND_AXE;
```
Replacement in crawl-ref/source/newgame.cc at line 3453 [4.1132300]
B:BD[4.1192753] → [4.1192753:1192806]
```
        you.inv[ slot ].sub_type = WPN_QUARTERSTAFF;
```
[4.1192753]
[4.1192846]
```
        you.inv[slot].sub_type = WPN_QUARTERSTAFF;
```

Replacement in crawl-ref/source/newgame.cc at line 3462 [4.1132300]

B:BD[4.1193100] → [8.20069:20145]

∅:D[8.20145] → [4.1193175:1193227]

B:BD[4.1193175] → [4.1193175:1193227]

        // We default here if the character only has fighting skill. -- bwr
        you.inv[ slot ].sub_type = WPN_SHORT_SWORD;

[4.1193100]

[4.1193227]

        // We default here if the character only has fighting skill. - bwr
        you.inv[slot].sub_type = WPN_SHORT_SWORD;

Deletion in crawl-ref/source/newgame.cc at line 3552 [4.1132300]
∅:D[12.453] → [4.1193290:1193293]
∅:D[13.902] → [4.1193290:1193293]
B:BD[4.1193290] → [4.1193290:1193293]
```
//
```
Replacement in crawl-ref/source/newgame.cc at line 3560 [4.1132300]
B:BD[4.1193780] → [4.1193780:1193783]
B:BD[4.1193783] → [5.20896:20933]
```
//
static void _create_wanderer( void )
```
[4.1193780]
[4.1193819]
```
static void _create_wanderer(void)
```
Deletion in crawl-ref/source/newgame.cc at line 3605 [4.1132300]
B:BD[4.1196056] → [4.1196056:1196066]
```
        {
```
Deletion in crawl-ref/source/newgame.cc at line 3606 [4.1132300]
∅:D[14.678] → [4.1196114:1196124]
B:BD[4.1196114] → [4.1196114:1196124]
```
        }
```
Deletion in crawl-ref/source/newgame.cc at line 3614 [4.1132300]
B:BD[4.1196285] → [4.1196285:1196295]
```
        {
```
Deletion in crawl-ref/source/newgame.cc at line 3615 [4.1132300]
∅:D[14.805] → [4.1196349:1196359]
B:BD[4.1196349] → [4.1196349:1196359]
```
        }
```

Replacement in crawl-ref/source/newgame.cc at line 3620 [4.1132300]

B:BD[4.1196483] → [4.1196483:1196546]

B:BD[4.1196546] → [8.20297:20344]

    // Spell skills are possible past this point, but we won't
    // allow two levels of any of them. -- bwr

[4.1196483]

[4.1196592]

    // Spell skills are possible past this point, but we won't allow two
    // levels of any of them. - bwr

Deletion in crawl-ref/source/newgame.cc at line 3625 [4.1132300]
B:BD[4.1196641] → [4.1196641:1196651]
```
        {
```
Deletion in crawl-ref/source/newgame.cc at line 3626 [4.1132300]
∅:D[14.930] → [4.1196703:1196713]
B:BD[4.1196703] → [4.1196703:1196713]
```
        }
```
Deletion in crawl-ref/source/newgame.cc at line 3635 [4.1132300]
B:BD[4.1197008] → [4.1197008:1197018]
```
        {
```
Deletion in crawl-ref/source/newgame.cc at line 3636 [4.1132300]
∅:D[14.1120] → [4.1197065:1197075]
B:BD[4.1197065] → [4.1197065:1197075]
```
        }
```

Replacement in crawl-ref/source/newgame.cc at line 3643 [4.1132300]

B:BD[4.1197374] → [4.1197374:1197441]

    if (you.species == SP_DEMIGOD && you.skills[ SK_INVOCATIONS ])

[4.1197374]

[4.1197441]

    if (you.species == SP_DEMIGOD && you.skills[SK_INVOCATIONS])

Deletion in crawl-ref/source/newgame.cc at line 3646 [4.1132300]
B:BD[4.1197501] → [4.1197501:1197511]
```
        {
```
Deletion in crawl-ref/source/newgame.cc at line 3647 [4.1132300]
∅:D[14.1310] → [4.1197558:1197568]
B:BD[4.1197558] → [4.1197558:1197568]
```
        }
```

Replacement in crawl-ref/source/newgame.cc at line 3654 [4.1132300]

B:BD[15.3540] → [15.3540:3606]

    if (you.skills[ SK_ARMOUR ] && !you_can_wear(EQ_BODY_ARMOUR))

[15.3540]

[16.2099]

    if (you.skills[SK_ARMOUR] && !you_can_wear(EQ_BODY_ARMOUR))

Deletion in crawl-ref/source/newgame.cc at line 3657 [4.1132300]
B:BD[16.2154] → [16.2154:2164]
```
        {
```
Deletion in crawl-ref/source/newgame.cc at line 3658 [4.1132300]
∅:D[14.1496] → [16.2211:2221]
B:BD[16.2211] → [16.2211:2221]
```
        }
```
Deletion in crawl-ref/source/newgame.cc at line 3730 [4.1132300]
B:BD[4.1200761] → [4.1200761:1200771]
```
        {
```
Deletion in crawl-ref/source/newgame.cc at line 3731 [4.1132300]
∅:D[5.21196] → [4.1200816:1200826]
B:BD[4.1200816] → [4.1200816:1200826]
```
        }
```
Replacement in crawl-ref/source/newgame.cc at line 3733 [4.1132300]
∅:D[17.5124] → [5.21197:21248]
∅:D[8.20738] → [5.21197:21248]
B:BD[4.1200877] → [5.21197:21248]
```
        if (_give_wanderer_weapon( 0, wpn_skill ))
```
[8.20738]
[4.1200927]
```
        if (_give_wanderer_weapon(0, wpn_skill))
```
Replacement in crawl-ref/source/newgame.cc at line 3739 [4.1132300]
B:BD[4.1205763] → [5.21249:21296]
```
        _give_wanderer_weapon( 0, wpn_skill );
```
[4.1205763]
[5.21296]
```
        _give_wanderer_weapon(0, wpn_skill);
```

Add minor cosmetic fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/newgame.cc at line 93 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 907 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 910 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 912 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3337 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3358 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3362 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3365 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3368 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3371 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3376 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3378 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3389 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3397 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3405 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3411 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3418 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3422 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3426 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3436 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3440 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3444 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3448 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3453 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3462 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3552 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3560 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3605 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3606 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3614 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3615 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3620 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3625 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3626 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3635 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3636 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3643 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3646 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3647 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3654 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3657 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3658 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3730 [4.1132300]

Deletion in crawl-ref/source/newgame.cc at line 3731 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3733 [4.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3739 [4.1132300]