aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTravis Howell2007-06-20 14:41:19 +0000
committerTravis Howell2007-06-20 14:41:19 +0000
commit8f2714cc77454ea2ecdfff00d8381608327ca662 (patch)
tree3edd35c4d16052df779229fd46a5efed1c38605b /engines
parent05ecd1bcc4ffd89aa204945ae97b420e31f5d858 (diff)
downloadscummvm-rg350-8f2714cc77454ea2ecdfff00d8381608327ca662.tar.gz
scummvm-rg350-8f2714cc77454ea2ecdfff00d8381608327ca662.tar.bz2
scummvm-rg350-8f2714cc77454ea2ecdfff00d8381608327ca662.zip
Fix regressions, due to playSpeech() no longer been virtual match.
svn-id: r27556
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/agos.h2
-rw-r--r--engines/agos/res_snd.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index c8adddf3e2..20453b1277 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -1541,7 +1541,7 @@ protected:
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 {
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index 64bf19570f..a764756224 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -68,7 +68,7 @@ void AGOSEngine_Simon1::playSpeech(uint16 speech_id, uint16 vgaSpriteId) {
}
}
-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;