fiddlerwoaroof/crawl - Change EERRG6FVPJDZD6UNX2W4UXG6HU7XAU7TDNDHMRCXTA4NN4VHFSAAC

Lua functions for FLOORCOL and ROCKCOL are now named floorcol() and rockcol() instead of floor_colour and rock_colour, to match the convention for other .des headers (dpeg).

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

Created by dshaligram on November 23, 2008

EERRG6FVPJDZD6UNX2W4UXG6HU7XAU7TDNDHMRCXTA4NN4VHFSAAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/util/levcomp.ypp at line 362 [4.75608]

B:BD[3.366] → [3.366:427]

                        make_stringf("floor_colour(\"%s\")",

[3.366]

[3.427]

                        make_stringf("floorcol(\"%s\")",

Replacement in crawl-ref/source/util/levcomp.ypp at line 371 [4.75608]

B:BD[3.658] → [3.658:718]

                        make_stringf("rock_colour(\"%s\")",

[3.658]

[3.718]

                        make_stringf("rockcol(\"%s\")",

Replacement in crawl-ref/source/luadgn.cc at line 1020 [5.1232]
B:BD[3.1393] → [3.1393:1436]
```
static int dgn_floor_colour(lua_State *ls)
```
[3.1393]
[3.1436]
```
static int dgn_floorcol(lua_State *ls)
```
Deletion in crawl-ref/source/luadgn.cc at line 1023 [5.1232]
B:BD[3.1459] → [3.1459:1540]
```
    const char *s = luaL_checkstring(ls, 2);
    int colour = str_to_colour(s);
```
Replacement in crawl-ref/source/luadgn.cc at line 1024 [5.1232]
B:BD[3.1541] → [3.1541:1580]
```
    if (colour < 0 || colour == BLACK)
```
[3.1541]
[3.1580]
```
    if (!lua_isnone(ls, 2))
```

Replacement in crawl-ref/source/luadgn.cc at line 1026 [5.1232]

B:BD[3.1586] → [3.1586:1613]

        std::string error;

[3.1586]

[3.1613]

        const char *s = luaL_checkstring(ls, 2);
        int colour = str_to_colour(s);

Replacement in crawl-ref/source/luadgn.cc at line 1029 [5.1232]

B:BD[3.1614] → [3.1614:1712]

B:BD[3.1712] → [2.14376:14389]

        if (colour == BLACK)
        {
            error = "Can't set floor to black.";
        }
        else

[3.1614]

[2.14389]

        if (colour < 0 || colour == BLACK)

Replacement in crawl-ref/source/luadgn.cc at line 1031 [5.1232]

∅:D[2.14399] → [3.1727:1830]

B:BD[3.1727] → [3.1727:1830]

            error = "No such colour as '";
            error += s;
            error += "'";
        }

[2.14399]

[3.1830]

            std::string error;

Replacement in crawl-ref/source/luadgn.cc at line 1033 [5.1232]

B:BD[3.1831] → [3.1831:1876]

        luaL_argerror(ls, 2, error.c_str());

[3.1831]

[3.1876]

            if (colour == BLACK)
            {
                error = "Can't set floor to black.";
            }
            else
            {
                error = "No such colour as '";
                error += s;
                error += "'";
            }

Replacement in crawl-ref/source/luadgn.cc at line 1044 [5.1232]

B:BD[3.1877] → [3.1877:1897]

        return (0);

[3.1877]

[3.1897]

            luaL_argerror(ls, 2, error.c_str());
            return (0);
        }
        map->floor_colour = (unsigned char) colour;

Replacement in crawl-ref/source/luadgn.cc at line 1050 [5.1232]

B:BD[3.1903] → [3.1903:1968]


    map->floor_colour = (unsigned char) colour;
    return (0);

[3.1903]

[3.1968]

    PLUARET(string, colour_to_str(map->floor_colour).c_str());

Replacement in crawl-ref/source/luadgn.cc at line 1053 [5.1232]
B:BD[3.1971] → [3.1971:2013]
```
static int dgn_rock_colour(lua_State *ls)
```
[3.1971]
[3.2013]
```
static int dgn_rockcol(lua_State *ls)
```
Deletion in crawl-ref/source/luadgn.cc at line 1056 [5.1232]
B:BD[3.2036] → [3.2036:2117]
```
    const char *s = luaL_checkstring(ls, 2);
    int colour = str_to_colour(s);
```
Replacement in crawl-ref/source/luadgn.cc at line 1057 [5.1232]
B:BD[3.2118] → [3.2118:2157]
```
    if (colour < 0 || colour == BLACK)
```
[3.2118]
[3.2157]
```
    if (!lua_isnone(ls, 2))
```

Replacement in crawl-ref/source/luadgn.cc at line 1059 [5.1232]

B:BD[3.2163] → [3.2163:2190]

        std::string error;

[3.2163]

[3.2190]

        const char *s = luaL_checkstring(ls, 2);
        int colour = str_to_colour(s);

Replacement in crawl-ref/source/luadgn.cc at line 1062 [5.1232]

B:BD[3.2191] → [3.2191:2288]

B:BD[3.2288] → [2.14400:14413]

        if (colour == BLACK)
        {
            error = "Can't set rock to black.";
        }
        else

[3.2191]

[2.14413]

        if (colour < 0 || colour == BLACK)

Replacement in crawl-ref/source/luadgn.cc at line 1064 [5.1232]

∅:D[2.14423] → [3.2303:2406]

B:BD[3.2303] → [3.2303:2406]

            error = "No such colour as '";
            error += s;
            error += "'";
        }

[2.14423]

[3.2406]

            std::string error;

Replacement in crawl-ref/source/luadgn.cc at line 1066 [5.1232]

B:BD[3.2407] → [3.2407:2452]

        luaL_argerror(ls, 2, error.c_str());

[3.2407]

[3.2452]

            if (colour == BLACK)
            {
                error = "Can't set rock to black.";
            }
            else
            {
                error = "No such colour as '";
                error += s;
                error += "'";
            }

Replacement in crawl-ref/source/luadgn.cc at line 1077 [5.1232]
B:BD[3.2453] → [3.2453:2479]
```
        return (0);
    }
```
[3.2453]
[3.2479]
```
            luaL_argerror(ls, 2, error.c_str());
```
Replacement in crawl-ref/source/luadgn.cc at line 1079 [5.1232]
B:BD[3.2480] → [3.2480:2527]
```
    map->rock_colour = (unsigned char) colour;
```
[3.2480]
[3.2527]
```
            return (0);
        }
```

Replacement in crawl-ref/source/luadgn.cc at line 1082 [5.1232]

B:BD[3.2528] → [3.2528:2544]

    return (0);

[3.2528]

[3.2544]

        map->rock_colour = (unsigned char) colour;
    }
    PLUARET(string, colour_to_str(map->rock_colour).c_str());

