fiddlerwoaroof/crawl - Change 6DNIJ5AUXSKOXNSKVOE2TBKNSTRK3UQDML2FI7D4JQXI5JBSJGCQC

Changed hud (and % screen) a bit: Write EV and SH instead of Ev and Sh.

Change order from AC/Sh/Ev to AC/EV/SH. Also put AC/EV/SH to the left and Str/Int/Dex to the right.

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

Created by dploog on May 30, 2008

6DNIJ5AUXSKOXNSKVOE2TBKNSTRK3UQDML2FI7D4JQXI5JBSJGCQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/output.cc at line 216 [5.1088282]
B:BD[3.647] → [4.4269:4300]
```
    cgotoxy(36, 2, GOTO_STAT);
```
[3.647]
[3.666]
```
    cgotoxy(36, 1, GOTO_STAT);
```
Replacement in crawl-ref/source/output.cc at line 448 [5.1088282]
B:BD[6.6209] → [7.3761:3789]
∅:D[7.3789] → [8.5228:5262]
B:BD[6.6209] → [8.5228:5262]
```
    // Sh: (one line lower)
    cgotoxy(x+4, y+1, GOTO_STAT);
```
[6.6209]
[7.3790]
```
    // Sh: (two lines lower)
    cgotoxy(x+4, y+2, GOTO_STAT);
```

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

B:BD[8.6490] → [8.6490:6775]

    if (you.redraw_strength)     { you.redraw_strength = false;     _print_stats_str( 1, 5); }
    if (you.redraw_intelligence) { you.redraw_intelligence = false; _print_stats_int( 1, 6); }
    if (you.redraw_dexterity)    { you.redraw_dexterity = false;    _print_stats_dex( 1, 7); }

[8.6490]

[5.1099137]

    if (you.redraw_armour_class) { you.redraw_armour_class = false; _print_stats_ac ( 1, 5); }
    if (you.redraw_evasion)      { you.redraw_evasion = false;      _print_stats_ev ( 1, 6); }
    // (you.redraw_armour_class) { you.redraw_armour_class = false; _print_stats_sh ( 1, 7); }

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

B:BD[5.1099138] → [8.6776:7061]

    if (you.redraw_armour_class) { you.redraw_armour_class = false; _print_stats_ac (19, 5); }
    // (you.redraw_armour_class) { you.redraw_armour_class = false; _print_stats_sh (19, 6); }
    if (you.redraw_evasion)      { you.redraw_evasion = false;      _print_stats_ev (19, 7); }

[5.1099138]

[9.2913]

    if (you.redraw_strength)     { you.redraw_strength = false;     _print_stats_str(19, 5); }
    if (you.redraw_intelligence) { you.redraw_intelligence = false; _print_stats_int(19, 6); }
    if (you.redraw_dexterity)    { you.redraw_dexterity = false;    _print_stats_dex(19, 7); }

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

B:BD[8.8181] → [8.8181:8325]

    cgotoxy( 1, 5, GOTO_STAT); cprintf("Str:");
    cgotoxy( 1, 6, GOTO_STAT); cprintf("Int:");
    cgotoxy( 1, 7, GOTO_STAT); cprintf("Dex:");

[8.8181]

[8.8429]

    cgotoxy( 1, 5, GOTO_STAT); cprintf("AC:");
    cgotoxy( 1, 6, GOTO_STAT); cprintf("EV:");
    cgotoxy( 1, 7, GOTO_STAT); cprintf("SH:");

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

B:BD[8.8430] → [8.8430:8571]

    cgotoxy(19, 5, GOTO_STAT); cprintf("AC:");
    cgotoxy(19, 6, GOTO_STAT); cprintf("Sh:");
    cgotoxy(19, 7, GOTO_STAT); cprintf("Ev:");

[8.8430]

[10.6343]

    cgotoxy(19, 5, GOTO_STAT); cprintf("Str:");
    cgotoxy(19, 6, GOTO_STAT); cprintf("Int:");
    cgotoxy(19, 7, GOTO_STAT); cprintf("Dex:");

Replacement in crawl-ref/source/output.cc at line 1954 [5.1088282]
B:BD[11.315] → [11.315:357]
```
    column_composer cols1(4, 18, 30, 40);
```
[11.315]
[12.53225]
```
    column_composer cols1(4, 18, 28, 40);
```

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

[12.53629]

    snprintf(buf, sizeof buf, "AC %2d" , player_AC());
    cols1.add_formatted(1, buf, false);
    snprintf(buf, sizeof buf, "EV %2d" , player_evasion());
    cols1.add_formatted(1, buf, false);
    if (you.equip[EQ_SHIELD] == -1)
    {
        textcolor( DARKGREY );
        snprintf(buf, sizeof buf, "SH  <darkgrey>-</darkgrey>");
    }
    else
        snprintf(buf, sizeof buf, "SH %2d", player_shield_class());
    cols1.add_formatted(1, buf, false);

Replacement in crawl-ref/source/output.cc at line 1994 [5.1088282]
∅:D[2.3703] → [12.53857:53897]
B:BD[12.53857] → [12.53857:53897]
```
    cols1.add_formatted(1, buf, false);
```
[2.3703]
[12.53897]
```
    cols1.add_formatted(2, buf, false);
```
Replacement in crawl-ref/source/output.cc at line 2003 [5.1088282]
∅:D[13.7452] → [12.54111:54151]
B:BD[12.54111] → [12.54111:54151]
```
    cols1.add_formatted(1, buf, false);
```
[13.7452]
[12.54151]
```
    cols1.add_formatted(2, buf, false);
```

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

B:BD[12.54355] → [13.7460:7466]

∅:D[13.7466] → [12.54355:54396]

B:BD[12.54355] → [12.54355:54396]

B:BD[12.54396] → [14.4642:4875]

    }
    cols1.add_formatted(1, buf, false);
    snprintf(buf, sizeof buf, "AC %2d" , player_AC());
    cols1.add_formatted(2, buf, false);
    if (you.equip[EQ_SHIELD] == -1)
    {
        textcolor( DARKGREY );
        snprintf(buf, sizeof buf, "Sh  <darkgrey>-</darkgrey>");

Deletion in crawl-ref/source/output.cc at line 2012 [5.1088282]
B:BD[14.4881] → [14.4881:4890]
B:BD[14.4896] → [14.4896:4964]
B:BD[14.4964] → [2.3704:3705]
∅:D[2.3705] → [12.54593:54633]
∅:D[14.4970] → [12.54593:54633]
B:BD[12.54593] → [12.54593:54633]
B:BD[12.54633] → [14.4971:5031]
```
    else
        snprintf(buf, sizeof buf, "Sh %2d", player_shield_class());
    cols1.add_formatted(2, buf, false);
    snprintf(buf, sizeof buf, "Ev %2d" , player_evasion());
```

Changed hud (and % screen) a bit: Write EV and SH instead of Ev and Sh.

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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