fiddlerwoaroof/crawl - Change 3Z3XT5LGULCCEN2BVCYLB6NPSZUV2TNICMT6U4EULBLSUVWHR5LAC

Fix some warnings for gcc 4.4 as per trentbuck's patch 2824633.

Add flavour messages to opening the gate to Zot. Really, we'd need something like that for winning the game, but what?

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

Created by j-p-e-g on July 21, 2009

3Z3XT5LGULCCEN2BVCYLB6NPSZUV2TNICMT6U4EULBLSUVWHR5LAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/rltiles/tool/tile_page.h at line 21 [4.13768]
B:BD[4.14130] → [4.14130:14165]
```
    int m_width;
    int m_height;
```
[4.14130]
[4.14165]
```
    unsigned int m_width;
    unsigned int m_height;
```
Insertion in crawl-ref/source/rltiles/tool/tile_page.cc at line 3 [4.14214]
[4.14263]
[5.287]
```
#include <stdio.h>
```
Replacement in crawl-ref/source/rltiles/tool/tile_page.cc at line 86 [4.14214]
B:BD[4.17584] → [4.17584:17593]
```
        
```
[4.17584]
[4.17593]
Replacement in crawl-ref/source/rltiles/tool/tile.h at line 20 [4.38692]
B:BD[4.39079] → [4.39079:39127]
```
    void resize(int new_width, int new_height);
```
[4.39079]
[4.39127]
```
    void resize(unsigned int new_width, unsigned int new_height);
```

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

B:BD[4.39191] → [2.506:561]

∅:D[2.561] → [4.39247:39316]

B:BD[4.39247] → [4.39247:39316]

    void corpsify(int corpse_width, int corpse_height,
        int cut_separate, int cut_height, const tile_colour &wound);

[4.39191]

[4.39316]

    void corpsify(unsigned int corpse_width, unsigned int corpse_height,
                  unsigned int cut_separate, unsigned int cut_height,
                  const tile_colour &wound);

Replacement in crawl-ref/source/rltiles/tool/tile.h at line 46 [4.38692]
B:BD[4.39829] → [4.39829:39864]
```
    int m_width;
    int m_height;
```
[4.39829]
[4.39864]
```
    unsigned int m_width;
    unsigned int m_height;
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 74 [4.40039]
B:BD[4.41033] → [4.41033:41082]
```
void tile::resize(int new_width, int new_height)
```
[4.41033]
[4.41082]
```
void tile::resize(unsigned int new_width, unsigned int new_height)
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 129 [4.40039]
B:BD[4.42365] → [4.42365:42418]
```
    // force all corpses into 32x32, even if bigger.
```
[4.42365]
[4.42418]
```
    // Force all corpses into 32x32, even if bigger.
```

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

B:BD[4.42478] → [4.42478:42537]

static int corpse_cut_height(int x, int width, int height)

[4.42478]

[4.42537]

static unsigned int _corpse_cut_height(unsigned int x, unsigned int width,
                                       unsigned int height)

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

B:BD[4.42964] → [2.1058:1115]

∅:D[2.1115] → [4.43022:43086]

B:BD[4.43022] → [4.43022:43086]

void tile::corpsify(int corpse_width, int corpse_height,
    int cut_separate, int cut_height, const tile_colour &wound)

[4.42964]

[4.43086]

void tile::corpsify(unsigned int corpse_width, unsigned int corpse_height,
                    unsigned int cut_separate, unsigned int cut_height,
                    const tile_colour &wound)

Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 156 [4.40039]
B:BD[4.43088] → [4.43088:43136]
```
    int wound_height = std::min(2, cut_height);
```
[4.43088]
[4.43136]
```
    unsigned int wound_height = std::min(2, (int) cut_height);
```

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

B:BD[4.44117] → [4.44117:44214]

    for (int y = 0; y < corpse_height; y++)
    {
        for (int x = 0; x < corpse_width; x++)

[4.44117]

[4.44214]

    for (unsigned int y = 0; y < corpse_height; y++)
        for (unsigned int x = 0; x < corpse_width; x++)

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

B:BD[4.44224] → [4.44224:44296]

            int cy = corpse_cut_height(x, corpse_width, corpse_height);

[4.44224]

[4.44296]

            unsigned int cy = _corpse_cut_height(x, corpse_width,
                                                    corpse_height);

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 225 [4.40039]
B:BD[4.45296] → [4.45296:45302]
```
    }
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 227 [4.40039]
B:BD[4.45343] → [4.45343:45386]
```
    for (int x = 0; x < corpse_width; x++)
```
[4.45343]
[4.45386]
```
    for (unsigned int x = 0; x < corpse_width; x++)
```

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

B:BD[4.45392] → [4.45392:45506]

        unsigned int cy = corpse_cut_height(x, corpse_width, corpse_height);
        if (flags(x, cy-cut_height))

[4.45392]

[4.45506]

        unsigned int cy = _corpse_cut_height(x, corpse_width, corpse_height);
        if (flags(x, cy - cut_height))

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

B:BD[4.45570] → [4.45570:45647]

            for (int y = start; y < start + wound_height; y++)
            {

[4.45570]

[4.45647]

            for (unsigned int y = start; y < start + wound_height; y++)

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 235 [4.40039]
B:BD[4.45688] → [4.45688:45702]
```
            }
```
Replacement in crawl-ref/source/rltiles/tool/tile.cc at line 239 [4.40039]
B:BD[4.45752] → [4.45752:45796]
```
    for (int y = 1; y < corpse_height; y++)
