fiddlerwoaroof/crawl - Change G5FMBUMNRJOHBPVOWV2TDZKO3CB4K5TSASXB4ONIYXZGUN3GJWQQC

Fix Peter's rltiles/tool warnings.

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

Created by j-p-e-g on June 27, 2009

G5FMBUMNRJOHBPVOWV2TDZKO3CB4K5TSASXB4ONIYXZGUN3GJWQQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/rltiles/tool/tile.h at line 11 [4.38692]

B:BD[4.38801] → [4.38801:38895]

    tile(const tile &img, const char *enumname = NULL,
        const char *parts_ctg = NULL);

[4.38801]

[4.38895]

    tile(const tile &img, const char *enumnam = NULL, const char *parts = NULL);

Replacement in crawl-ref/source/rltiles/tool/tile.h at line 14 [4.38692]

B:BD[4.38917] → [4.38917:39034]

    bool load(const std::string &filename);
    bool load(const std::string &filename, const std::string &enumname);

[4.38917]

[4.39034]

    bool load(const std::string &new_filename);
    bool load(const std::string &new_filename, const std::string &new_enumname);

Replacement in crawl-ref/source/rltiles/tool/tile.h at line 24 [4.38692]
B:BD[4.39191] → [4.39191:39247]
```
    void corpsify(int corpse_width, int corpse_height, 
```
[4.39191]
[4.39247]
```
    void corpsify(int corpse_width, int corpse_height,
```
Replacement in crawl-ref/source/rltiles/tool/tile.h at line 31 [4.38692]
B:BD[4.39451] → [4.39451:39491]
```
    void fill(const tile_colour &fill);
```
[4.39451]
[4.39491]
```
    void fill(const tile_colour &col);
```
Replacement in crawl-ref/source/rltiles/tool/tile.h at line 39 [4.38692]
B:BD[4.39652] → [4.39652:39686]
```
    void set_shrink(bool shrink);
```
[4.39652]
[4.39686]
```
    void set_shrink(bool new_shrink);
```

Replacement in crawl-ref/source/rltiles/tool/tile.h at line 41 [4.38692]

B:BD[4.39687] → [4.39687:39757]

    void get_bounding_box(int &x0, int &y0, int &width, int &height);

[4.39687]

[4.39757]

    void get_bounding_box(int &x0, int &y0, int &w, int &h);

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 11 [4.40039]

B:BD[4.40196] → [4.40196:40272]

tile::tile(const tile &img, const char *enumname, const char *parts_ctg) :

[4.40196]

[4.40272]

tile::tile(const tile &img, const char *enumnam, const char *parts) :

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 16 [4.40039]

B:BD[4.40334] → [4.40334:40435]

    if (enumname)
        m_enumname = enumname;
    if (parts_ctg)
        m_parts_ctg = parts_ctg;

[4.40334]

[4.40435]

    if (enumnam)
        m_enumname = enumnam;
    if (parts)
        m_parts_ctg = parts;

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 31 [4.40039]
B:BD[4.40537] → [4.40537:40565]
```
    m_width = m_height = 0;
```
[4.40537]
[4.40565]
```
    m_width  = m_height = 0;
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 69 [4.40039]
B:BD[4.40970] → [4.40970:41005]
```
void tile::set_shrink(bool shrink)
```
[4.40970]
[4.41005]
```
void tile::set_shrink(bool new_shrink)
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 71 [4.40039]
B:BD[4.41007] → [4.41007:41030]
```
    m_shrink = shrink;
```
[4.41007]
[4.41030]
```
    m_shrink = new_shrink;
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 77 [4.40039]
B:BD[4.41107] → [4.41107:41132]
```
    m_width = new_width;
```
[4.41107]
[4.41132]
```
    m_width  = new_width;
