[Scummvm-cvs-logs] scummvm master -> 9fb92f4b7ebbedbe6f853be2b9117714506f23a7

lordhoto lordhoto at gmail.com
Thu Apr 28 18:17:05 CEST 2011


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:
9fb92f4b7e KYRA: Fix compilation when LoL is disabled.


Commit: 9fb92f4b7ebbedbe6f853be2b9117714506f23a7
    https://github.com/scummvm/scummvm/commit/9fb92f4b7ebbedbe6f853be2b9117714506f23a7
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-04-28T09:16:01-07:00

Commit Message:
KYRA: Fix compilation when LoL is disabled.

Changed paths:
    engines/kyra/gui_hof.cpp
    engines/kyra/gui_lol.cpp
    engines/kyra/gui_mr.cpp
    engines/kyra/kyra_hof.cpp
    engines/kyra/kyra_lok.cpp
    engines/kyra/kyra_mr.cpp
    engines/kyra/lol.cpp
    engines/kyra/lol.h
    engines/kyra/script_hof.cpp
    engines/kyra/script_lol.cpp
    engines/kyra/script_tim.cpp
    engines/kyra/seqplayer.cpp
    engines/kyra/sequences_hof.cpp
    engines/kyra/sequences_lok.cpp
    engines/kyra/sequences_lol.cpp
    engines/kyra/text_lol.cpp



diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp
index 3f7e22b..26e0d8f 100644
--- a/engines/kyra/gui_hof.cpp
+++ b/engines/kyra/gui_hof.cpp
@@ -27,6 +27,7 @@
 #include "kyra/kyra_hof.h"
 #include "kyra/timer.h"
 #include "kyra/resource.h"
+#include "kyra/sound.h"
 
 #include "common/system.h"
 
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 95934de..2625347 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -30,6 +30,7 @@
 #include "kyra/screen_lol.h"
 #include "kyra/resource.h"
 #include "kyra/util.h"
+#include "kyra/sound.h"
 
 #include "common/savefile.h"
 #include "common/system.h"
diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp
index 539bf38..6eca24fd 100644
--- a/engines/kyra/gui_mr.cpp
+++ b/engines/kyra/gui_mr.cpp
@@ -28,6 +28,7 @@
 #include "kyra/text_mr.h"
 #include "kyra/resource.h"
 #include "kyra/timer.h"
+#include "kyra/sound.h"
 
 #include "common/system.h"
 
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index c326482..de6aa55 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -29,6 +29,7 @@
 #include "kyra/timer.h"
 #include "kyra/debugger.h"
 #include "kyra/util.h"
+#include "kyra/sound.h"
 
 #include "common/system.h"
 #include "common/config-manager.h"
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index 34ddbe7..a04c28c 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -30,6 +30,7 @@
 #include "kyra/animator_lok.h"
 #include "kyra/debugger.h"
 #include "kyra/timer.h"
+#include "kyra/sound.h"
 
 #include "common/system.h"
 #include "common/config-manager.h"
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index edee0d0..570ebe0 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -31,6 +31,7 @@
 #include "kyra/debugger.h"
 #include "kyra/gui_mr.h"
 #include "kyra/resource.h"
+#include "kyra/sound.h"
 
 #include "common/system.h"
 #include "common/config-manager.h"
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 718cce3..ce73bff 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -31,6 +31,7 @@
 #include "kyra/timer.h"
 #include "kyra/util.h"
 #include "kyra/debugger.h"
+#include "kyra/sound.h"
 
 #include "audio/audiostream.h"
 
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index d24f3b4..a3170c2 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -31,12 +31,15 @@
 #include "kyra/kyra_v1.h"
 #include "kyra/script_tim.h"
 #include "kyra/script.h"
-#include "kyra/sound.h"
 #include "kyra/gui_lol.h"
 #include "kyra/text_lol.h"
 
 #include "common/list.h"
 
+namespace Audio {
+class SeekableAudioStream;
+} // End of namespace Audio
+
 namespace Kyra {
 
 class Screen_LoL;
diff --git a/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp
index 26a7acc..056319e 100644
--- a/engines/kyra/script_hof.cpp
+++ b/engines/kyra/script_hof.cpp
@@ -26,6 +26,7 @@
 #include "kyra/kyra_hof.h"
 #include "kyra/timer.h"
 #include "kyra/resource.h"
+#include "kyra/sound.h"
 
 #include "common/system.h"
 
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp
index 4ee3f32..3185032 100644
--- a/engines/kyra/script_lol.cpp
+++ b/engines/kyra/script_lol.cpp
@@ -29,6 +29,7 @@
 #include "kyra/screen_lol.h"
 #include "kyra/timer.h"
 #include "kyra/resource.h"
+#include "kyra/sound.h"
 
 #include "common/system.h"
 
diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp
index 018bead..004ceb9 100644
--- a/engines/kyra/script_tim.cpp
+++ b/engines/kyra/script_tim.cpp
@@ -25,6 +25,7 @@
 
 #include "kyra/script_tim.h"
 #include "kyra/resource.h"
+#include "kyra/sound.h"
 
 #ifdef ENABLE_LOL
 #include "kyra/lol.h"
diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp
index 06f72df..16e89de 100644
--- a/engines/kyra/seqplayer.cpp
+++ b/engines/kyra/seqplayer.cpp
@@ -25,6 +25,7 @@
 
 #include "kyra/seqplayer.h"
 #include "kyra/resource.h"
+#include "kyra/sound.h"
 
 #include "common/system.h"
 
diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index 015e007..b268f13 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -26,6 +26,7 @@
 #include "kyra/kyra_hof.h"
 #include "kyra/timer.h"
 #include "kyra/resource.h"
+#include "kyra/sound.h"
 
 #include "common/system.h"
 
diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp
index a08eb51..0b39201 100644
--- a/engines/kyra/sequences_lok.cpp
+++ b/engines/kyra/sequences_lok.cpp
@@ -30,6 +30,7 @@
 #include "kyra/wsamovie.h"
 #include "kyra/animator_lok.h"
 #include "kyra/timer.h"
+#include "kyra/sound.h"
 
 #include "common/system.h"
 #include "common/savefile.h"
diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp
index 3588842..da1245d 100644
--- a/engines/kyra/sequences_lol.cpp
+++ b/engines/kyra/sequences_lol.cpp
@@ -28,6 +28,7 @@
 #include "kyra/lol.h"
 #include "kyra/screen_lol.h"
 #include "kyra/resource.h"
+#include "kyra/sound.h"
 
 #include "base/version.h"
 
diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp
index c8f65f5..c9a77be 100644
--- a/engines/kyra/text_lol.cpp
+++ b/engines/kyra/text_lol.cpp
@@ -29,6 +29,7 @@
 #include "kyra/lol.h"
 #include "kyra/screen_lol.h"
 #include "kyra/timer.h"
+#include "kyra/sound.h"
 
 #include "common/system.h"
 






More information about the Scummvm-git-logs mailing list