fiddlerwoaroof/crawl - Change 5S3CAGZSAQC3CYFPM5TQFPHW5IE2OZRVFJMICQZXHBZRGKFMNPRQC

Removed detailed_hunger option, the hunger states near starving, very

hungry and very full are now always displayed.

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

Created by zelgadis on September 18, 2007

5S3CAGZSAQC3CYFPM5TQFPHW5IE2OZRVFJMICQZXHBZRGKFMNPRQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/output.cc at line 394 [3.1088282]
B:BD[3.1095986] → [2.451:488]
```
        if (Options.detailed_hunger)
```
[3.1095986]
[3.1096020]
```
        switch (you.hunger_state)
```

Replacement in crawl-ref/source/output.cc at line 396 [3.1088282]

B:BD[3.1096030] → [2.489:805]

∅:D[2.805] → [3.1096147:1096148]

B:BD[3.1096147] → [3.1096147:1096148]

B:BD[3.1096148] → [2.806:926]

∅:D[2.926] → [3.1096252:1096253]

B:BD[3.1096252] → [3.1096252:1096253]

B:BD[3.1096253] → [2.927:980]

∅:D[2.980] → [3.1096298:1096299]

B:BD[3.1096298] → [3.1096298:1096299]

B:BD[3.1096299] → [2.981:1106]

            switch (you.hunger_state)
            {
            case HS_ENGORGED:
                textcolor( LIGHTGREEN );
                cprintf( "Engorged" );
                break;
            case HS_VERY_FULL:
                textcolor( GREEN );
                cprintf( "Very Full" );
                break;
            case HS_FULL:
                textcolor( GREEN );
                cprintf( "Full" );
                break;
            case HS_SATIATED:
                break;
            case HS_HUNGRY:
                textcolor( YELLOW );
                cprintf( "Hungry" );
                break;

[3.1096030]

[3.1096408]

        case HS_ENGORGED:
            textcolor( LIGHTGREEN );
            cprintf( "Engorged" );
            break;

Replacement in crawl-ref/source/output.cc at line 401 [3.1088282]

B:BD[3.1096409] → [2.1107:1242]

            case HS_VERY_HUNGRY:
                textcolor( YELLOW );
                cprintf( "Very Hungry" );
                break;

[3.1096409]

[2.1242]

        case HS_VERY_FULL:
            textcolor( GREEN );
            cprintf( "Very Full" );
            break;

Replacement in crawl-ref/source/output.cc at line 406 [3.1088282]

B:BD[2.1243] → [2.1243:1382]

            case HS_NEAR_STARVING:
                textcolor( YELLOW );
                cprintf( "Near Starving" );
                break;

[2.1243]

[2.1382]

        case HS_FULL:
            textcolor( GREEN );
            cprintf( "Full" );
            break;

Replacement in crawl-ref/source/output.cc at line 411 [3.1088282]

B:BD[2.1383] → [2.1383:1523]

∅:D[2.1523] → [3.1096519:1096529]

B:BD[3.1096519] → [3.1096519:1096529]

B:BD[3.1096529] → [2.1524:1732]

            case HS_STARVING:
                textcolor( RED );
                cprintf( "Starving" );
                break;
            }
        }
        else
        {
            switch (you.hunger_state)
            {
            case HS_ENGORGED:
                textcolor( LIGHTGREEN );
                cprintf( "Engorged" );
                break;

[2.1383]

[3.1096529]

        case HS_SATIATED:
            break;

Replacement in crawl-ref/source/output.cc at line 414 [3.1088282]

B:BD[3.1096530] → [2.1733:1884]

            case HS_VERY_FULL:
            case HS_FULL:
                textcolor( GREEN );
                cprintf( "Full" );
                break;

[3.1096530]

[2.1884]

        case HS_HUNGRY:
            textcolor( YELLOW );
            cprintf( "Hungry" );
            break;

Replacement in crawl-ref/source/output.cc at line 419 [3.1088282]

B:BD[2.1885] → [2.1885:1938]

            case HS_SATIATED:
                break;

[2.1885]

[2.1938]

        case HS_VERY_HUNGRY:
            textcolor( YELLOW );
            cprintf( "Very Hungry" );
            break;

Replacement in crawl-ref/source/output.cc at line 424 [3.1088282]

B:BD[2.1939] → [2.1939:2132]

            case HS_HUNGRY:
            case HS_VERY_HUNGRY:
            case HS_NEAR_STARVING:
                textcolor( YELLOW );
                cprintf( "Hungry" );
                break;

[2.1939]

[2.2132]

        case HS_NEAR_STARVING:
            textcolor( YELLOW );
            cprintf( "Near Starving" );
            break;

Replacement in crawl-ref/source/output.cc at line 429 [3.1088282]

B:BD[2.2133] → [2.2133:2273]

            case HS_STARVING:
                textcolor( RED );
                cprintf( "Starving" );
                break;
            }

[2.2133]

[2.2273]

        case HS_STARVING:
            textcolor( RED );
            cprintf( "Starving" );
            break;

Deletion in crawl-ref/source/initfile.cc at line 665 [3.2957258]
B:BD[4.793798] → [2.4882:4918]
```
    detailed_hunger        = false;
```

Deletion in crawl-ref/source/initfile.cc at line 2313 [3.2957258]

B:BD[5.419299] → [2.5141:5253]

    else if (key == "detailed_hunger")
    {
        detailed_hunger = read_bool(field, detailed_hunger);
    }

Deletion in crawl-ref/source/food.cc at line 566 [3.3043806]
B:BD[3.3060505] → [2.5861:5903]
```
        char oldstate = you.hunger_state;
```

Replacement in crawl-ref/source/food.cc at line 570 [3.3043806]

B:BD[5.430257] → [5.430257:430336]

B:BD[5.430336] → [2.5904:6407]

∅:D[2.6407] → [3.3060616:3060617]

∅:D[5.430417] → [3.3060616:3060617]

B:BD[3.3060616] → [3.3060616:3060617]

B:BD[3.3060617] → [2.6408:6743]

        // Stop the travel command, if it's in progress and we just got hungry
        if (Options.detailed_hunger)
        {
            if (newstate < HS_SATIATED)
                interrupt_activity( AI_HUNGRY );
        }
        else
        {
            // Don't interrupt on changing from hungry to very hungry
            // or very hungry to near starving if they don't want
            // detailed hunger info.
            if (newstate == HS_STARVING ||
                (newstate < HS_SATIATED && oldstate >= HS_SATIATED))
                interrupt_activity( AI_HUNGRY );
            // Don't inform user of changing from hungry to very hungry
            // or very hungry to near starving if they don't want
            // detailed hunger info.
            if (newstate < HS_SATIATED && oldstate < HS_SATIATED &&
                newstate != HS_STARVING)
                suppress_message = true;
        }

[5.430257]

[2.6743]

        if (newstate < HS_SATIATED)
            interrupt_activity( AI_HUNGRY );

Replacement in crawl-ref/source/food.cc at line 575 [3.3043806]

B:BD[3.3060666] → [2.6745:7703]

            if (Options.detailed_hunger)
            {
                switch (you.hunger_state)
                {
                case HS_STARVING:
                    mpr("You are starving!", MSGCH_FOOD);
                    learned_something_new(TUT_YOU_STARVING);
                    break;
                case HS_HUNGRY:
                    mpr("You are feeling hungry.", MSGCH_FOOD);
                    learned_something_new(TUT_YOU_HUNGRY);
                    break;
                case HS_VERY_HUNGRY:
                    mpr("You are feeling very hungry.", MSGCH_FOOD);
                    learned_something_new(TUT_YOU_HUNGRY);
                    break;
                case HS_NEAR_STARVING:
                    mpr("You are near starving.", MSGCH_FOOD);
                    learned_something_new(TUT_YOU_HUNGRY);
                    break;
                default:
                    break;
                }
            }
            else

[3.3060666]

[3.3060704]

            switch (you.hunger_state)

Replacement in crawl-ref/source/food.cc at line 577 [3.3043806]

B:BD[3.3060718] → [2.7704:8272]

                switch (you.hunger_state)
                {
                case HS_STARVING:
                    mpr("You are starving!", MSGCH_FOOD);
                    learned_something_new(TUT_YOU_STARVING);
                    break;
                case HS_HUNGRY:
                case HS_VERY_HUNGRY:
                case HS_NEAR_STARVING:
                    mpr("You are feeling hungry.", MSGCH_FOOD);
                    learned_something_new(TUT_YOU_HUNGRY);
                    break;
                default:
                    break;
                }

[3.3060718]

[3.3060980]

            case HS_STARVING:
                mpr("You are starving!", MSGCH_FOOD);
                learned_something_new(TUT_YOU_STARVING);
                break;
            case HS_HUNGRY:
                mpr("You are feeling hungry.", MSGCH_FOOD);
                learned_something_new(TUT_YOU_HUNGRY);
                break;
            case HS_VERY_HUNGRY:
                mpr("You are feeling very hungry.", MSGCH_FOOD);
                learned_something_new(TUT_YOU_HUNGRY);
                break;
            case HS_NEAR_STARVING:
                mpr("You are near starving.", MSGCH_FOOD);
                learned_something_new(TUT_YOU_HUNGRY);
                break;
            default:
                break;

Deletion in crawl-ref/source/externs.h at line 1447 [3.3270163]
B:BD[5.443751] → [2.8338:8407]
```
    bool        detailed_hunger; // Informational-only hunger levels
```
Deletion in crawl-ref/init.txt at line 273 [3.4830895]
B:BD[6.6843] → [2.10795:10822]
```
#
# detailed_hunger = true
```

Deletion in crawl-ref/docs/crawl_options.txt at line 1460 [7.63392]

B:BD[6.7235] → [2.12819:13077]


detailed_hunger = false
        If set to true, then Crawl will tell you about three additional
        hunger states: near starving, very hungry, and very full.
        These hunger states are informational only, and have no effect
        upon game play.