fiddlerwoaroof/crawl - Change LS2FPEQQPF3L6AG6NCI2EMBQYWB7POZQBAUCNCGXG4H3Z3ACZG5AC

Use #define HUD_VALUE_COLOR instead of hardcoding LIGHTGREY so David

can experiment with using other colors like WHITE

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

Created by pauldubois on April 20, 2008

LS2FPEQQPF3L6AG6NCI2EMBQYWB7POZQBAUCNCGXG4H3Z3ACZG5AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.h at line 66 [5.13254]
B:BD[4.2014] → [4.2014:2015]
∅:D[4.2015] → [5.13586:13613]
B:BD[5.13586] → [5.13586:13613]
```
#define BORDER_COLOR BROWN
```

Insertion in crawl-ref/source/output.cc at line 56 [5.1088282]

[6.2566]

[7.2860]


// Color for captions like 'Health:', 'Str:'
#define HUD_CAPTION_COLOR Options.status_caption_colour

Insertion in crawl-ref/source/output.cc at line 60 [5.1088282]

[7.2861]

// Color for values, which come after captions
static const short HUD_VALUE_COLOR = LIGHTGREY;

Deletion in crawl-ref/source/output.cc at line 237 [5.1088282]
∅:D[8.2558] → [9.550:576]
∅:D[10.2571] → [9.550:576]
∅:D[2.3500] → [9.550:576]
∅:D[11.4333] → [9.550:576]
∅:D[12.7741] → [9.550:576]
∅:D[13.5747614] → [9.550:576]
B:BD[9.550] → [9.550:576]
```
    textcolor(LIGHTGREY);
```
Insertion in crawl-ref/source/output.cc at line 239 [5.1088282]
[9.651]
[9.651]
```
    textcolor(HUD_VALUE_COLOR);
```
Insertion in crawl-ref/source/output.cc at line 241 [5.1088282]
[9.686]
[14.3334]
```
    textcolor(LIGHTGREY);
```

Replacement in crawl-ref/source/output.cc at line 291 [5.1088282]

B:BD[5.1089407] → [15.2555:2778]

    int mp_percent;
    if ( you.max_magic_points )
        mp_percent = (you.magic_points * 100) / you.max_magic_points;
    else
        mp_percent = 100;
    for ( unsigned int i = 0; i < Options.mp_colour.size(); ++i )

[5.1089407]

[15.2778]

    // Calculate colour
    short mp_colour = HUD_VALUE_COLOR;

Replacement in crawl-ref/source/output.cc at line 294 [5.1088282]

B:BD[15.2784] → [15.2784:2980]

        if ( i+1 == Options.mp_colour.size() ||
             mp_percent > Options.mp_colour[i+1].first )
        {
            textcolor(Options.mp_colour[i].second);
            break;
        }

[15.2784]

[15.2980]

        int mp_percent = (you.max_magic_points == 0
                          ? 100
                          : (you.magic_points * 100) / you.max_magic_points);
        for ( unsigned int i = 0; i < Options.mp_colour.size(); ++i )
            if ( mp_percent <= Options.mp_colour[i].first )
                mp_colour = Options.mp_colour[i].second;

Insertion in crawl-ref/source/output.cc at line 301 [5.1088282]
[15.2986]
[2.3501]
Replacement in crawl-ref/source/output.cc at line 303 [5.1088282]
∅:D[2.3533] → [15.3016:3056]
∅:D[16.4518] → [15.3016:3056]
B:BD[15.3016] → [15.3016:3056]
∅:D[15.3056] → [5.1089407:1089433]
B:BD[5.1089407] → [5.1089407:1089433]
```
    cprintf( "%d", you.magic_points);
    textcolor(LIGHTGREY);
```
[2.3533]
[15.3057]
```
    textcolor(mp_colour);
    cprintf("%d", you.magic_points);
    textcolor(HUD_VALUE_COLOR);
```
Replacement in crawl-ref/source/output.cc at line 322 [5.1088282]
B:BD[2.3558] → [2.3558:3591]
```
    short hp_colour = LIGHTGREY;
```
[2.3558]
[5.1089465]
```
    short hp_colour = HUD_VALUE_COLOR;
```

Replacement in crawl-ref/source/output.cc at line 328 [5.1088282]

∅:D[2.3759] → [17.187:197]

∅:D[15.3765] → [17.187:197]

B:BD[17.187] → [17.187:197]

