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

Fix compile warnings.

Browse Source 
svn-id: r28501
This commit is contained in:
Travis Howell 2007-08-09 05:43:58 +00:00
parent 1643dd98bc
commit 760986259c
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/agi/sound.cpp
View File

@ -270,12 +270,14 @@ static uint16 period[] = {
1448, 1534, 1625, 1722, 1825, 1933
};
#if 0
static struct AgiNote playSample[] = {
{0xff, 0x7f, 0x18, 0x00, 0x7f},
{0xff, 0xff, 0x00, 0x00, 0x00},
{0xff, 0xff, 0x00, 0x00, 0x00},
{0xff, 0xff, 0x00, 0x00, 0x00}
};
#endif
static int noteToPeriod(int note) {
return 10 * (period[note % 12] >> (note / 12 - 3));
@ -285,9 +287,9 @@ static int noteToPeriod(int note) {
void SoundMgr::unloadSound(int resnum) {
if (_vm->_game.dirSound[resnum].flags & RES_LOADED) {
if (_vm->_game.sounds[resnum].flags & SOUND_PLAYING)
if (_vm->_game.sounds[resnum].flags & SOUND_PLAYING) {
/* FIXME: Stop playing */
;
}
/* Release RAW data for sound */
free(_vm->_game.sounds[resnum].rdata);

18
engines/drascula/drascula.cpp
View File

@ -1607,7 +1607,7 @@ martini:
if ((!strcmp(num_room, "9.alg")) || (strcmp(num_room, "2.alg"))
|| (!strcmp(num_room, "14.alg")) || (!strcmp(num_room, "18.alg")))
conta_ciego_vez = vez();
conta_ciego_vez = (int)vez();
refresca_pantalla();
}
@ -6670,10 +6670,10 @@ void DrasculaEngine::refresca_2(){
pos_murci[3] = 19;
DIBUJA_BLOQUE_CUT(pos_murci, dir_dibujo3, dir_zona_pantalla);
diferencia = vez() - conta_ciego_vez;
diferencia = (int)vez() - conta_ciego_vez;
if (diferencia >= 6) {
frame_murcielago++;
conta_ciego_vez = vez();
conta_ciego_vez = (int)vez();
}
DIBUJA_BLOQUE(29, 37, 58, 114, 57, 39, dir_dibujo3, dir_zona_pantalla);
@ -6761,10 +6761,10 @@ void DrasculaEngine::refresca_9_antes() {
DIBUJA_BLOQUE(ciego_x[frame_ciego], ciego_y[frame_ciego], 122, 57, 41, 72, dir_dibujo3, dir_zona_pantalla);
if (flags[9] == 0) {
diferencia = vez() - conta_ciego_vez;
diferencia = (int)vez() - conta_ciego_vez;
if (diferencia >= 11) {
frame_ciego++;
conta_ciego_vez = vez();
conta_ciego_vez = (int)vez();
}
if (frame_ciego == 9)
frame_ciego = 0;
@ -6800,7 +6800,7 @@ void DrasculaEngine::refresca_14_antes() {
if (flags[12] == 1)
DIBUJA_FONDO(borracho_x[frame_borracho], 82, 170, 50, 40, 53, dir_dibujo3, dir_zona_pantalla);
diferencia = vez() - conta_ciego_vez;
diferencia = (int)vez() - conta_ciego_vez;
if (diferencia > 6) {
if (flags[12] == 1) {
frame_borracho++;
@ -6818,7 +6818,7 @@ void DrasculaEngine::refresca_14_antes() {
if (frame_piano == 9)
frame_piano = 0;
parpadeo = _rnd->getRandomNumber(10);
conta_ciego_vez=vez();
conta_ciego_vez = (int)vez();
}
}
@ -6845,12 +6845,12 @@ void DrasculaEngine::refresca_18_antes() {
} else
pon_vb();
diferencia = vez() - conta_ciego_vez;
diferencia = (int)vez() - conta_ciego_vez;
if (diferencia > 9) {
frame_ronquido++;
if (frame_ronquido == 16)
frame_ronquido = 0;
conta_ciego_vez = vez();
conta_ciego_vez = (int)vez();
}
}

2
engines/parallaction/disk_ns.cpp
View File

@ -988,8 +988,6 @@ Graphics::Surface* AmigaDisk_ns::makeStaticCnv(Common::SeekableReadStream &strea
byte *buf = (byte*)malloc(rawsize);
stream.read(buf, rawsize);
uint32 decsize = width * height;
Graphics::Surface *cnv = new Graphics::Surface;
cnv->create(width, height, 1);