```

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 95 [4.40039]

B:BD[4.41493] → [4.41493:41559]

            flags[x + y * m_width] = ((get_pixel(x, y).a > 0) &&

[4.41493]

[4.41559]

            flags[x + y * m_width] = ((get_pixel(x, y).a > 0) &&

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 151 [4.40039]
B:BD[4.42964] → [4.42964:43022]
```
void tile::corpsify(int corpse_width, int corpse_height, 
```
[4.42964]
[4.43022]
```
void tile::corpsify(int corpse_width, int corpse_height,
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 158 [4.40039]
B:BD[4.43190] → [4.43190:43194]
```
   
```
[4.43190]
[4.43194]
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 278 [4.40039]
B:BD[4.46852] → [4.46852:46857]
```
    
```
[4.46852]
[4.46857]
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 295 [4.40039]
B:BD[4.47304] → [4.47304:47326]
```
        return false;
```
[4.47304]
[4.47326]
```
        return (false);
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 301 [4.40039]
B:BD[4.47436] → [4.47436:47458]
```
        return false;
```
[4.47436]
[4.47458]
```
        return (false);
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 309 [4.40039]
B:BD[4.47706] → [4.47706:47728]
```
        return false;
```
[4.47706]
[4.47728]
```
        return (false);
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 323 [4.40039]
B:BD[4.48183] → [4.48183:48200]
```
    return true;
```
[4.48183]
[4.48200]
```
    return (true);
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 326 [4.40039]
B:BD[4.48203] → [4.48203:48248]
```
bool tile::load(const std::string &filename)
```
[4.48203]
[4.48248]
```
bool tile::load(const std::string &new_filename)
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 328 [4.40039]
B:BD[4.48250] → [2.2074:2101]
```
    m_filename = filename;
```
[4.48250]
[2.2101]
```
    m_filename = new_filename;
```
Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 331 [4.40039]
B:BD[4.48268] → [4.48268:48274]
```
    {
```
Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 332 [4.40039]
B:BD[4.48292] → [4.48292:48298]
```
    }
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 333 [4.40039]
B:BD[4.48299] → [4.48299:48350]
```
    SDL_Surface *img = IMG_Load(filename.c_str());
```
[4.48299]
[4.48350]
```
    SDL_Surface *img = IMG_Load(new_filename.c_str());
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 335 [4.40039]
B:BD[4.48364] → [4.48364:48398]
```
    {
        return false;
    }
```
[4.48364]
[4.48398]
```
        return (false);
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 368 [4.40039]
B:BD[4.49254] → [4.49254:49277]
```
        int dest = 0; 
```
[4.49254]
[4.49277]
```
        int dest = 0;
```

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 373 [4.40039]

B:BD[4.49387] → [4.49387:49451]

                unsigned char *p = (unsigned char*)img->pixels

[4.49387]

[4.49451]

                unsigned char *p = (unsigned char*)img->pixels

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 398 [4.40039]
B:BD[4.50312] → [4.50312:50346]
```
                    return false;
```
[4.50312]
[4.50346]
```
                    return (false);
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 415 [4.40039]
B:BD[4.50733] → [4.50733:50750]
```
    return true;
```
[4.50733]
[4.50750]
```
    return (true);
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 418 [4.40039]
B:BD[4.50753] → [4.50753:50794]
```
void tile::fill(const tile_colour &fill)
```
[4.50753]
[4.50794]
```
void tile::fill(const tile_colour &col)
```
Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 421 [4.40039]
B:BD[4.50835] → [4.50835:50841]
```
    {
```

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 422 [4.40039]

B:BD[4.50883] → [4.50883:50945]

        {
            get_pixel(x, y) = fill;
        }
    }

[4.50883]

[4.50945]

            get_pixel(x, y) = col;

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 428 [4.40039]
B:BD[4.51056] → [4.51056:51062]
```
    {
```
Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 434 [4.40039]
B:BD[4.51226] → [4.51226:51232]
```
    }
```

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 442 [4.40039]

B:BD[4.51392] → [4.51392:51463]

void tile::get_bounding_box(int &x0, int &y0, int &width, int &height)

[4.51392]

[4.51463]

void tile::get_bounding_box(int &x0, int &y0, int &w, int &h)

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 446 [4.40039]
B:BD[4.51489] → [4.51489:51527]
```
        x0 = y0 = width = height = 0;
```
[4.51489]
[4.51527]
```
        x0 = y0 = w = h = 0;
```
Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 457 [4.40039]
B:BD[4.51750] → [4.51750:51760]
```
        {
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 458 [4.40039]
B:BD[4.51807] → [4.51807:51817]
```
        }
```
[4.51807]
[4.51817]
Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 468 [4.40039]
B:BD[4.51988] → [4.51988:51998]
```
        {
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 469 [4.40039]
B:BD[4.52045] → [4.52045:52055]
```
        }
```
[4.52045]
[4.52055]
Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 479 [4.40039]
B:BD[4.52226] → [4.52226:52236]
```
        {
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 480 [4.40039]
B:BD[4.52283] → [4.52283:52293]
```
        }
```
[4.52283]
[4.52293]
Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 490 [4.40039]
B:BD[4.52464] → [4.52464:52474]
```
        {
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 491 [4.40039]
B:BD[4.52521] → [4.52521:52531]
```
        }
```
[4.52521]
[4.52531]
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 497 [4.40039]
B:BD[4.52590] → [4.52590:52641]
```
    width = x1 - x0 + 1;
    height = y1 - y0 + 1;
```
[4.52590]
[4.52641]
```
    w = x1 - x0 + 1;
    h = y1 - y0 + 1;
```
Replacement in crawl-ref/source/rltiles/dc-unrand.txt at line 50 [3.11216]
B:BD[3.12632] → [3.12632:12666]
```
urand_fiery_devil UNRAND_HELLFIRE
```
[3.12632]
[3.12666]
```
urand_hellfire UNRAND_HELLFIRE
```

Fix Peter's rltiles/tool warnings.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/rltiles/tool/tile.h at line 11 [4.38692]

Replacement in crawl-ref/source/rltiles/tool/tile.h at line 14 [4.38692]

Replacement in crawl-ref/source/rltiles/tool/tile.h at line 24 [4.38692]

Replacement in crawl-ref/source/rltiles/tool/tile.h at line 31 [4.38692]

Replacement in crawl-ref/source/rltiles/tool/tile.h at line 39 [4.38692]

Replacement in crawl-ref/source/rltiles/tool/tile.h at line 41 [4.38692]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 11 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 16 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 31 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 69 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 71 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 77 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 95 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 151 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 158 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 278 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 295 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 301 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 309 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 323 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 326 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 328 [4.40039]

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 331 [4.40039]

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 332 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 333 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 335 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 368 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 373 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 398 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 415 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 418 [4.40039]

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 421 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 422 [4.40039]

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 428 [4.40039]

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 434 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 442 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 446 [4.40039]

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 457 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 458 [4.40039]

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 468 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 469 [4.40039]

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 479 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 480 [4.40039]

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 490 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 491 [4.40039]

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 497 [4.40039]

Replacement in crawl-ref/source/rltiles/dc-unrand.txt at line 50 [3.11216]