libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-19 16:18:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KYRA: fixed some cppcheck warnings

Browse Source 
svn-id: r48879
This commit is contained in:
Florian Kagerer 2010-05-01 12:55:32 +00:00
parent eb429872d8
commit 45debce66e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/kyra/sequences_hof.cpp
View File

@ -133,8 +133,6 @@ void KyraEngine_HoF::seq_playSequences(int startSeq, int endSeq) {
}
if (cseq.flags & 1) {
int w2 = _seqWsa->width();
int h2 = _seqWsa->height();
int x = cseq.xPos;
int y = cseq.yPos;
@ -142,13 +140,13 @@ void KyraEngine_HoF::seq_playSequences(int startSeq, int endSeq) {
if (_seqWsa) {
if (x < 0) {
_seqWsa->setWidth(_seqWsa->width() + x);
x = 0;
w2 = 0;
}
if (y < 0) {
_seqWsa->setHeight(_seqWsa->height() + y);
y = 0;
h2 = 0;
}
if (cseq.xPos + _seqWsa->width() > 319)

5
engines/kyra/sound_towns.cpp
View File

@ -153,7 +153,7 @@ public:
void loadDataToCurrentPosition(uint8 *trackdata, uint32 size, bool loop = 0);
void loadDataToEndOfQueue(uint8 *trackdata, uint32 size, bool loop = 0);
void setPlayBackStatus(bool playing);
bool isPlaying() {return _playing; }
bool isPlaying() const {return _playing; }
uint8 *trackData() {return _trackData; }
bool _loop;
@ -1491,7 +1491,7 @@ public:
void nextTick(int32 *buffer, uint32 bufferSize);
uint8 chanEnable() { return _chanEnable; }
uint8 chanEnable() const { return _chanEnable; }
private:
void updatesRegs();
@ -2561,6 +2561,7 @@ TownsPC98_OpnSquareSineSource::TownsPC98_OpnSquareSineSource(const uint32 timerb
_timer(0), _noiseGenerator(0), _chanEnable(0) {
memset(_channels, 0, sizeof(_channels));
memset(_updateRequestBuf, 0, sizeof(_updateRequestBuf));
_reg = new uint8 *[11];
_reg[0] = &_channels[0].frqL;