```
[4.45752]
[4.45796]
```
    for (unsigned int y = 1; y < corpse_height; y++)
```

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

B:BD[4.45859] → [4.45859:45970]

            if (!flags(x, y) && flags(x-1, y-1) &&
                get_pixel(x,y) == tile_colour::transparent)

[4.45859]

[4.45970]

            if (!flags(x, y) && flags(x-1, y-1)
                && get_pixel(x,y) == tile_colour::transparent)

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

B:BD[4.46093] → [4.46093:46190]

    for (int y = 3; y < corpse_height; y++)
    {
        for (int x = 3; x < corpse_width; x++)

[4.46093]

[4.46190]

    for (unsigned int y = 3; y < corpse_height; y++)
        for (unsigned int x = 3; x < corpse_width; x++)

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

B:BD[4.46451] → [4.46451:46681]

            if (get_pixel(x-1,y-1) == tile_colour::black &&
                flags(x-2, y-2) && flags(x-3, y-3) &&
                get_pixel(x-1, y) == tile_colour::black &&
                get_pixel(x, y-1) == tile_colour::black)

[4.46451]

[4.46681]

            if (get_pixel(x-1,y-1) == tile_colour::black
                && flags(x-2, y-2) && flags(x-3, y-3)
                && get_pixel(x-1, y) == tile_colour::black
                && get_pixel(x, y-1) == tile_colour::black)

Deletion in crawl-ref/source/rltiles/tool/tile.cc at line 268 [4.40039]
B:BD[4.46773] → [4.46773:46779]
```
    }
```
Insertion in crawl-ref/source/rltiles/tool/main.cc at line 1 [4.52677]
[4.52677]
[4.52678]
```
#include <stdio.h>
```
Insertion in crawl-ref/source/misc.cc at line 72 [6.1933596]
[6.1934526]
[6.1934526]
```
#include "spells1.h"
```
Replacement in crawl-ref/source/misc.cc at line 1483 [6.1933596]
B:BD[7.9923] → [7.9923:9963]
```
        if (is_valid_item( you.inv[i] )
```
[7.9923]
[7.9963]
```
        if (is_valid_item(you.inv[i])
```

Replacement in crawl-ref/source/misc.cc at line 1488 [6.1933596]

B:BD[7.10129] → [3.7591:7719]

            for (int q = 1; runes.size() < 3 && q < you.inv[i].quantity; ++q)
                runes.push_back(you.inv[i].plus);

[7.10129]

            for (int q = 1;
                 runes.size() < 3 && q <= you.inv[i].quantity; ++q)
            {
                runes.push_back(i);
            }

Replacement in crawl-ref/source/misc.cc at line 2140 [6.1933596]

B:BD[6.1950361] → [8.2729:2790]

                mpr("You need a Rune to enter this place.");

[6.1950361]

[6.1950422]

                mpr("You need a rune to enter this place.");

Replacement in crawl-ref/source/misc.cc at line 2144 [6.1933596]

B:BD[6.1950467] → [9.15806:15927]

                mprf( "You need at least %d Runes to enter this place.",
                      NUMBER_OF_RUNES_NEEDED );

[6.1950467]

[6.1950668]

                mprf("You need at least %d runes to enter this place.",
                     NUMBER_OF_RUNES_NEEDED);

Replacement in crawl-ref/source/misc.cc at line 2149 [6.1933596]

B:BD[10.18986] → [11.5385:5468]

        // TODO: This needs a better message!
        mpr("The gate opens wide!");

[10.18986]

[11.5468]


        ASSERT(runes.size() >= 3);
        mprf("You insert %s into the lock.",
             you.inv[runes[0]].name(DESC_NOCAP_THE).c_str());
#ifdef USE_TILE
        tiles.add_overlay(you.pos(), tileidx_zap(GREEN));
        update_screen();
#else
        you.flash_colour = LIGHTGREEN;
        viewwindow(true, false);
#endif
        mpr("The lock glows an eerie green colour!");
        more();
        mprf("You insert %s into the lock.",
             you.inv[runes[1]].name(DESC_NOCAP_THE).c_str());
        big_cloud(CLOUD_PURP_SMOKE, KC_YOU, you.pos(), 20, 7 + random2(7));
        viewwindow(true, false);
        mpr("Heavy smoke blows from the lock!");
        more();
        mprf("You insert %s into the lock.",
             you.inv[runes[2]].name(DESC_NOCAP_THE).c_str());
        if (silenced(you.pos()))
            mpr("The gate opens wide!");
        else
            mpr("With a loud hiss the gate opens wide!");
        more();

Fix some warnings for gcc 4.4 as per trentbuck's patch 2824633.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/rltiles/tool/tile_page.h at line 21 [4.13768]

Insertion in crawl-ref/source/rltiles/tool/tile_page.cc at line 3 [4.14214]

Replacement in crawl-ref/source/rltiles/tool/tile_page.cc at line 86 [4.14214]

Replacement in crawl-ref/source/rltiles/tool/tile.h at line 20 [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 46 [4.38692]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Insertion in crawl-ref/source/rltiles/tool/main.cc at line 1 [4.52677]

Insertion in crawl-ref/source/misc.cc at line 72 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 1483 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 1488 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 2140 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 2144 [6.1933596]

Replacement in crawl-ref/source/misc.cc at line 2149 [6.1933596]