Replacement in crawl-ref/source/luadgn.cc at line 2106 [5.1232]

B:BD[6.6077] → [3.6966:7046]

    { "floor_colour", dgn_floor_colour},
    { "rock_colour", dgn_rock_colour},

[6.6077]

[5.12649]

    { "floorcol", dgn_floorcol},
    { "rockcol", dgn_rockcol},

Replacement in crawl-ref/source/dat/bazaar.des at line 296 [8.48488]
B:BD[7.1282] → [7.1282:1308]
```
: _G.floor_colour(colour)
```
[7.1282]
[7.1308]
```
: floorcol(colour)
```
Replacement in crawl-ref/source/dat/bazaar.des at line 331 [8.48488]
B:BD[7.1403] → [7.1403:1429]
```
: _G.floor_colour(colour)
```
[7.1403]
[7.1429]
```
: floorcol(colour)
```
Replacement in crawl-ref/source/dat/bazaar.des at line 386 [8.48488]
B:BD[7.1524] → [7.1524:1550]
```
: _G.floor_colour(colour)
```
[7.1524]
[7.1550]
```
: floorcol(colour)
```
Replacement in crawl-ref/source/dat/bazaar.des at line 428 [8.48488]
B:BD[7.1671] → [7.1671:1697]
```
: _G.floor_colour(colour)
```
[7.1671]
[7.1697]
```
: floorcol(colour)
```
Replacement in crawl-ref/source/dat/bazaar.des at line 749 [8.48488]
B:BD[7.1849] → [7.1849:1875]
```
: _G.floor_colour(colour)
```
[7.1849]
[7.1875]
```
: floorcol(colour)
```
Replacement in crawl-ref/source/dat/bazaar.des at line 871 [8.48488]
B:BD[7.1943] → [7.1943:1969]
```
: _G.floor_colour(colour)
```
[7.1943]
[7.1969]
```
: floorcol(colour)
```

Lua functions for FLOORCOL and ROCKCOL are now named floorcol() and rockcol() instead of floor_colour and rock_colour, to match the convention for other .des headers (dpeg).

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/util/levcomp.ypp at line 362 [4.75608]

Replacement in crawl-ref/source/util/levcomp.ypp at line 371 [4.75608]

Replacement in crawl-ref/source/luadgn.cc at line 1020 [5.1232]

Deletion in crawl-ref/source/luadgn.cc at line 1023 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1024 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1026 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1029 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1031 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1033 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1044 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1050 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1053 [5.1232]

Deletion in crawl-ref/source/luadgn.cc at line 1056 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1057 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1059 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1062 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1064 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1066 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1077 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1079 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 1082 [5.1232]

Replacement in crawl-ref/source/luadgn.cc at line 2106 [5.1232]

Replacement in crawl-ref/source/dat/bazaar.des at line 296 [8.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 331 [8.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 386 [8.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 428 [8.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 749 [8.48488]

Replacement in crawl-ref/source/dat/bazaar.des at line 871 [8.48488]