← Back to branch summary

~ubuntu-branches/debian/jessie/scummvm/jessie

« back to all changes in this revision

Viewing changes to backends/platform/dc/dcmain.cpp

  • Committer: Package Import Robot
  • Author(s): Dmitry Smirnov
  • Date: 2014-08-10 00:50:36 UTC
  • mfrom: (1.2.22)
  • Revision ID: package-import@ubuntu.com-20140810005036-wls6i0dsxqfxu70g
Tags: 1.7.0+dfsg-1
* New upstream release [July 2014].
  - remove old/obsolete patches.
  + added new "drop1test.patch" to disable problematic test.
  + build with "--disable-eventrecorder" to avoid FTBFS in tests.
  + added "libjpeg-dev" and "libfaad-dev" to Build-Depends.
* Install all arch-independent files (themes, game data, etc.).
* Build-time re-compression of "classic" theme.
* Added "debian/gbp.conf".
* Standards-Version to 3.9.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
backends/platform/dc/dcmain.cpp
8
8
 * modify it under the terms of the GNU General Public License
9
9
 * as published by the Free Software Foundation; either version 2
10
10
 * of the License, or (at your option) any later version.
11
 
 
 
11
 *
12
12
 * This program is distributed in the hope that it will be useful,
13
13
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
14
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
15
 * GNU General Public License for more details.
16
 
 
 
16
 *
17
17
 * You should have received a copy of the GNU General Public License
18
18
 * along with this program; if not, write to the Free Software
19
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
79
79
  if (first < 1 || last > 99 || first > last)
80
80
    return false;
81
81
  for (i=first; i<=last; i++)
82
 
    if (!(TOC_CTRL(toc->entry[i-1])&4))
 
82
    if (!(TOC_CTRL(toc->entry[i-1])&4)) {
83
83
      if (track==1) {
84
84
        first_sec = TOC_LBA(toc->entry[i-1]);
85
85
        last_sec = TOC_LBA(toc->entry[i]);
86
86
        return true;
87
87
      } else
88
88
        --track;
 
89
    }
89
90
  return false;
90
91
}
91
92
 
281
282
        if((r = syscall_read_flash(info[0] + (bmb++ << 6), bm, 64))<0)
282
283
          return r;
283
284
      }
284
 
      if(!(bm[(b>>3)&63] & (0x80>>(b&7))))
 
285
      if(!(bm[(b>>3)&63] & (0x80>>(b&7)))) {
285
286
        if((r = syscall_read_flash(info[0] + ((b+1) << 6), buf, 64))<0)
286
287
          return r;
287
288
        else if((s=*(unsigned short *)(buf+0)) == sec &&
289
290
          memcpy(dst+(s-sec)*60, buf+2, 60);
290
291
          got=1;
291
292
        }
 
293
      }
292
294
    }
293
295
    return got;
294
296
  }