[Scummvm-cvs-logs] scummvm master -> 5faa7e3a53d801c4538fb097cc9928fa216fc0db

[fingolfin]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5faa7e3a53 AGI: Fix type mismatch (see bug #3311198)


Commit: 5faa7e3a53d801c4538fb097cc9928fa216fc0db
    https://github.com/scummvm/scummvm/commit/5faa7e3a53d801c4538fb097cc9928fa216fc0db
Author: Max Horn (max at quendi.de)
Date: 2011-06-03T14:17:26-07:00

Commit Message:
AGI: Fix type mismatch (see bug #3311198)

Changed paths:
    engines/agi/sound_2gs.cpp



diff --git a/engines/agi/sound_2gs.cpp b/engines/agi/sound_2gs.cpp
index 6d64c29..3c8a3df 100644
--- a/engines/agi/sound_2gs.cpp
+++ b/engines/agi/sound_2gs.cpp
@@ -135,7 +135,7 @@ void SoundGen2GS::stop() {
  * Fill output buffer by advancing the generators for a 1/60th of a second.
  * @return Number of generated samples
  */
-uint32 SoundGen2GS::generateOutput() {
+uint SoundGen2GS::generateOutput() {
 	memset(_out, 0, _outSize * 2 * 2);
 
 	if (!_playing || _playingSound == -1)