Changeset 301

Show
Ignore:
Timestamp:
07/07/07 17:07:54 (2 years ago)
Author:
takkaria
Message:

Fix store buying behaviour, update changelog.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/changes.txt

    r282 r301  
    128128  slightly more streamlined interface.  Bigscreen support in stores. 
    129129  Ammo is treated in more aesthetically pleasing quantities. 
    130   General Store always stocks what it stocks now. 
     130  General Store always stocks what it stocks now, and doesn't buy 
     131  anything back off the player. 
    131132- Remove double-rate spellcasting with the smart_monsters option. 
    132133  (imported from V CVS; Julian Lighton). 
    …… 
    157158- Nuked a lot of old ports: cap, lsl, sla, xpj, ibm, dos, vcs, lfb, ami, 
    158159  emx, vme. 
    159 - Added a new SDL port by Iain McFall, based on the ToME and Sang ports. 
    160160- As a result of the above, makefiles considerably simplified.  As many 
    161161  makefiles as possible use a common list of source files in 
    …… 
    222222  for this. 
    223223- GTK port is a GTK2 port, and uses pango and cairo.  (Shanoah Alkire) 
     224- Added a new SDL port by Iain McFall, based on the ToME and Sang ports. 
     225  Both the SDL and GTK ports are disabled by default, as neither is 
     226  quite finished, though both are perfectly functional. 

  • trunk/src/store.c

    r291 r301  
    249249                case STORE_GENERAL: 
    250250                { 
    251                         /* Analyze the type */ 
    252                         switch (o_ptr->tval) 
    253                         { 
    254                                 case TV_SPIKE: 
    255                                 case TV_SHOT: 
    256                                 case TV_ARROW: 
    257                                 case TV_BOLT: 
    258                                 case TV_DIGGING: 
    259                                 case TV_CLOAK: 
    260                                         break; 
    261  
    262                                 case TV_LITE: 
    263                                         if (artifact_p(o_ptr) || ego_item_p(o_ptr)) 
    264                                                 break; 
    265  
    266                                 default: 
    267                                         return (FALSE); 
    268                         } 
    269                         break; 
     251                        /* Doesn't buy anything back */ 
     252                        return (FALSE); 
    270253                } 
    271254