[Scummvm-cvs-logs] SF.net SVN: scummvm: [27556] scummvm/trunk/engines/agos

[Kirben at users.sourceforge.net]

Revision: 27556
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27556&view=rev
Author:   Kirben
Date:     2007-06-20 07:41:19 -0700 (Wed, 20 Jun 2007)

Log Message:
-----------
Fix regressions, due to playSpeech() no longer been virtual match.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/res_snd.cpp

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2007-06-20 14:32:01 UTC (rev 27555)
+++ scummvm/trunk/engines/agos/agos.h	2007-06-20 14:41:19 UTC (rev 27556)
@@ -1541,7 +1541,7 @@
 	virtual void addArrows(WindowBlock *window, uint8 num);
 	virtual uint setupIconHitArea(WindowBlock *window, uint num, uint x, uint y, Item *item_ptr);
 
-	virtual void playSpeech(uint speech_id, uint vga_sprite_id);
+	virtual void playSpeech(uint16 speech_id, uint16 vga_sprite_id);
 };
 
 class AGOSEngine_Feeble : public AGOSEngine_Simon2 {

Modified: scummvm/trunk/engines/agos/res_snd.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_snd.cpp	2007-06-20 14:32:01 UTC (rev 27555)
+++ scummvm/trunk/engines/agos/res_snd.cpp	2007-06-20 14:41:19 UTC (rev 27556)
@@ -68,7 +68,7 @@
 	}
 }
 
-void AGOSEngine_Simon2::playSpeech(uint speech_id, uint vgaSpriteId) {
+void AGOSEngine_Simon2::playSpeech(uint16 speech_id, uint16 vgaSpriteId) {
 	if (speech_id == 0xFFFF) {
 		if (_subtitles)
 			return;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.