fiddlerwoaroof/crawl - Change HBHQQDULNVWISJ75XIL6R6BFEDYRNY22NX3ZTFVNP5ZWJGJSKOEQC

Introduce a temporary neutral brand for tiles because it was driving me nuts

when testing Ely's pacifying. (Currently only inappropriately reuses TILE_NEW_STAIR, which will have to be replaced with something more distinctive some time.) Also add an option for colouring neutrals on the minimap (defaults to red, like hostiles) and allow secondary item use by Ctrl-L-clicking on items in inventory (firing weapons, unwielding rods, etc.)

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

Created by j-p-e-g on March 23, 2008

HBHQQDULNVWISJ75XIL6R6BFEDYRNY22NX3ZTFVNP5ZWJGJSKOEQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tiles.h at line 145 [4.7013]

B:BD[3.352] → [3.352:428]

    TILE_FLAG_NET       = 0x00002000,
    TILE_FLAG_PET       = 0x00004000,

[3.352]

[3.428]

    TILE_FLAG_PET       = 0x00002000,
    TILE_FLAG_NEUTRAL   = 0x00004000,

Replacement in crawl-ref/source/tiles.h at line 149 [4.7013]

B:BD[3.504] → [5.501:539]

    TILE_FLAG_POISON    = 0x00010000,

[3.504]

[4.11311]

    TILE_FLAG_NET       = 0x00010000,
    TILE_FLAG_POISON    = 0x00020000,

Replacement in crawl-ref/source/tiles.h at line 154 [4.7013]

B:BD[3.567] → [3.567:757]

    TILE_FLAG_MM_UNSEEN = 0x00001000,
    TILE_FLAG_UNSEEN    = 0x00002000,
    TILE_FLAG_CURSOR0   = 0x00000000,
    TILE_FLAG_CURSOR1   = 0x00008000,
    TILE_FLAG_CURSOR2   = 0x00004000,

[3.567]

[3.757]

    TILE_FLAG_MM_UNSEEN = 0x00000000,
    TILE_FLAG_UNSEEN    = 0x00001000,
    TILE_FLAG_CURSOR0   = 0x00002000,
    TILE_FLAG_CURSOR1   = 0x00004000,
    TILE_FLAG_CURSOR2   = 0x00008000,

Insertion in crawl-ref/source/tile2.cc at line 747 [4.13289]

