diff options
| author | Travis Howell | 2007-08-09 05:43:58 +0000 | 
|---|---|---|
| committer | Travis Howell | 2007-08-09 05:43:58 +0000 | 
| commit | 760986259c9a3031505068aaa75d031e117aeaa4 (patch) | |
| tree | f2dfe2714bd6d09575187e51ff36387b3572fc89 | |
| parent | 1643dd98bc0e048c77148317b6a7af7cfd9a1207 (diff) | |
| download | scummvm-rg350-760986259c9a3031505068aaa75d031e117aeaa4.tar.gz scummvm-rg350-760986259c9a3031505068aaa75d031e117aeaa4.tar.bz2 scummvm-rg350-760986259c9a3031505068aaa75d031e117aeaa4.zip  | |
Fix compile warnings.
svn-id: r28501
| -rw-r--r-- | engines/agi/sound.cpp | 6 | ||||
| -rw-r--r-- | engines/drascula/drascula.cpp | 18 | ||||
| -rw-r--r-- | engines/parallaction/disk_ns.cpp | 2 | 
3 files changed, 13 insertions, 13 deletions
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index b083b77440..b7a2918d33 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -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); diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp index df433e12f0..90147818de 100644 --- a/engines/drascula/drascula.cpp +++ b/engines/drascula/drascula.cpp @@ -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();  	}  } diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp index d6ff9cc4bf..7cb410d647 100644 --- a/engines/parallaction/disk_ns.cpp +++ b/engines/parallaction/disk_ns.cpp @@ -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);  | 
