aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-01-02 12:34:45 -1000
committerPaul Gilbert2015-01-02 12:34:45 -1000
commit21d981f8e86bf214daa2e203acc2fb20c82ec8a0 (patch)
tree867ffe0a93120eb8893512c817538eca26c6cfee
parent9a8cb48a9edcc67b17c192ff13b3d9d1e40f73a9 (diff)
downloadscummvm-rg350-21d981f8e86bf214daa2e203acc2fb20c82ec8a0.tar.gz
scummvm-rg350-21d981f8e86bf214daa2e203acc2fb20c82ec8a0.tar.bz2
scummvm-rg350-21d981f8e86bf214daa2e203acc2fb20c82ec8a0.zip
XEEN: Fix compiler warnings
-rw-r--r--engines/xeen/darkside/darkside_game.cpp6
-rw-r--r--engines/xeen/debugger.cpp3
-rw-r--r--engines/xeen/resources.cpp34
3 files changed, 24 insertions, 19 deletions
diff --git a/engines/xeen/darkside/darkside_game.cpp b/engines/xeen/darkside/darkside_game.cpp
index c039d1ff0b..30f54580e3 100644
--- a/engines/xeen/darkside/darkside_game.cpp
+++ b/engines/xeen/darkside/darkside_game.cpp
@@ -181,7 +181,7 @@ void DarkSideEngine::showStartSequence() {
int idx1 = 0;
bool skipElapsed = false;
uint32 timeExpired = 0;
- bool fadeFlag = true;
+// bool fadeFlag = true;
for (int idx = 200; idx > 0; ) {
_events->updateGameCounter();
@@ -218,6 +218,10 @@ void DarkSideEngine::showStartSequence() {
_events->updateGameCounter();
pause(30);
+
+ // TODO: More
+ _sound->playMusic(voc[0]);
+ _sound->playMusic(voc[1]);
}
} // End of namespace Xeen
diff --git a/engines/xeen/debugger.cpp b/engines/xeen/debugger.cpp
index aa4516e3bc..a83af9f99d 100644
--- a/engines/xeen/debugger.cpp
+++ b/engines/xeen/debugger.cpp
@@ -25,7 +25,7 @@
#include "xeen/debugger.h"
namespace Xeen {
-
+/*
static int strToInt(const char *s) {
if (!*s)
// No string at all
@@ -41,6 +41,7 @@ static int strToInt(const char *s) {
error("strToInt failed on string \"%s\"", s);
return (int)tmp;
}
+*/
/*------------------------------------------------------------------------*/
diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp
index d1177dab00..de0804dc5c 100644
--- a/engines/xeen/resources.cpp
+++ b/engines/xeen/resources.cpp
@@ -26,42 +26,42 @@
namespace Xeen {
const char *const CREDITS =
- "\013012\010000\003c\01435Designed and Directed By:\n"
- "\01417Jon Van Caneghem\003l\n"
+ "\013""012\010""000\003""c\014""35Designed and Directed By:\n"
+ "\014""17Jon Van Caneghem\003""l\n"
"\n"
- "\t025\01435Programming:\n"
- "\t035\01417Mark Caldwell\n"
+ "\t025\014""35Programming:\n"
+ "\t035\014""17Mark Caldwell\n"
"\t035Dave Hathaway\n"
"\n"
- "\t025\01435Sound System & FX:\n"
- "\t035\01417Mike Heilemann\n"
+ "\t025\014""35Sound System & FX:\n"
+ "\t035\014""17Mike Heilemann\n"
"\n"
- "\t025\01435Music & Speech:\n"
- "\t035\01417Tim Tully\n"
+ "\t025\014""35Music & Speech:\n"
+ "\t035\014""17Tim Tully\n"
"\n"
- "\t025\01435Writing:\n"
- "\t035\01417Paul Rattner\n"
+ "\t025\014""35Writing:\n"
+ "\t035\014""17Paul Rattner\n"
"\t035Debbie Van Caneghem\n"
- "\t035Jon Van Caneghem\013012\n"
+ "\t035Jon Van Caneghem\013""012\n"
"\n"
"\n"
- "\t180\01435Graphics:\n"
- "\t190\01417Jonathan P. Gwyn\n"
+ "\t180\014""35Graphics:\n"
+ "\t190\014""17Jonathan P. Gwyn\n"
"\t190Bonita Long-Hemsath\n"
"\t190Julia Ulano\n"
"\t190Ricardo Barrera\n"
"\n"
- "\t180\01435Testing:\n"
- "\t190\01417Benjamin Bent\n"
+ "\t180\014""35Testing:\n"
+ "\t190\014""17Benjamin Bent\n"
"\t190Christian Dailey\n"
"\t190Mario Escamilla\n"
"\t190Marco Hunter\n"
"\t190Robert J. Lupo\n"
"\t190Clayton Retzer\n"
- "\t190David Vela\003c";
+ "\t190David Vela\003""c";
const char *const OPTIONS_TITLE =
- "\x0D\x01\003c\014dMight and Magic Options\n"
+ "\x0D\x01\003""c\014""dMight and Magic Options\n"
"World of Xeen\x02\n"
"\v117Copyright (c) 1993 NWC, Inc.\n"
"All Rights Reserved\x01";