Changeset 809

Show
Ignore:
Timestamp:
03/19/08 20:37:18 (4 months ago)
Author:
takkaria
Message:

Merge in changes from the 3.0.9b branch, including (erk!) the 32x32 BMPs. The sooner the Windows port handles PNG, the happer I'll be...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/readme.txt

    r550 r809  
    1212  The Angband website:  http://rephial.org/ 
    1313  Angband forums:       http://angband.oook.cz/forum/ 
    14  
    15   32x32 graphics for X11 and Windows: 
    16     http://angband.oook.cz/download/extra/graf-32x32-306.zip 
    1714 
    1815  When upgrading, please read changes.txt! 

  • trunk/scripts/pkg_win

    r736 r809  
    7373cp ../lib/xtra/graf/8x8.bmp lib/xtra/graf 
    7474cp ../lib/xtra/graf/16x16.bmp lib/xtra/graf 
     75cp ../lib/xtra/graf/32x32.bmp lib/xtra/graf 
    7576cp ../lib/xtra/graf/mask.bmp lib/xtra/graf 
     77cp ../lib/xtra/graf/mask32.bmp lib/xtra/graf 
    7678 
    7779cp ../lib/xtra/sound/sound.cfg lib/xtra/sound 

  • trunk/src/Makefile.osx

    r692 r809  
    2323APPNAME =$(NAME).app 
    2424EXE =angband 
    25 COPYRIGHT =1995-2007 Contributors 
     25COPYRIGHT =1995-2008 Contributors 
    2626 
    2727# Some Developer CD tools we need - the standard installation location 

  • trunk/src/store.c

    r793 r809  
    17761776                text_out_c(TERM_L_GREEN, "l"); 
    17771777 
    1778         text_out("' examines and "); 
    1779         text_out_c(TERM_L_GREEN, "Enter"); 
    1780  
    1781         if (store_current == STORE_HOME) text_out(" picks up"); 
    1782         else text_out(" purchases"); 
     1778        text_out("' examines and '"); 
     1779        text_out_c(TERM_L_GREEN, "p"); 
     1780 
     1781        if (store_current == STORE_HOME) text_out("' picks up"); 
     1782        else text_out("' purchases"); 
    17831783 
    17841784        text_out(" the selected item. '"); 
    1785          
     1785 
    17861786        text_out_c(TERM_L_GREEN, "d"); 
    17871787        if (store_current == STORE_HOME) text_out("' drops"); 
    …… 
    25792579 
    25802580                /* Buy */ 
    2581                 case '\xff': 
    2582                 case '\n': 
    2583                 case '\r': 
     2581                case 'p': 
     2582                case 'g': 
    25842583                { 
    25852584                        /* On successful purchase, redraw */ 
    …… 
    28542853                { 
    28552854                        /* These two can't intersect! */ 
    2856                         menu.cmd_keys = "\n\x04\x10\r?=CPdeEiIsTwx\x8B\x8Chl"; /* \x10 = ^p , \x04 = ^D */ 
    2857                         menu.selections = "abcfgmnopqruvyz1234567890"; 
     2855                        menu.cmd_keys = "\n\x04\x10\r?=CEIPTdegilpswx\x8B\x8C"; /* \x10 = ^p , \x04 = ^D */ 
     2856                        menu.selections = "abcfmnoqrtuvyz13456790ABDFGH"; 
    28582857                } 
    28592858 
    …… 
    28622861                { 
    28632862                        /* These two can't intersect! */ 
    2864                         menu.cmd_keys = "\n\x010\r?=CbdeEiIklstw\x8B\x8C"; /* \x10 = ^p */ 
    2865                         menu.selections = "acfghmnopqruvxyz13456790"; 
     2863                        menu.cmd_keys = "\n\x010\r?=CEIbdegiklpstw\x8B\x8C"; /* \x10 = ^p */ 
     2864                        menu.selections = "acfhmnoqruvxyz13456790ABDFGH"; 
    28662865                } 
    28672866