fiddlerwoaroof/crawl - Change 5L4JYB3F4PNEU2GYNP7RY4YAKYXW7PYS36KYJNVHRGUFQVTEGDEAC

FR 2533562: Move the CRAWL_PIZZA / -pizza options into the init file

so that they're more easily accessible in hosted games.

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

Created by nlanza on February 26, 2009

5L4JYB3F4PNEU2GYNP7RY4YAKYXW7PYS36KYJNVHRGUFQVTEGDEAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/initfile.h at line 54 [5.2956146]
B:BD[4.91610] → [4.91610:91639]
```
    std::string crawl_pizza;
```
Replacement in crawl-ref/source/initfile.cc at line 858 [5.2957258]
∅:D[6.377] → [5.2965761:2965762]
∅:D[7.4633] → [5.2965761:2965762]
∅:D[8.794758] → [5.2965761:2965762]
B:BD[5.2965761] → [5.2965761:2965762]
[7.4633]
[8.794830]
```
    
    pizza.clear();
    
```

Insertion in crawl-ref/source/initfile.cc at line 2296 [5.2957258]

[9.1040]

[10.8098]

    else if (key == "pizza")
    {
        // field is already cleaned up from trim_string()
        pizza = field;
    }

Deletion in crawl-ref/source/initfile.cc at line 3322 [5.2957258]
∅:D[11.1290] → [5.2980966:2980993]
B:BD[5.2980966] → [5.2980966:2980993]
B:BD[5.2980993] → [11.1291:1355]
```
    // The player's pizza
    SysEnv.crawl_pizza = check_string( getenv("CRAWL_PIZZA") );
```
Deletion in crawl-ref/source/initfile.cc at line 3366 [5.2957258]
B:BD[12.279] → [12.279:294]
```
    CLO_PIZZA,
```

Replacement in crawl-ref/source/initfile.cc at line 3382 [5.2957258]

B:BD[13.10196] → [13.10196:10266]

    "scores", "name", "race", "class", "pizza", "plain", "dir", "rc",

[13.10196]

[13.10266]

    "scores", "name", "race", "class", "plain", "dir", "rc",

Deletion in crawl-ref/source/initfile.cc at line 3572 [5.2957258]

B:BD[5.2985150] → [5.2985150:2985199]

B:BD[5.2985199] → [12.957:981]

∅:D[12.981] → [5.2985236:2985375]

B:BD[5.2985236] → [5.2985236:2985375]

            nextUsed = true;
            break;
        case CLO_PIZZA:
            if (!next_is_param)
                return (false);
            if (!rc_only)
                SysEnv.crawl_pizza = next_arg;

Replacement in crawl-ref/source/food.cc at line 2100 [5.3043806]

B:BD[3.21411] → [3.21411:21533]

        if (!SysEnv.crawl_pizza.empty() && !one_chance_in(3))
            mprf("Mmm... %s.", SysEnv.crawl_pizza.c_str());

[3.21411]

[3.21533]

        if (!Options.pizza.empty() && !one_chance_in(3))
            mprf("Mmm... %s.", Options.pizza.c_str());

Insertion in crawl-ref/source/externs.h at line 2025 [5.3270163]
[14.7347]
[5.3285596]
```
    std::string pizza;
    
```
Deletion in crawl-ref/source/acr.cc at line 297 [5.4397395]
B:BD[15.2298] → [15.2298:2342]
```
    puts("  -pizza <string>  crawl pizza");
```

Replacement in crawl-ref/source/acr.cc at line 305 [5.4397395]

B:BD[15.2725] → [15.2725:2806]

    puts("environment options (CRAWL_NAME, CRAWL_PIZZA, CRAWL_DIR, CRAWL_RC).");

[15.2725]

[15.2806]

    puts("environment options (CRAWL_NAME, CRAWL_DIR, CRAWL_RC).");

Insertion in crawl-ref/settings/init.txt at line 389 [5.4830895]
[16.5908]
[17.7907]
```
#
# pizza            = Sausage
```
Replacement in crawl-ref/docs/options_guide.txt at line 112 [16.63392]
∅:D[2.4103] → [18.3689:3738]
B:BD[18.3689] → [18.3689:3738]
```
                cset_unicode, feature, mon_glyph
```
[2.4103]
[18.3738]
```
                cset_unicode, feature, mon_glyph, pizza
```
Insertion in crawl-ref/docs/options_guide.txt at line 1980 [16.63392]
[19.44208]
[20.44794]
```
pizza = <topping name>
        The player's choice of pizza topping.
```
Insertion in crawl-ref/docs/options_guide.txt at line 1984 [16.63392]
[20.44795]
[21.28347]
Deletion in crawl-ref/docs/crawl.6 at line 10 [5.5002325]
B:BD[5.5002503] → [5.5002503:5002521]
```
[-pizza <string>]
```
Deletion in crawl-ref/docs/crawl.6 at line 37 [5.5002325]
B:BD[5.5003328] → [5.5003328:5003366]
```
.TP
\fB-pizza\fR <string>
crawl pizza
```
Deletion in crawl-ref/docs/crawl.6 at line 1033 [5.5002325]
B:BD[5.5050863] → [5.5050863:5050909]
```
.IP CRAWL_PIZZA
Your favourite pizza topping.
```

FR 2533562: Move the CRAWL_PIZZA / -pizza options into the init file

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/initfile.h at line 54 [5.2956146]

Replacement in crawl-ref/source/initfile.cc at line 858 [5.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2296 [5.2957258]

Deletion in crawl-ref/source/initfile.cc at line 3322 [5.2957258]

Deletion in crawl-ref/source/initfile.cc at line 3366 [5.2957258]

Replacement in crawl-ref/source/initfile.cc at line 3382 [5.2957258]

Deletion in crawl-ref/source/initfile.cc at line 3572 [5.2957258]

Replacement in crawl-ref/source/food.cc at line 2100 [5.3043806]

Insertion in crawl-ref/source/externs.h at line 2025 [5.3270163]

Deletion in crawl-ref/source/acr.cc at line 297 [5.4397395]

Replacement in crawl-ref/source/acr.cc at line 305 [5.4397395]

Insertion in crawl-ref/settings/init.txt at line 389 [5.4830895]

Replacement in crawl-ref/docs/options_guide.txt at line 112 [16.63392]

Insertion in crawl-ref/docs/options_guide.txt at line 1980 [16.63392]

Insertion in crawl-ref/docs/options_guide.txt at line 1984 [16.63392]

Deletion in crawl-ref/docs/crawl.6 at line 10 [5.5002325]

Deletion in crawl-ref/docs/crawl.6 at line 37 [5.5002325]

Deletion in crawl-ref/docs/crawl.6 at line 1033 [5.5002325]