fiddlerwoaroof/crawl - Change TFWVU5PMJESW2RVSJQUQJAQY5Q2KH4KC32X7CTXYWLCSLT5TGQDAC

Add minor cosmetic fixes.

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

Created by dolorous on May 7, 2009

TFWVU5PMJESW2RVSJQUQJAQY5Q2KH4KC32X7CTXYWLCSLT5TGQDAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1152 [6.293070]

B:BD[5.784] → [2.168:237]

            mpr(prompt ? prompt : "Which direction?", MSGCH_PROMPT);

[5.784]

[5.785]

            mpr(prompt ? prompt : "Which direction? ", MSGCH_PROMPT);

Replacement in crawl-ref/source/spells3.cc at line 2007 [6.531613]

B:BD[7.489] → [7.489:557]

    mpr("Which direction ('<' for up, '>' for down, 'x' to quit)?",

[7.489]

[7.557]

    mpr("Which direction ('<' for up, '>' for down, 'x' to quit)? ",

Replacement in crawl-ref/source/spells3.cc at line 2039 [6.531613]

B:BD[6.561320] → [7.1233:1297]

    mpr("How many levels (1 - 9, 'x' to quit)?", MSGCH_PROMPT);

[6.561320]

[6.561475]

    mpr("How many levels (1 - 9, 'x' to quit)? ", MSGCH_PROMPT);

Replacement in crawl-ref/source/spells2.cc at line 1258 [6.569242]

B:BD[8.1089] → [8.1089:1160]

        mpr("Summon from material in which direction?", MSGCH_PROMPT);

[8.1089]

[8.1160]

        mpr("Summon from material in which direction? ", MSGCH_PROMPT);

Replacement in crawl-ref/source/quiver.cc at line 147 [11.3828]

B:BD[9.3267] → [10.2831:2916]

∅:D[10.2916] → [9.3340:3387]

B:BD[9.3340] → [9.3340:3387]

B:BD[9.3387] → [12.2539:2691]

    int slot = prompt_invent_item( "Quiver which item? (- for none, * to show all)",
                                   MT_INVLIST,
                                   OSEL_THROWABLE, true, true, true, '-',
                                   you.equip[EQ_WEAPON], NULL, OPER_QUIVER );

[9.3267]

[9.3513]

    int slot = prompt_invent_item("Quiver which item? (- for none, * to show all)",
                                  MT_INVLIST,
                                  OSEL_THROWABLE, true, true, true, '-',
                                  you.equip[EQ_WEAPON], NULL, OPER_QUIVER);

Replacement in crawl-ref/source/newgame.cc at line 1239 [6.1132300]

B:BD[13.8779] → [13.8779:8854]

            cprintf(EOL "Do you really want to overwrite your old game?");

[13.8779]

[13.8854]

            cprintf(EOL "Do you really want to overwrite your old game? ");

Replacement in crawl-ref/source/macro.cc at line 755 [6.2457534]
∅:D[14.2613] → [15.483:502]
B:BD[15.483] → [15.483:502]
```
        "(s)ave?",
```
[14.2613]
[16.4778]
```
        "(s)ave? ",
```

Replacement in crawl-ref/source/macro.cc at line 819 [6.2457534]

∅:D[17.16381] → [6.2468678:2468758]

B:BD[6.2468678] → [6.2468678:2468758]

        mpr( "Do you wish to (r)edefine, (c)lear, or (a)bort?", MSGCH_PROMPT );

[17.16381]

[6.2468758]

        mpr("Do you wish to (r)edefine, (c)lear, or (a)bort? ", MSGCH_PROMPT);

Replacement in crawl-ref/source/effects.cc at line 2111 [6.3382105]
∅:D[18.38922] → [19.1349:1411]
B:BD[19.1349] → [19.1349:1411]
```
         one_chance_in(20)? " (and be thought a fool)" : "");
```
[18.38922]
[6.3427174]
```
         one_chance_in(20) ? " (and be thought a fool)" : "");
```

Replacement in crawl-ref/source/debug.cc at line 1286 [6.4016436]

B:BD[20.3263] → [20.3263:3339]

            dummy.number = _debug_prompt_for_int("How many heads?", false);

[20.3253]

[20.3349]

            dummy.number = _debug_prompt_for_int("How many heads? ", false);

Replacement in crawl-ref/source/debug.cc at line 2145 [6.4016436]
B:BD[3.3845] → [3.3845:3889]
```
        hunger_prompt += " or (S)atiated?";
```
[3.3845]
[3.3889]
```
        hunger_prompt += " or (S)atiated";
```

Replacement in crawl-ref/source/debug.cc at line 2147 [6.4016436]

B:BD[3.3898] → [3.3898:3962]

        hunger_prompt += ", (S)atiated, (F)ull or (E)ngorged?";

[3.3898]

[3.3962]

        hunger_prompt += ", (S)atiated, (F)ull or (E)ngorged";
    hunger_prompt += "? ";

Replacement in crawl-ref/source/debug.cc at line 2550 [6.4016436]
B:BD[6.4045955] → [6.4045955:4045982]
```
        direction( stth );
```
[6.4045955]
[6.4045982]
```
        direction(stth);
```

Replacement in crawl-ref/source/debug.cc at line 5194 [6.4016436]

B:BD[21.37894] → [21.37894:37956]

    mpr("Make the monster (S)hout or (T)alk?", MSGCH_PROMPT);

[21.37893]

[21.37956]

    mpr("Make the monster (S)hout or (T)alk? ", MSGCH_PROMPT);

Replacement in crawl-ref/source/debug.cc at line 5257 [6.4016436]

B:BD[22.11856] → [22.11856:11928]

    mpr("Apply blessing of (B)eogh, The (S)hining One, or (R)andomly?",

[22.11856]

[22.11928]

    mpr("Apply blessing of (B)eogh, The (S)hining One, or (R)andomly? ",

Replacement in crawl-ref/source/command.cc at line 288 [6.4082507]

B:BD[6.4083723] → [6.4083723:4083793]

    mpr( "Adjust (i)tems, (s)pells, or (a)bilities?", MSGCH_PROMPT );

[6.4083723]

[6.4083793]

    mpr("Adjust (i)tems, (s)pells, or (a)bilities? ", MSGCH_PROMPT);

Replacement in crawl-ref/source/command.cc at line 290 [6.4082507]
B:BD[6.4083794] → [23.561:604]
```
    const int keyin = tolower( get_ch() );
```
[6.4083794]
[6.4083841]
```
    const int keyin = tolower(get_ch());
```
Replacement in crawl-ref/source/command.cc at line 299 [6.4082507]
B:BD[6.4084022] → [6.4084022:4084052]
```
        canned_msg( MSG_OK );
```
[6.4084022]
[6.4084052]
```
        canned_msg(MSG_OK);
```
Replacement in crawl-ref/source/command.cc at line 301 [6.4082507]
B:BD[6.4084061] → [6.4084061:4084140]
```
        canned_msg( MSG_HUH );
}                               // end adjust()
```
[6.4084061]
[24.479976]
```
        canned_msg(MSG_HUH);
}
```

Replacement in crawl-ref/source/command.cc at line 354 [6.4082507]

B:BD[6.4084333] → [25.15355:15431]

    from_slot = prompt_invent_item( "Adjust which item?", MT_INVLIST, -1 );

[6.4084333]

[26.5745]

    from_slot = prompt_invent_item("Adjust which item?", MT_INVLIST, -1);

Replacement in crawl-ref/source/command.cc at line 360 [6.4082507]

B:BD[6.4084572] → [27.7287:7516]

    to_slot = prompt_invent_item( "Adjust to which letter?",
                                  MT_INVLIST,
                                  -1,
                                  false,
                                  false );

[6.4084572]

[28.369]

    to_slot = prompt_invent_item("Adjust to which letter? ",
                                 MT_INVLIST,
                                 -1,
                                 false,
                                 false);

Replacement in crawl-ref/source/command.cc at line 367 [6.4082507]
B:BD[6.4084693] → [6.4084693:4084723]
```
        canned_msg( MSG_OK );
```
[6.4084693]
[6.4084723]
```
        canned_msg(MSG_OK);
```
Replacement in crawl-ref/source/command.cc at line 383 [6.4082507]
∅:D[29.3595] → [6.4085892:4085938]
B:BD[6.4085892] → [6.4085892:4085938]
```
    mpr("Adjust which spell?", MSGCH_PROMPT);
```
[29.3595]
[6.4085975]
```
    mpr("Adjust which spell? ", MSGCH_PROMPT);
```
Replacement in crawl-ref/source/command.cc at line 397 [6.4082507]
B:BD[6.4086399] → [6.4086399:4086429]
```
        canned_msg( MSG_OK );
```
[6.4086354]
[6.4086607]
```
        canned_msg(MSG_OK);
```
Replacement in crawl-ref/source/command.cc at line 416 [6.4082507]
B:BD[29.4055] → [29.4055:4085]
```
    while ( !isalpha(keyin) )
```
[29.4055]
[6.4087110]
```
    while (!isalpha(keyin))
```

Replacement in crawl-ref/source/command.cc at line 418 [6.4082507]

B:BD[6.4087116] → [29.4086:4142]

        mpr( "Adjust to which letter?", MSGCH_PROMPT );

[6.4087116]

[29.4142]

        mpr("Adjust to which letter? ", MSGCH_PROMPT);

Replacement in crawl-ref/source/command.cc at line 430 [6.4082507]
B:BD[29.4362] → [29.4362:4412]
```
    const int index_2 = letter_to_index( keyin );
```
[29.4362]
[6.4087579]
```
    const int index_2 = letter_to_index(keyin);
```
Replacement in crawl-ref/source/command.cc at line 445 [6.4082507]
B:BD[17.25524] → [30.12510:12566]
```
}                               // end _adjust_spells()
```
[17.25524]
[6.4088484]
```
}
```
Replacement in crawl-ref/source/command.cc at line 451 [6.4082507]
B:BD[6.4088619] → [23.667:694]
```
    if ( talents.empty() )
```
[6.4088619]
[6.4088650]
```
    if (talents.empty())
```
Replacement in crawl-ref/source/command.cc at line 458 [6.4082507]
B:BD[23.775] → [23.775:802]
```
    while ( selected < 0 )
```
[23.775]
[23.802]
```
    while (selected < 0)
```

Replacement in crawl-ref/source/command.cc at line 460 [6.4082507]

B:BD[23.808] → [23.808:887]

        msg::streams(MSGCH_PROMPT) << "Adjust which ability? (? or * to list)"

[23.808]

[23.887]

        msg::streams(MSGCH_PROMPT) << "Adjust which ability? (? or * to list) "

Deletion in crawl-ref/source/command.cc at line 466 [6.4082507]
∅:D[23.1018] → [6.4088920:4088930]
∅:D[4.7194] → [6.4088920:4088930]
B:BD[6.4088920] → [6.4088920:4088930]
```
        {
```
Deletion in crawl-ref/source/command.cc at line 467 [6.4082507]
B:BD[23.1072] → [23.1072:1082]
```
        }
```
Replacement in crawl-ref/source/command.cc at line 470 [6.4082507]
B:BD[23.1193] → [23.1193:1227]
```
            canned_msg( MSG_OK );
```
[23.1193]
[23.1227]
```
            canned_msg(MSG_OK);
```

Replacement in crawl-ref/source/command.cc at line 501 [6.4082507]

∅:D[31.28566] → [23.1999:2073]

B:BD[23.1999] → [23.1999:2073]

    msg::streams(MSGCH_PROMPT) << "Adjust to which letter?" << std::endl;

[31.28566]

[31.28567]

    msg::streams(MSGCH_PROMPT) << "Adjust to which letter? " << std::endl;

Replacement in crawl-ref/source/command.cc at line 505 [6.4082507]
B:BD[6.4089345] → [23.2111:2138]
```
    if ( !isalpha(keyin) )
```
[6.4089345]
[6.4089374]
```
    if (!isalpha(keyin))
```
Replacement in crawl-ref/source/command.cc at line 512 [6.4082507]
B:BD[23.2216] → [23.2216:2244]
```
    if ( index1 == index2 )
```
[23.2216]
[6.4089599]
```
    if (index1 == index2)
```
Replacement in crawl-ref/source/command.cc at line 520 [6.4082507]
B:BD[23.2369] → [23.2369:2425]
```
    for ( unsigned int i = 0; i < talents.size(); ++i )
```
[23.2369]
[6.4089988]
```
    for (unsigned int i = 0; i < talents.size(); ++i)
```
Replacement in crawl-ref/source/command.cc at line 522 [6.4082507]
B:BD[6.4089994] → [23.2426:2468]
```
        if ( talents[i].hotkey == keyin )
```
[6.4089994]
[6.4090036]
```
        if (talents[i].hotkey == keyin)
```
Replacement in crawl-ref/source/command.cc at line 543 [6.4082507]
B:BD[23.3122] → [30.12602:12659]
```
}                               // end _adjust_ability()
```
[23.3122]
[6.4090884]
```
}
```

Replacement in crawl-ref/source/command.cc at line 1508 [6.4082507]

B:BD[32.3715] → [33.7248:7306]

        "(A)bility, (B)ranch, or (C)ard?", MSGCH_PROMPT);

[32.3715]

[34.7291]

        "(A)bility, (B)ranch, or (C)ard? ", MSGCH_PROMPT);

Replacement in crawl-ref/source/acr.cc at line 3005 [6.4397395]

B:BD[6.4465518] → [6.4465518:4465606]

        mpr("Which direction?", MSGCH_PROMPT);
        direction( door_move, DIR_DIR );

[6.4465518]

[35.107442]

        mpr("Which direction? ", MSGCH_PROMPT);
        direction(door_move, DIR_DIR);

Replacement in crawl-ref/source/acr.cc at line 3157 [6.4397395]

B:BD[6.4466801] → [6.4466801:4466889]

        mpr("Which direction?", MSGCH_PROMPT);
        direction( door_move, DIR_DIR );

[6.4466801]

[6.4466889]

        mpr("Which direction? ", MSGCH_PROMPT);
        direction(door_move, DIR_DIR);

Add minor cosmetic fixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1152 [6.293070]

Replacement in crawl-ref/source/spells3.cc at line 2007 [6.531613]

Replacement in crawl-ref/source/spells3.cc at line 2039 [6.531613]

Replacement in crawl-ref/source/spells2.cc at line 1258 [6.569242]

Replacement in crawl-ref/source/quiver.cc at line 147 [11.3828]

Replacement in crawl-ref/source/newgame.cc at line 1239 [6.1132300]

Replacement in crawl-ref/source/macro.cc at line 755 [6.2457534]

Replacement in crawl-ref/source/macro.cc at line 819 [6.2457534]

Replacement in crawl-ref/source/effects.cc at line 2111 [6.3382105]

Replacement in crawl-ref/source/debug.cc at line 1286 [6.4016436]

Replacement in crawl-ref/source/debug.cc at line 2145 [6.4016436]

Replacement in crawl-ref/source/debug.cc at line 2147 [6.4016436]

Replacement in crawl-ref/source/debug.cc at line 2550 [6.4016436]

Replacement in crawl-ref/source/debug.cc at line 5194 [6.4016436]

Replacement in crawl-ref/source/debug.cc at line 5257 [6.4016436]

Replacement in crawl-ref/source/command.cc at line 288 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 290 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 299 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 301 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 354 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 360 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 367 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 383 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 397 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 416 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 418 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 430 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 445 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 451 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 458 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 460 [6.4082507]

Deletion in crawl-ref/source/command.cc at line 466 [6.4082507]

Deletion in crawl-ref/source/command.cc at line 467 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 470 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 501 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 505 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 512 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 520 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 522 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 543 [6.4082507]

Replacement in crawl-ref/source/command.cc at line 1508 [6.4082507]

Replacement in crawl-ref/source/acr.cc at line 3005 [6.4397395]

Replacement in crawl-ref/source/acr.cc at line 3157 [6.4397395]