B:BD[17.197] → [2.3760:3887]

        {
            if ( i+1 == Options.hp_colour.size() ||
                 hp_percent > Options.hp_colour[i+1].first )
            {

[2.3759]

[2.3887]

            if ( hp_percent <= Options.hp_colour[i].first )

Deletion in crawl-ref/source/output.cc at line 330 [5.1088282]
B:BD[2.3944] → [2.3944:3981]
∅:D[15.3837] → [17.417:427]
∅:D[2.3981] → [17.417:427]
B:BD[17.417] → [17.417:427]
```
                break;
            }
        }
```
Replacement in crawl-ref/source/output.cc at line 335 [5.1088282]
B:BD[2.4069] → [2.4069:4091]
```
    textcolor(BROWN);
```
[2.4069]
[2.4091]
```
    textcolor(HUD_CAPTION_COLOR);
```
Deletion in crawl-ref/source/output.cc at line 337 [5.1088282]
∅:D[15.3905] → [5.1089891:1089892]
∅:D[2.4152] → [5.1089891:1089892]
B:BD[5.1089891] → [5.1089891:1089892]
Replacement in crawl-ref/source/output.cc at line 339 [5.1088282]
∅:D[2.4208] → [15.3906:3932]
B:BD[5.1089892] → [15.3906:3932]
```
    textcolor(LIGHTGREY);
```
[2.4208]
[15.3932]
```
    textcolor(HUD_VALUE_COLOR);
```
Insertion in crawl-ref/source/output.cc at line 369 [5.1088282]
[15.4719]
[5.1090305]
```
    else
        textcolor(HUD_VALUE_COLOR);
```
Deletion in crawl-ref/source/output.cc at line 373 [5.1088282]
B:BD[15.4755] → [15.4755:4781]
```
    textcolor(LIGHTGREY);
```
Replacement in crawl-ref/source/output.cc at line 394 [5.1088282]
B:BD[5.1090865] → [15.5157:5219]
∅:D[15.5219] → [5.1090934:1090935]
B:BD[5.1090934] → [5.1090934:1090935]
```
    if (you.intel < you.max_intel)
        textcolor(YELLOW);
```
[5.1090865]
[15.5220]
```
    textcolor(you.intel < you.max_intel ? YELLOW : HUD_VALUE_COLOR);
```
Deletion in crawl-ref/source/output.cc at line 396 [5.1088282]
B:BD[15.5252] → [15.5252:5278]
```
    textcolor(LIGHTGREY);
```
Deletion in crawl-ref/source/output.cc at line 414 [5.1088282]
∅:D[16.5114] → [5.1091443:1091444]
∅:D[15.5610] → [5.1091443:1091444]
B:BD[5.1091443] → [5.1091443:1091444]
B:BD[5.1091444] → [15.5611:5669]
```
    if (you.dex < you.max_dex)
        textcolor(YELLOW);
```
Insertion in crawl-ref/source/output.cc at line 415 [5.1088282]
[5.1091468]
[15.5670]
```
    textcolor(you.dex < you.max_dex ? YELLOW : HUD_VALUE_COLOR);
```
Deletion in crawl-ref/source/output.cc at line 417 [5.1088282]
B:BD[15.5700] → [15.5700:5726]
```
    textcolor(LIGHTGREY);
```
Insertion in crawl-ref/source/output.cc at line 426 [5.1088282]
[15.5876]
[16.5158]
```
    // AC:
```
Deletion in crawl-ref/source/output.cc at line 428 [5.1088282]
∅:D[16.5190] → [5.1091740:1091741]
∅:D[15.5906] → [5.1091740:1091741]
B:BD[5.1091740] → [5.1091740:1091741]

Replacement in crawl-ref/source/output.cc at line 431 [5.1088282]

B:BD[15.6082] → [15.6082:6144]

        textcolor( LIGHTBLUE );  // no end of effect warning

[15.6082]

[16.5191]

        textcolor( LIGHTBLUE );
    else
        textcolor( HUD_VALUE_COLOR );

Deletion in crawl-ref/source/output.cc at line 435 [5.1088282]
∅:D[16.5227] → [15.6180:6208]
B:BD[15.6180] → [15.6180:6208]
```
    textcolor( LIGHTGREY );
```
Insertion in crawl-ref/source/output.cc at line 436 [5.1088282]
[15.6209]
[16.5228]
```
    // Sh: (one line lower)
```

Replacement in crawl-ref/source/output.cc at line 438 [5.1088282]

∅:D[16.5262] → [15.6240:6397]

B:BD[15.6240] → [15.6240:6397]

∅:D[18.6255] → [5.1091855:1091861]

∅:D[15.6397] → [5.1091855:1091861]

B:BD[5.1091855] → [5.1091855:1091861]

B:BD[5.1091861] → [3.2546:2547]


    if (you.duration[DUR_CONDENSATION_SHIELD]
       || you.duration[DUR_DIVINE_SHIELD])
    {
        textcolor( LIGHTBLUE );  // no end of effect warning
    }

[16.5262]

[3.2547]

    if (you.duration[DUR_CONDENSATION_SHIELD] || you.duration[DUR_DIVINE_SHIELD])
        textcolor( LIGHTBLUE );
    else
        textcolor( HUD_VALUE_COLOR );

Deletion in crawl-ref/source/output.cc at line 443 [5.1088282]
∅:D[3.2593] → [15.6445:6473]
∅:D[16.5439] → [15.6445:6473]
B:BD[15.6445] → [15.6445:6473]
```
    textcolor( LIGHTGREY );
```

Replacement in crawl-ref/source/output.cc at line 448 [5.1088282]

B:BD[16.5516] → [16.5516:5611]

    if (you.duration[DUR_FORESCRY])
        textcolor(LIGHTBLUE);  // no end of effect warning

[16.5516]

[16.5611]

    textcolor(you.duration[DUR_FORESCRY] ? LIGHTBLUE : HUD_VALUE_COLOR);

Deletion in crawl-ref/source/output.cc at line 450 [5.1088282]
B:BD[16.5652] → [16.5652:5678]
```
    textcolor(LIGHTGREY);
```
Replacement in crawl-ref/source/output.cc at line 830 [5.1088282]
∅:D[2.4498] → [10.2687:2717]
B:BD[10.2687] → [10.2687:2717]
```
        textcolor(LIGHTGREY);
```
[2.4498]
[15.16804]
```
        textcolor(HUD_VALUE_COLOR);
```

Replacement in crawl-ref/source/output.cc at line 845 [5.1088282]

B:BD[2.4703] → [2.4703:4764]

        cgotoxy(1+6, 9, GOTO_STAT); cprintf("%d", you.gold);

[2.4703]

[2.4764]

        cgotoxy(1+6, 9, GOTO_STAT);
        textcolor(HUD_VALUE_COLOR);
        cprintf("%d", you.gold);

Deletion in crawl-ref/source/output.cc at line 911 [5.1088282]
B:BD[16.7541] → [2.5657:5679]
```
    textcolor(BROWN);
```
Insertion in crawl-ref/source/output.cc at line 912 [5.1088282]
[2.5710]
[2.5710]
```
    textcolor(HUD_CAPTION_COLOR);
```
Replacement in crawl-ref/source/output.cc at line 915 [5.1088282]
∅:D[19.3326] → [16.7572:7598]
∅:D[2.5735] → [16.7572:7598]
B:BD[16.7572] → [16.7572:7598]
```
    textcolor(LIGHTGREY);
```
[2.5735]
[16.7598]
```
    textcolor(HUD_VALUE_COLOR);
```
Replacement in crawl-ref/source/output.cc at line 974 [5.1088282]
B:BD[16.7767] → [16.7767:7798]
```
    textcolor( BORDER_COLOR );
```
[16.7767]
[16.7798]
```
    textcolor( HUD_CAPTION_COLOR );
```

Use #define HUD_VALUE_COLOR instead of hardcoding LIGHTGREY so David

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/view.h at line 66 [5.13254]

Insertion in crawl-ref/source/output.cc at line 56 [5.1088282]

Insertion in crawl-ref/source/output.cc at line 60 [5.1088282]

Deletion in crawl-ref/source/output.cc at line 237 [5.1088282]

Insertion in crawl-ref/source/output.cc at line 239 [5.1088282]

Insertion in crawl-ref/source/output.cc at line 241 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 291 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 294 [5.1088282]

Insertion in crawl-ref/source/output.cc at line 301 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 303 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 322 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 328 [5.1088282]

Deletion in crawl-ref/source/output.cc at line 330 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 335 [5.1088282]

Deletion in crawl-ref/source/output.cc at line 337 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 339 [5.1088282]

Insertion in crawl-ref/source/output.cc at line 369 [5.1088282]

Deletion in crawl-ref/source/output.cc at line 373 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 394 [5.1088282]

Deletion in crawl-ref/source/output.cc at line 396 [5.1088282]

Deletion in crawl-ref/source/output.cc at line 414 [5.1088282]

Insertion in crawl-ref/source/output.cc at line 415 [5.1088282]

Deletion in crawl-ref/source/output.cc at line 417 [5.1088282]

Insertion in crawl-ref/source/output.cc at line 426 [5.1088282]

Deletion in crawl-ref/source/output.cc at line 428 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 431 [5.1088282]

Deletion in crawl-ref/source/output.cc at line 435 [5.1088282]

Insertion in crawl-ref/source/output.cc at line 436 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 438 [5.1088282]

Deletion in crawl-ref/source/output.cc at line 443 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 448 [5.1088282]

Deletion in crawl-ref/source/output.cc at line 450 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 830 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 845 [5.1088282]

Deletion in crawl-ref/source/output.cc at line 911 [5.1088282]

Insertion in crawl-ref/source/output.cc at line 912 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 915 [5.1088282]

Replacement in crawl-ref/source/output.cc at line 974 [5.1088282]