~ubuntu-branches/ubuntu/maverick/vice/maverick

« back to all changes in this revision

Viewing changes to src/vicii/vicii-sprites.c

  • Committer: Bazaar Package Importer
  • Author(s): Zed Pobre
  • Date: 2005-02-01 11:30:26 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050201113026-3eyakzsmmheclvjg
Tags: 1.16-1
* New upstream version
* Fixes crash on 64-bit architectures (closes: #287640)
* x128 working again (closes: #286767)
* Works fine with /dev/dsp in use (not in the main changelog, but tested
  on my local machine as working).  Presumably, this also takes care of
  the issue with dsp being held.  I'm not sure if this is because I'm
  testing it on a 2.6 kernel now -- if you are still having problems
  with /dev/dsp, please reopen the bugs. (closes: #152952, #207942)
* Don't kill Makefile.in on clean

Show diffs side-by-side

added added

removed removed

Lines of Context:
441
441
        DWORD __m;                                                      \
442
442
        int __p, __i;                                                   \
443
443
                                                                        \
444
 
        for (__m = 1 << ((size) - 1), __p = 0; __p < (size);            \
 
444
        for (__m = 1U << ((size) - 1), __p = 0; __p < (size);           \
445
445
             __p += 4, (mcmsk) <<= 2, (trmsk) <<= 4) {                  \
446
446
            BYTE __c;                                                   \
447
447
            BYTE __t;                                                   \
718
718
 
719
719
    if (sprite_status->sprites[n].in_background) {
720
720
        MCSPRITE_DOUBLE_MASK(mcsprmsk, collmsk, trimmsk, 32, 
721
 
            sbit, ptr, sptr, c, cmsk);
 
721
                             sbit, ptr, sptr, c, cmsk);
722
722
    } else {
723
 
        MCSPRITE_DOUBLE_MASK(mcsprmsk, 0, trimmsk, 32, sbit, ptr, sptr, c, cmsk);
 
723
        MCSPRITE_DOUBLE_MASK(mcsprmsk, 0, trimmsk, 32,
 
724
                             sbit, ptr, sptr, c, cmsk);
724
725
    }
725
726
 
726
727
    sprmsk = sprite_doubling_table[mcsprtable[data_ptr[2]]];