[5.2845]

        status_shift += 10;
    }
    else if ((fg0 & TILE_FLAG_MAY_STAB) == TILE_FLAG_NEUTRAL)
    {
        // FIX ME: add real neutral marker!
        tcache_overlay(tc_img, ix, TILE_NEW_STAIR, TREGION_0_NORMAL, &c, NULL);

Replacement in crawl-ref/source/tile2.cc at line 766 [4.13289]
∅:D[5.3081] → [4.36129:36130]
B:BD[4.36129] → [4.36129:36130]
[5.3081]
[5.3082]
```
    
```

Insertion in crawl-ref/source/tile1.cc at line 819 [4.96318]

[4.117968]

[5.4110]

    else if (mons_neutral(mons))
    {
        ch |= TILE_FLAG_NEUTRAL;
    }

Deletion in crawl-ref/source/tile1.cc at line 831 [4.96318]
B:BD[4.118259] → [5.4195:4196]
Replacement in crawl-ref/source/libgui.h at line 83 [4.5789586]
B:BD[4.5791160] → [4.5791160:5791173]
```
    INV_USE,
```
[4.5791160]
[4.5791173]
```
    INV_USE,  // primary   inventory use
    INV_USE2, // secondary inventory use
```
Replacement in crawl-ref/source/libgui.cc at line 359 [4.5793336]
∅:D[6.2743] → [7.4096:4197]
∅:D[8.4089] → [7.4096:4197]
B:BD[7.4096] → [7.4096:4197]
```
    else if (mgrd[x][y] != NON_MONSTER && mons_friendly(&menv[mgrd[x][y]])
             && upd_tile)
```
[6.2743]
[9.4188]
```
    else if (mgrd[x][y] != NON_MONSTER && upd_tile)
```

Replacement in crawl-ref/source/libgui.cc at line 361 [4.5793336]

B:BD[9.4194] → [8.4090:4181]

        c = Options.tile_friendly_col; // friendly monsters subtly different from hostiles

[9.4194]

[9.4195]

        if (mons_friendly(&menv[mgrd[x][y]]))
            c = Options.tile_friendly_col; // colour friendly monsters
        else if (mons_neutral(&menv[mgrd[x][y]])
                 && Options.tile_neutral_col != Options.tile_monster_col)
        {
            c = Options.tile_neutral_col;  // colour neutral monsters
        }

Insertion in crawl-ref/source/libgui.cc at line 1341 [4.5793336]

[3.6078]

[10.4834]

                            if (is_throwable(you.inv[ix], player_size(PSIZE_BODY)))
                                desc += EOL "[Ctrl-L-Click] Fire (f)";

Insertion in crawl-ref/source/libgui.cc at line 1346 [4.5793336]

[3.6126]

[7.5418]

                            if (is_throwable(you.inv[ix], player_size(PSIZE_BODY)))
                                desc += EOL "[Ctrl-L-Click] Fire (f)";

Insertion in crawl-ref/source/libgui.cc at line 1354 [4.5793336]

[3.6186]

[7.5745]

                                desc += EOL "[Ctrl-L-Click] Unwield";

Insertion in crawl-ref/source/libgui.cc at line 1360 [4.5793336]

[3.6236]

[10.5009]

                            desc += EOL "[Ctrl-L-Click] Unwield";

Replacement in crawl-ref/source/libgui.cc at line 1547 [4.5793336]

B:BD[4.5830099] → [4.5830099:5830263]

    if (button == 2) trig = CK_MOUSE_B2;
    if (button == 3) trig = CK_MOUSE_B3;
    if (button == 4) trig = CK_MOUSE_B4;
    if (button == 5) trig = CK_MOUSE_B5;

[4.5830099]

[4.5830263]

    if (button == 2)
        trig = CK_MOUSE_B2;
    else if (button == 3)
        trig = CK_MOUSE_B3;
    else if (button == 4)
        trig = CK_MOUSE_B4;
    else if (button == 5)
        trig = CK_MOUSE_B5;

Insertion in crawl-ref/source/libgui.cc at line 1627 [4.5793336]
[4.5831777]
[4.5831777]
```
                    
```
Insertion in crawl-ref/source/libgui.cc at line 1641 [4.5793336]
[11.4323]
[4.5832170]
```
                        
```
Insertion in crawl-ref/source/libgui.cc at line 1644 [4.5793336]
[4.5832232]
[4.5832232]
```
                
```

Insertion in crawl-ref/source/libgui.cc at line 1648 [4.5793336]

[4.5832340]

                else if (ctrl)
                    gui_set_mouse_inv(ix, INV_USE2);

Insertion in crawl-ref/source/libgui.cc at line 1652 [4.5793336]
[4.5832413]
[4.5832413]
```
                    
```
Replacement in crawl-ref/source/libgui.cc at line 1723 [4.5793336]
B:BD[4.5834344] → [4.5834344:5834375]
```
        for(dir=0;dir<9;dir++)
```
[4.5834344]
[4.5834375]
```
        for (dir = 0; dir < 9; dir++)
```

Replacement in crawl-ref/source/libgui.cc at line 1725 [4.5793336]

B:BD[4.5834385] → [4.5834385:5834439]

            if( DCX+dx[dir] == cx && DCY+dy[dir]==cy)

[4.5834385]

[4.5834439]

            if (DCX+dx[dir] == cx && DCY+dy[dir]==cy)

Replacement in crawl-ref/source/libgui.cc at line 1738 [4.5793336]
B:BD[4.5834687] → [4.5834687:5834723]
```
            else return cmd_n[dir];
```
[4.5834687]
[4.5834723]
```
            else
                return cmd_n[dir];
```
Replacement in crawl-ref/source/libgui.cc at line 1741 [4.5793336]
B:BD[4.5834733] → [4.5834733:5834771]
```
        if (button != 1) return trig;
```
[4.5834733]
[4.5834771]
```
        if (button != 1)
            return trig;
```
Replacement in crawl-ref/source/libgui.cc at line 1746 [4.5793336]
B:BD[4.5834876] → [4.5834876:5834915]
```
        if (!map_bounds(gc)) return 0;
```
[4.5834876]
[4.5834915]
```
        if (!map_bounds(gc))
            return 0;
```

Replacement in crawl-ref/source/libgui.cc at line 1754 [4.5793336]

B:BD[4.5835014] → [4.5835014:5835075]

    if(mouse_mode==MOUSE_MODE_COMMAND && mode == REGION_MAP)

[4.5835014]

[4.5835075]

    if (mouse_mode==MOUSE_MODE_COMMAND && mode == REGION_MAP)

Replacement in crawl-ref/source/libgui.cc at line 1769 [4.5793336]
B:BD[4.5835422] → [4.5835422:5835461]
```
        if (!map_bounds(gc)) return 0;
```
[4.5835422]
[4.5835461]
```
        if (!map_bounds(gc))
            return 0;
```
Replacement in crawl-ref/source/libgui.cc at line 1791 [4.5793336]
B:BD[4.5836064] → [4.5836064:5836095]
```
        for(dir=0;dir<9;dir++)
```
[4.5836064]
[4.5836095]
```
        for (dir = 0; dir < 9; dir++)
```
Deletion in crawl-ref/source/libgui.cc at line 1794 [4.5793336]
B:BD[4.5836159] → [4.5836159:5836173]
```
            {
```
Deletion in crawl-ref/source/libgui.cc at line 1795 [4.5793336]
B:BD[4.5836210] → [4.5836210:5836224]
```
            }
```
Replacement in crawl-ref/source/libgui.cc at line 1821 [4.5793336]
B:BD[4.5836558] → [4.5836558:5836577]
B:BD[4.5836577] → [12.182662:182753]
```
    while(1)
    {
    k = 0;
    GetNextEvent(&etype, &key, &sh, &ct, &x1, &y1, &x2, &y2);
    switch(etype)
```
[4.5836558]
[12.182753]
```
    while (true)
```

Insertion in crawl-ref/source/libgui.cc at line 1823 [4.5793336]

[12.182759]

        k = 0;
        GetNextEvent(&etype, &key, &sh, &ct, &x1, &y1, &x2, &y2);
        switch(etype)
        {

Replacement in crawl-ref/source/libgui.cc at line 1829 [4.5793336]
B:BD[4.5836741] → [12.182784:182799]
```
        break;
```
[4.5836741]
[4.5836753]
```
            break;
```
Replacement in crawl-ref/source/libgui.cc at line 1833 [4.5793336]
B:BD[4.5836825] → [12.182823:182838]
```
        break;
```
[4.5836825]
[4.5836837]
```
            break;
```
Replacement in crawl-ref/source/libgui.cc at line 1837 [4.5793336]
B:BD[4.5836913] → [12.182866:182881]
```
        break;
```
[4.5836913]
[4.5836925]
```
            break;
```
Replacement in crawl-ref/source/libgui.cc at line 1841 [4.5793336]
B:BD[4.5836967] → [12.182906:182921]
```
        break;
```
[4.5836967]
[4.5836979]
```
            break;
```
Replacement in crawl-ref/source/libgui.cc at line 1844 [4.5793336]
B:BD[12.182939] → [12.182939:182970]
```
        break;
    } // switch
```
[12.182939]
[4.5837019]
```
            break;
        }
```
Replacement in crawl-ref/source/libgui.cc at line 1847 [4.5793336]
B:BD[4.5837020] → [12.182971:182994]
∅:D[12.182994] → [4.5837040:5837055]
B:BD[4.5837040] → [4.5837040:5837055]
```
    if (k != 0) break;
    }/*while*/
```
[4.5837020]
[4.5837055]
```
        if (k != 0)
            break;
    }
```

Replacement in crawl-ref/source/libgui.cc at line 1895 [4.5793336]

B:BD[4.5837749] → [4.5837749:5837888]

void gui_init_view_params(coord_def &termsz, coord_def &viewsz, 
    coord_def &msgp, coord_def &msgsz, coord_def &hudp, coord_def &hudsz)

[4.5837749]

[4.5837888]

void gui_init_view_params(coord_def &termsz, coord_def &viewsz,
                          coord_def &msgp, coord_def &msgsz,
                          coord_def &hudp, coord_def &hudsz)

Insertion in crawl-ref/source/libgui.cc at line 1928 [4.5793336]
[4.5838367]
[4.5838367]
Insertion in crawl-ref/source/libgui.cc at line 1931 [4.5793336]
[4.5838444]
[4.5838444]
Insertion in crawl-ref/source/libgui.cc at line 1934 [4.5793336]
[4.5838524]
[4.5838524]
Insertion in crawl-ref/source/libgui.cc at line 1937 [4.5793336]
[4.5838605]
[4.5838605]
Replacement in crawl-ref/source/libgui.cc at line 1944 [4.5793336]
B:BD[4.5838773] → [4.5838773:5838810]
```
        if(region_lock[REGION_MAP]) 
```
[4.5838773]
[4.5838810]
```
        if (region_lock[REGION_MAP])
```
Replacement in crawl-ref/source/item_use.cc at line 4690 [13.2781507]
∅:D[11.5022] → [4.5849437:5849466]
B:BD[4.5849437] → [4.5849437:5849466]
```
    else if (act != INV_USE)
```
[11.5022]
[4.5849466]
```
    else if (act == INV_USE2) // secondary item use
```

Insertion in crawl-ref/source/item_use.cc at line 4692 [13.2781507]

[4.5849472]

        if (you.inv[idx].base_type == OBJ_WEAPONS
            && is_throwable(you.inv[idx], player_size(PSIZE_BODY))) 
        {
            fire_thing(idx); // fire weapons
        }
        else if (you.inv[idx].base_type == OBJ_MISCELLANY
                 || you.inv[idx].base_type == OBJ_STAVES
                    && item_is_rod(you.inv[idx])) // unwield rods/misc. items
        {
            if (you.equip[EQ_WEAPON] == idx
                && check_warning_inscriptions(you.inv[idx], OPER_WIELD))
            {
                wield_weapon(true, PROMPT_GOT_SPECIAL); // unwield
            }
        }

Insertion in crawl-ref/source/item_use.cc at line 4709 [13.2781507]
[4.5849494]
[4.5849494]
```
    else if (act != INV_USE)
        return;
```

Replacement in crawl-ref/source/item_use.cc at line 4757 [13.2781507]

B:BD[4.5850630] → [7.6298:6463]

            // evoke misc. items and known rods
            if (type == OBJ_MISCELLANY
                ||item_is_rod(you.inv[idx]) && item_type_known(you.inv[idx]))

[4.5850630]

[4.5850647]

            // evoke misc. items and rods
            if (type == OBJ_MISCELLANY || item_is_rod(you.inv[idx]))

Replacement in crawl-ref/source/item_use.cc at line 4764 [13.2781507]

B:BD[4.5850819] → [7.6600:6661]

            // unwield unknown rods, other staves or weapons

[4.5850819]

[7.6661]

            // unwield staves or weapons

Insertion in crawl-ref/source/initfile.cc at line 808 [13.2957258]
[8.5520]
[8.5520]
```
    tile_neutral_col     = MAP_RED;
```

Insertion in crawl-ref/source/initfile.cc at line 2733 [13.2957258]

[8.6250]

               str_to_tile_colour(field);
    }
    else if (key == "tile_neutral_col")
    {
        tile_neutral_col =

Insertion in crawl-ref/source/externs.h at line 1769 [13.3270163]
[8.8080]
[8.8080]
```
    char        tile_neutral_col;
```
Insertion in crawl-ref/init.txt at line 278 [13.4830895]
[8.8703]
[8.8703]
```
# tile_neutral_col     = red
```

Replacement in crawl-ref/docs/crawl_options.txt at line 81 [14.63392]

B:BD[8.9226] → [8.9226:9294]

B:BD[8.9294] → [2.3839:3904]

                tile_monster_col, tile_friendly_col, tile_item_col,
                tile_unseen_col, tile_floor_col, tile_wall_col,

[8.9226]

[2.3904]

                tile_monster_col, tile_neutral_col, tile_friendly_col, 
		tile_item_col, tile_unseen_col, tile_floor_col, tile_wall_col,

Insertion in crawl-ref/docs/crawl_options.txt at line 1300 [14.63392]
[8.9623]
[8.9623]
```
tile_neutral_col     = red
```
Insertion in crawl-ref/docs/crawl_options.txt at line 1321 [14.63392]
[8.10351]
[8.10351]
```
	   tile_neutral_col      - colour of neutral monsters
```

Introduce a temporary neutral brand for tiles because it was driving me nuts

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tiles.h at line 145 [4.7013]

Replacement in crawl-ref/source/tiles.h at line 149 [4.7013]

Replacement in crawl-ref/source/tiles.h at line 154 [4.7013]

Insertion in crawl-ref/source/tile2.cc at line 747 [4.13289]

Replacement in crawl-ref/source/tile2.cc at line 766 [4.13289]

Insertion in crawl-ref/source/tile1.cc at line 819 [4.96318]

Deletion in crawl-ref/source/tile1.cc at line 831 [4.96318]

Replacement in crawl-ref/source/libgui.h at line 83 [4.5789586]

Replacement in crawl-ref/source/libgui.cc at line 359 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 361 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1341 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1346 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1354 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1360 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1547 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1627 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1641 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1644 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1648 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1652 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1723 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1725 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1738 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1741 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1746 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1754 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1769 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1791 [4.5793336]

Deletion in crawl-ref/source/libgui.cc at line 1794 [4.5793336]

Deletion in crawl-ref/source/libgui.cc at line 1795 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1821 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1823 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1829 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1833 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1837 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1841 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1844 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1847 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1895 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1928 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1931 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1934 [4.5793336]

Insertion in crawl-ref/source/libgui.cc at line 1937 [4.5793336]

Replacement in crawl-ref/source/libgui.cc at line 1944 [4.5793336]

Replacement in crawl-ref/source/item_use.cc at line 4690 [13.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4692 [13.2781507]

Insertion in crawl-ref/source/item_use.cc at line 4709 [13.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4757 [13.2781507]

Replacement in crawl-ref/source/item_use.cc at line 4764 [13.2781507]

Insertion in crawl-ref/source/initfile.cc at line 808 [13.2957258]

Insertion in crawl-ref/source/initfile.cc at line 2733 [13.2957258]

Insertion in crawl-ref/source/externs.h at line 1769 [13.3270163]

Insertion in crawl-ref/init.txt at line 278 [13.4830895]

Replacement in crawl-ref/docs/crawl_options.txt at line 81 [14.63392]

Insertion in crawl-ref/docs/crawl_options.txt at line 1300 [14.63392]

Insertion in crawl-ref/docs/crawl_options.txt at line 1321 [14.63392]