[Scummvm-cvs-logs] SF.net SVN: scummvm: [28501] scummvm/trunk/engines
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Thu Aug 9 07:43:58 CEST 2007
Revision: 28501
http://scummvm.svn.sourceforge.net/scummvm/?rev=28501&view=rev
Author: Kirben
Date: 2007-08-08 22:43:58 -0700 (Wed, 08 Aug 2007)
Log Message:
-----------
Fix compile warnings.
Modified Paths:
--------------
scummvm/trunk/engines/agi/sound.cpp
scummvm/trunk/engines/drascula/drascula.cpp
scummvm/trunk/engines/parallaction/disk_ns.cpp
Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp 2007-08-09 05:26:22 UTC (rev 28500)
+++ scummvm/trunk/engines/agi/sound.cpp 2007-08-09 05:43:58 UTC (rev 28501)
@@ -270,12 +270,14 @@
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 @@
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);
Modified: scummvm/trunk/engines/drascula/drascula.cpp
===================================================================
--- scummvm/trunk/engines/drascula/drascula.cpp 2007-08-09 05:26:22 UTC (rev 28500)
+++ scummvm/trunk/engines/drascula/drascula.cpp 2007-08-09 05:43:58 UTC (rev 28501)
@@ -1607,7 +1607,7 @@
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 @@
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 @@
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 @@
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 @@
if (frame_piano == 9)
frame_piano = 0;
parpadeo = _rnd->getRandomNumber(10);
- conta_ciego_vez=vez();
+ conta_ciego_vez = (int)vez();
}
}
@@ -6845,12 +6845,12 @@
} 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();
}
}
Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp 2007-08-09 05:26:22 UTC (rev 28500)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp 2007-08-09 05:43:58 UTC (rev 28501)
@@ -988,8 +988,6 @@
byte *buf = (byte*)malloc(rawsize);
stream.read(buf, rawsize);
- uint32 decsize = width * height;
-
Graphics::Surface *cnv = new Graphics::Surface;
cnv->create(width, height, 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list