fiddlerwoaroof/crawl - Change 27JBFXYGCM6RU42Y5A4ZZ6I3RXXBY5A3B252YPAPSADTN6SFTH2QC

Goodbye, gold dropping. We wish thee well.

If I misunderstood and this is still up for debate, my apologies and please revert.

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

Created by haranp on November 22, 2006

27JBFXYGCM6RU42Y5A4ZZ6I3RXXBY5A3B252YPAPSADTN6SFTH2QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/items.cc at line 1686 [3.2584728]

B:BD[3.2620571] → [3.2620571:2620769]

B:BD[3.2620769] → [2.635547:635647]

∅:D[2.635647] → [3.2620769:2621204]

B:BD[3.2620769] → [3.2620769:2621204]

B:BD[3.2621204] → [2.635648:635872]

∅:D[2.635872] → [3.2621204:2621330]

B:BD[3.2621204] → [3.2621204:2621330]

B:BD[3.2621330] → [2.635873:635914]

∅:D[4.355778] → [3.2621330:2621436]

∅:D[2.635914] → [3.2621330:2621436]

B:BD[3.2621330] → [3.2621330:2621436]


//---------------------------------------------------------------
//
// drop_gold
//
//---------------------------------------------------------------
static void drop_gold(unsigned int amount)
{
    const unsigned long BIGGEST_QUANT_VALUE =
	((1L << (sizeof(mitm[0].quantity)*8 - 1)) - 1000);
 
    if (you.gold > 0)
    {
        if (amount > you.gold)
            amount = you.gold;
        snprintf( info, INFO_SIZE, "You drop %d gold piece%s.", 
                 amount, (amount > 1) ? "s" : "" );
        mpr(info);
        // loop through items at grid location, look for gold
        int i = igrd[you.x_pos][you.y_pos];
        while(i != NON_ITEM)
        {
            if (mitm[i].base_type == OBJ_GOLD)
            {
		if ( mitm[i].quantity + amount > BIGGEST_QUANT_VALUE ) {
		    amount = BIGGEST_QUANT_VALUE - mitm[i].quantity;
		    snprintf(info, INFO_SIZE,
			     "But there's only room for %d.", amount);
		    mpr(info);
		    
		}
                inc_mitm_item_quantity( i, amount );
                you.gold -= amount;
                you.redraw_gold = 1;
                you.turn_is_over = true;
                return;
            }
            // follow link
            i = mitm[i].link;
        }

Deletion in crawl-ref/source/items.cc at line 1687 [3.2584728]

B:BD[3.2621437] → [3.2621437:2621635]

B:BD[3.2621635] → [2.635915:636086]

∅:D[2.636086] → [3.2621635:2621709]

B:BD[3.2621635] → [3.2621635:2621709]

B:BD[3.2621709] → [2.636087:636145]

∅:D[2.636145] → [3.2621709:2621850]

B:BD[3.2621709] → [3.2621709:2621850]

B:BD[3.2621850] → [4.355779:355780]

B:BD[4.355780] → [2.636146:636179]

∅:D[4.355810] → [3.2621850:2621970]

∅:D[2.636179] → [3.2621850:2621970]

B:BD[3.2621850] → [3.2621850:2621970]

B:BD[3.2622388] → [3.2622388:2622389]

        // place on top.
        i = get_item_slot(10);
        if (i == NON_ITEM)
        {
            mpr( "Too many items on this level, not dropping the gold." );
            return;
        }
	if (amount > BIGGEST_QUANT_VALUE) {
	    amount = BIGGEST_QUANT_VALUE;
	    snprintf(info, INFO_SIZE,
		     "But there's only room for %d.", amount);
	    mpr(info);
	}
        mitm[i].base_type = OBJ_GOLD;
        mitm[i].quantity = amount;
        // [ds] #&^#@&#!
        mitm[i].colour = YELLOW;
        mitm[i].flags = 0;
        move_item_to_grid( &i, you.x_pos, you.y_pos );
        you.gold -= amount;
        you.redraw_gold = 1;
        you.turn_is_over = true;
    }
    else
    {
        mpr("You don't have any money.");
    }
}                               // end drop_gold()

Deletion in crawl-ref/source/items.cc at line 1688 [3.2584728]
B:BD[4.355864] → [4.355864:355928]
∅:D[4.355928] → [3.2622627:2622633]
B:BD[3.2622627] → [3.2622627:2622633]
B:BD[3.2622760] → [3.2622760:2622925]
B:BD[3.2622925] → [4.355929:355952]
∅:D[4.355952] → [3.2622941:2622948]
B:BD[3.2622941] → [3.2622941:2622948]
```
    if (item_dropped == PROMPT_GOT_SPECIAL)  // ie '$' for gold
    {
        // drop gold
        if (quant_drop < 0 || quant_drop > static_cast< int >( you.gold ))
            quant_drop = you.gold;
        drop_gold( quant_drop );
        return (true);
    }
```

Replacement in crawl-ref/source/items.cc at line 1874 [3.2584728]

B:BD[2.638473] → [2.638473:638537]

                                               true, true, '$',

[2.638473]

[2.638537]

                                               true, true, 0,

Replacement in crawl-ref/source/invent.cc at line 622 [3.2920632]

B:BD[4.385770] → [4.385770:385837]

        if (other_valid_char != '\0' && keyin == other_valid_char)

[4.385770]

[4.385837]

        if (other_valid_char != 0 && keyin == other_valid_char)

Replacement in crawl-ref/source/invent.cc at line 807 [3.2920632]

B:BD[3.2931470] → [3.2931470:2931537]

        if (other_valid_char != '\0' && keyin == other_valid_char)

[3.2931470]

[3.2931537]

        if (other_valid_char != 0 && keyin == other_valid_char)

Replacement in crawl-ref/source/command.cc at line 167 [3.4082507]
∅:D[2.1186398] → [3.4084653:4084687]
B:BD[3.4084653] → [3.4084653:4084687]
```
    if (to_slot ==  PROMPT_ABORT)
```
[2.1186398]
[3.4084687]
```
    if (to_slot == PROMPT_ABORT)
```