fiddlerwoaroof/crawl - Change VDMADGWYGYZJWAEWU3WE7UCPVDS2O6HOHCXLOML64U5UCH4FER3AC

Another smaller clean-up in newgame.cc

Also: switch monster memory for I_INSECT and I_PLANT.

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

Created by j-p-e-g on March 2, 2008

VDMADGWYGYZJWAEWU3WE7UCPVDS2O6HOHCXLOML64U5UCH4FER3AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/newgame.cc at line 979 [4.1132300]

[4.1146359]

[5.6920]

}
static bool species_is_undead( const species_type speci )
{
    return (speci == SP_MUMMY || speci == SP_GHOUL || speci == SP_VAMPIRE);

Insertion in crawl-ref/source/newgame.cc at line 986 [4.1132300]

[4.1146360]

[5.6923]

static undead_state_type get_undead_state(const species_type sp)
{
    switch(sp)
    {
    case SP_MUMMY:
        return US_UNDEAD;
    case SP_GHOUL:
    case SP_VAMPIRE:
        return US_HUNGRY_DEAD;
    default:
        ASSERT(!species_is_undead(sp));
        return (US_ALIVE);
    }
}

Insertion in crawl-ref/source/newgame.cc at line 1058 [4.1132300]
[6.489]
[5.8163]
```
        // repeat until valid race/class combination found
```

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

B:BD[4.1151343] → [5.9324:9385]

B:BD[5.9385] → [7.8729:8933]

    you.is_undead = ((you.species == SP_MUMMY) ? US_UNDEAD :
                     (you.species == SP_GHOUL || you.species == SP_VAMPIRE) ?
                                                 US_HUNGRY_DEAD :
                                                 US_ALIVE);

[4.1151343]

[5.9462]

    you.is_undead = get_undead_state(you.species);

Deletion in crawl-ref/source/newgame.cc at line 1206 [4.1132300]
B:BD[4.1154486] → [4.1154486:1154541]
B:BD[4.1154541] → [7.8934:9010]
∅:D[7.9010] → [4.1154594:1154597]
B:BD[4.1154594] → [4.1154594:1154597]
```
static bool species_is_undead( unsigned char speci )
{
    return (speci == SP_MUMMY || speci == SP_GHOUL || speci == SP_VAMPIRE);
}
```

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

∅:D[8.75007] → [9.385025:385093]

B:BD[9.385025] → [9.385025:385093]

B:BD[9.385093] → [8.75008:75043]

                    Options.prev_book == SBT_RANDOM ? "Random"    :
                    "Buggy Book");

[8.75007]

[8.75043]

                    Options.prev_book == SBT_RANDOM ? "Random"
                                                    : "Buggy Book");

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

B:BD[4.1168452] → [2.2496:2566]

    if ((you.char_class == JOB_GLADIATOR && you.species != SP_KOBOLD)

[4.1168452]

[2.2566]

    if (you.char_class == JOB_GLADIATOR && you.species != SP_KOBOLD

Replacement in crawl-ref/source/newgame.cc at line 3085 [4.1132300]
B:BD[4.1206469] → [10.223884:223956]
B:BD[10.223956] → [11.11141:11157]
```
        int linec = 0;
        char linebuf[200];
        *linebuf = 0;
               
```
[4.1206469]
[11.11157]
```
        int j = 0;
```
Deletion in crawl-ref/source/newgame.cc at line 3099 [4.1132300]
B:BD[10.224242] → [10.224242:224269]
```
            char buf[100];
```
Deletion in crawl-ref/source/newgame.cc at line 3100 [4.1132300]
∅:D[12.4722] → [10.224318:224370]
∅:D[11.11397] → [10.224318:224370]
B:BD[10.224318] → [10.224318:224370]
B:BD[10.224370] → [11.11398:11458]
```
            snprintf(buf, sizeof buf, "%c - %-26s",
                     sletter, species_name(si, 1).c_str());
```

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

B:BD[10.224529] → [11.11481:11498]

∅:D[11.11498] → [10.224529:224739]

B:BD[10.224529] → [10.224529:224739]

                
            strncat(linebuf, buf, sizeof linebuf);
            if (++linec >= 2)
            {
                cprintf("%s" EOL, linebuf);
                *linebuf = 0;
                linec = 0;
            }

[10.224529]

[10.224739]


            cprintf( "%c - %s", sletter, species_name(si,1).c_str() );
            if (j % 2)
                cprintf(EOL);
            else
                cgotoxy(31, wherey());
            j++;

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

B:BD[10.224758] → [10.224758:224817]

        if (linec)
            cprintf("%s" EOL, linebuf);

[10.224758]

[4.1207330]

        if (j % 2)
            cprintf(EOL);

Replacement in crawl-ref/source/newgame.cc at line 3256 [4.1132300]
B:BD[4.1210090] → [13.558:594]
```
    ng_race = randrace? '*' : keyn;
```
[4.1210090]
[11.13545]
```
    ng_race = (randrace? '*' : keyn);
```

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

B:BD[10.228231] → [10.228231:228273]

∅:D[10.228273] → [4.1211084:1211114]

B:BD[4.1211084] → [4.1211084:1211114]

B:BD[4.1211114] → [11.14410:14469]

            
            putch( letter );
            cprintf( " - " );
            cprintf( "%s", get_class_name(get_class(i)) );

[10.228231]

[4.1211156]


            cprintf( "%c - %s", letter, get_class_name(get_class(i)) );

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

B:BD[14.4579] → [14.4579:4643]

                            Options.prev_pr == GOD_ZIN? "Zin" :

[14.4579]

[14.4643]

                            Options.prev_pr == GOD_ZIN?         "Zin" :

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

B:BD[14.4723] → [14.4723:4849]

                            Options.prev_pr == GOD_BEOGH? "Beogh" :
                                               "Random");

[14.4723]

[14.4849]

                            Options.prev_pr == GOD_BEOGH?       "Beogh"
                                                        :       "Random");

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

B:BD[10.231741] → [3.9909:10311]

∅:D[14.5301] → [4.1223810:1223811]

∅:D[3.10311] → [4.1223810:1223811]

∅:D[15.19010] → [4.1223810:1223811]

∅:D[10.232030] → [4.1223810:1223811]

B:BD[4.1223810] → [4.1223810:1223811]

B:BD[4.1223811] → [3.10312:10334]

∅:D[14.5320] → [10.232045:232058]

∅:D[3.10334] → [10.232045:232058]

B:BD[10.232045] → [10.232045:232058]

                    if ((keyn == '\r' || keyn == '\n')
                         && Options.prev_pr != GOD_NO_GOD)
                    {
                         keyn =  Options.prev_pr == GOD_ZIN? 'a' :
                                 Options.prev_pr == GOD_YREDELEMNUL? 'b' :
                                 Options.prev_pr == GOD_BEOGH? 'c' :
                                                  '*';
                    }

Replacement in crawl-ref/source/monstuff.cc at line 2099 [4.1396662]
B:BD[16.10092] → [16.10092:10122]
```
                case I_PLANT:
```
[16.10092]
[16.10122]
```
                case I_INSECT:
```
Replacement in crawl-ref/source/monstuff.cc at line 2102 [4.1396662]
B:BD[16.10196] → [16.10196:10227]
```
                case I_INSECT:
```
[16.10196]
[16.10227]
```
                case I_PLANT:
```

Another smaller clean-up in newgame.cc

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/newgame.cc at line 979 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 986 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1058 [4.1132300]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/monstuff.cc at line 2099 [4.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2102 [4.1396662]