fiddlerwoaroof/crawl - Change GYRKOLZFYXWJTPEV35USSHCJNA6Y4XMDHSTEZWEBM57WQP2PT6UQC

For 1924228. Shop prompts and welcome and things are printed in the message

area instead of in a hardcoded screen location (that happens to be in the message area on default-sized consoles). Also made some minor changes so the prompts look like non-shop prompts. And changed some names of static functions.

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

Created by pauldubois on March 29, 2008

GYRKOLZFYXWJTPEV35USSHCJNA6Y4XMDHSTEZWEBM57WQP2PT6UQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/shopping.cc at line 18 [5.759950]
[5.760355]
[5.760355]
```
#include "message.h"
```

Insertion in crawl-ref/source/shopping.cc at line 45 [5.759950]

[6.61]

[5.760661]


static void _in_a_shop(int shopidx);
static void _purchase( int shop, int item_got, int cost, bool id);
static void _shop_print( const char *shoppy, int line )
{
    cgotoxy(1, line+1, GOTO_MSG);
    cprintf("%s", shoppy);
    clear_to_end_of_line();
}

Replacement in crawl-ref/source/shopping.cc at line 56 [5.759950]

B:BD[5.760662] → [7.461:584]

∅:D[7.584] → [8.1605:1662]

B:BD[8.1605] → [8.1605:1662]

static void in_a_shop(int shopidx);
static void more3();
static void purchase( int shop, int item_got, int cost, bool id);
static void shop_print(const char *shoppy, int sh_line);

[5.760662]

[9.166280]

static void _shop_more()
{
    cgotoxy(70, 2, GOTO_MSG);
    cprintf("-more-");
    get_ch();
    return;
}

Replacement in crawl-ref/source/shopping.cc at line 64 [5.759950]
B:BD[9.166281] → [9.166281:166340]
```
static std::string hyphenated_suffix(char prev, char last)
```
[9.166281]
[9.166340]
```
static std::string _hyphenated_suffix(char prev, char last)
```
Replacement in crawl-ref/source/shopping.cc at line 77 [5.759950]
B:BD[9.166535] → [9.166535:166590]
```
static std::string purchase_keys(const std::string &s)
```
[9.166535]
[9.166590]
```
static std::string _purchase_keys(const std::string &s)
```
Replacement in crawl-ref/source/shopping.cc at line 90 [5.759950]
B:BD[9.166840] → [9.166840:166887]
```
        list += hyphenated_suffix(prev, last);
```
[9.166840]
[9.166887]
```
        list += _hyphenated_suffix(prev, last);
```

Replacement in crawl-ref/source/shopping.cc at line 94 [5.759950]

B:BD[9.166925] → [9.166925:166983]

    list += hyphenated_suffix( s[s.length() - 1], last );

[9.166925]

[9.166983]

    list += _hyphenated_suffix( s[s.length() - 1], last );

Replacement in crawl-ref/source/shopping.cc at line 99 [5.759950]
B:BD[9.167025] → [9.167025:167084]
```
static void list_shop_keys(const std::string &purchasable)
```
[9.167025]
[9.167084]
```
static void _list_shop_keys(const std::string &purchasable)
```
Replacement in crawl-ref/source/shopping.cc at line 105 [5.759950]
B:BD[5.761153] → [9.167125:167177]
```
    std::string pkeys = purchase_keys(purchasable);
```
[5.761153]
[7.585]
```
    std::string pkeys = _purchase_keys(purchasable);
```
Replacement in crawl-ref/source/shopping.cc at line 125 [5.759950]
B:BD[9.167759] → [7.610:658]
```
static std::vector<int> shop_stock(int shopidx)
```
[9.167759]
[5.761199]
```
static std::vector<int> _shop_get_stock(int shopidx)
```

Replacement in crawl-ref/source/shopping.cc at line 139 [5.759950]

B:BD[5.762234] → [7.848:917]

static int shop_item_value(const item_def& item, int greed, bool id)

[5.762234]

[7.917]

static int _shop_get_item_value(const item_def& item, int greed, bool id)

Replacement in crawl-ref/source/shopping.cc at line 154 [5.759950]

B:BD[5.762525] → [7.1139:1207]

static std::string shop_print_stock( const std::vector<int>& stock,

[5.762525]

[7.1207]

static std::string _shop_print_stock( const std::vector<int>& stock,

Replacement in crawl-ref/source/shopping.cc at line 162 [5.759950]

B:BD[5.762560] → [7.1465:1543]

        const int gp_value = shop_item_value(mitm[stock[i]], shop.greed, id);

[5.762560]

[10.1484]

        const int gp_value = _shop_get_item_value(mitm[stock[i]], shop.greed, id);

Replacement in crawl-ref/source/shopping.cc at line 183 [5.759950]
B:BD[5.763197] → [7.1912:1949]
```
static void in_a_shop( int shopidx )
```
[5.763197]
[7.1949]
```
static void _in_a_shop( int shopidx )
```
Deletion in crawl-ref/source/shopping.cc at line 189 [5.759950]
B:BD[11.234139] → [11.234139:234155]
```
#ifdef USE_TILE
```
Deletion in crawl-ref/source/shopping.cc at line 190 [5.759950]
B:BD[11.234169] → [11.234169:234176]
```
#endif
```
Replacement in crawl-ref/source/shopping.cc at line 192 [5.759950]
B:BD[7.2113] → [7.2113:2148]
∅:D[7.2148] → [5.763470:763471]
B:BD[5.763470] → [5.763470:763471]
B:BD[5.763471] → [7.2149:2166]
```
    shop_print(hello.c_str(), 20);
    more3();    
```
[7.2113]
[7.2166]
```
    _shop_print(hello.c_str(), 1);
    _shop_more();    
```

Replacement in crawl-ref/source/shopping.cc at line 201 [5.759950]

B:BD[7.2321] → [7.2321:2375]

        std::vector<int> stock = shop_stock(shopidx);

[7.2321]

[9.168363]

        std::vector<int> stock = _shop_get_stock(shopidx);

Replacement in crawl-ref/source/shopping.cc at line 206 [5.759950]

B:BD[7.2433] → [7.2433:2518]

            shop_print("I'm sorry, my shop is empty now.", 20);
            more3();

[7.2433]

[7.2518]

            _shop_print("I'm sorry, my shop is empty now.", 1);
            _shop_more();

Replacement in crawl-ref/source/shopping.cc at line 211 [5.759950]

B:BD[7.2561] → [7.2561:2669]

        const std::string purchasable = shop_print_stock(stock, shop);
        list_shop_keys(purchasable);

[7.2561]

[7.2669]

        const std::string purchasable = _shop_print_stock(stock, shop);
        _list_shop_keys(purchasable);

Replacement in crawl-ref/source/shopping.cc at line 217 [5.759950]
B:BD[7.2831] → [7.2831:2861]
```
        shop_print(info, 19);
```
[7.2831]
[9.168533]
```
        _shop_print(info, 0);
```

Replacement in crawl-ref/source/shopping.cc at line 219 [5.759950]

B:BD[9.168534] → [7.2862:2927]

        snprintf( info, INFO_SIZE, "What would you like to %s?",

[9.168534]

[7.2927]

        snprintf( info, INFO_SIZE, "What would you like to %s? ",

Replacement in crawl-ref/source/shopping.cc at line 222 [5.759950]
B:BD[5.763703] → [7.2988:3018]
```
        shop_print(info, 20);
```
[5.763703]
[7.3018]
```
        _shop_print(info, 1);
```

Replacement in crawl-ref/source/shopping.cc at line 235 [5.759950]

B:BD[7.3261] → [7.3261:3312]

            shop_print("Examine which item?", 20);

[7.3261]

[7.3312]

            _shop_print("Examine which item?", 1);

Replacement in crawl-ref/source/shopping.cc at line 254 [5.759950]

B:BD[7.3718] → [7.3718:3783]

                shop_print("Huh?", 20);
                more3();

[7.3718]

[7.3783]

                _shop_print("Huh?", 1);
                _shop_more();

Replacement in crawl-ref/source/shopping.cc at line 279 [5.759950]
B:BD[5.764096] → [7.4653:4689]
∅:D[7.4689] → [5.764163:764184]
B:BD[5.764163] → [5.764163:764184]
```
            shop_print("Huh?", 20);
            more3();
```
[5.764096]
[5.764211]
```
            _shop_print("Huh?", 1);
            _shop_more();
```

Replacement in crawl-ref/source/shopping.cc at line 287 [5.759950]

B:BD[7.4818] → [7.4818:4892]

                shop_print("No such item.", 20);
                more3();

[7.4818]

[7.4892]

                _shop_print("No such item.", 1);
                _shop_more();

Replacement in crawl-ref/source/shopping.cc at line 294 [5.759950]

B:BD[7.4992] → [7.4992:5070]

            const int gp_value = shop_item_value(item, shop.greed, id_stock);

[7.4992]

[7.5070]

            const int gp_value = _shop_get_item_value(item, shop.greed, id_stock);

Replacement in crawl-ref/source/shopping.cc at line 297 [5.759950]

B:BD[7.5121] → [7.5121:5256]

                shop_print("I'm sorry, you don't seem to have enough money.",
                           20);
                more3();

[7.5121]

[7.5256]

                _shop_print("I'm sorry, you don't seem to have enough money.", 1);
                _shop_more();

Replacement in crawl-ref/source/shopping.cc at line 302 [5.759950]

B:BD[7.5301] → [7.5301:5375]

                snprintf(info, INFO_SIZE, "Purchase %s (%d gold)? [y/n]",

[7.5301]

[7.5375]

                textcolor(channel_to_colour(MSGCH_PROMPT));
                snprintf(info, INFO_SIZE, "Purchase %s (%d gold)? (y/n) ",

Replacement in crawl-ref/source/shopping.cc at line 305 [5.759950]
B:BD[7.5444] → [7.5444:5482]
```
                shop_print(info, 20);
```
[7.5444]
[5.764269]
```
                _shop_print(info, 1);
```

Replacement in crawl-ref/source/shopping.cc at line 308 [5.759950]

B:BD[7.5549] → [7.5549:5621]

                    purchase( shopidx, stock[ft], gp_value, id_stock );

[7.5549]

[7.5621]

                    _purchase( shopidx, stock[ft], gp_value, id_stock );

Deletion in crawl-ref/source/shopping.cc at line 320 [5.759950]
∅:D[3.673] → [12.195039:195042]
∅:D[8.2897] → [12.195039:195042]
B:BD[12.195039] → [12.195039:195042]
B:BD[12.195042] → [8.2898:2957]
∅:D[8.2957] → [5.767265:767267]
B:BD[5.767265] → [5.767265:767267]
B:BD[5.767267] → [4.1816:1852]
∅:D[4.1852] → [9.168734:168761]
∅:D[11.234212] → [9.168734:168761]
B:BD[5.768002] → [9.168734:168761]
B:BD[9.168761] → [3.674:702]
∅:D[3.702] → [5.768092:768095]
B:BD[5.768092] → [5.768092:768095]
B:BD[5.768095] → [7.5636:5656]
∅:D[8.2978] → [5.768112:768114]
∅:D[7.5656] → [5.768112:768114]
B:BD[5.768112] → [5.768112:768114]
B:BD[5.768114] → [4.1853:1884]
∅:D[4.1884] → [5.768155:768178]
∅:D[11.234243] → [5.768155:768178]
B:BD[5.768155] → [5.768155:768178]
B:BD[5.768178] → [7.5657:5683]
```
}
static void shop_print( const char *shoppy, int sh_lines )
{
    cgotoxy(1, sh_lines, GOTO_CRT);
    cprintf("%s", shoppy);
    clear_to_end_of_line();
}
static void more3()
{
    cgotoxy(70, 20, GOTO_CRT);
    cprintf("-more-");
    get_ch();
    return;
```

Replacement in crawl-ref/source/shopping.cc at line 322 [5.759950]

B:BD[5.768277] → [7.5684:5750]

static void purchase( int shop, int item_got, int cost, bool id )

[5.768277]

[5.768334]

static void _purchase( int shop, int item_got, int cost, bool id )

Replacement in crawl-ref/source/shopping.cc at line 349 [5.759950]

B:BD[5.768805] → [5.768805:768854]

        shop_print( info, 20 );
        more3();

[5.768805]

[5.768854]

        _shop_print(info, 1);
        _shop_more();

Replacement in crawl-ref/source/shopping.cc at line 460 [5.759950]
B:BD[5.771922] → [2.43:109]
∅:D[2.109] → [5.771989:772038]
B:BD[5.771989] → [5.771989:772038]
```
    // copy to mangle as necessary... maybe that should be fixed,
    // but this function isn't called too often.
```
[5.771922]
[5.772038]
```
    // copy to mangle as necessary.
```
Replacement in crawl-ref/source/shopping.cc at line 1496 [5.759950]
B:BD[5.797823] → [8.3750:3768]
```
    in_a_shop(i);
```
[5.797823]
[5.797921]
```
    _in_a_shop(i);
```

For 1924228. Shop prompts and welcome and things are printed in the message

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/shopping.cc at line 18 [5.759950]

Insertion in crawl-ref/source/shopping.cc at line 45 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 56 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 64 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 77 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 90 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 94 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 99 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 105 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 125 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 139 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 154 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 162 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 183 [5.759950]

Deletion in crawl-ref/source/shopping.cc at line 189 [5.759950]

Deletion in crawl-ref/source/shopping.cc at line 190 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 192 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 201 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 206 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 211 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 217 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 219 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 222 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 235 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 254 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 279 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 287 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 294 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 297 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 302 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 305 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 308 [5.759950]

Deletion in crawl-ref/source/shopping.cc at line 320 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 322 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 349 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 460 [5.759950]

Replacement in crawl-ref/source/shopping.cc at line 1496 [5.759950]