aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2006-07-15 21:23:08 +0000
committerJohannes Schickel2006-07-15 21:23:08 +0000
commit59d0ddf806773501595a4e29ec31ea229e84b132 (patch)
tree39bcf9353738b4fbc9c6c8d6dfb73c239c99b534 /engines
parentd7dafdd8db63647287ba17e34812c8f4cbddbbcc (diff)
downloadscummvm-rg350-59d0ddf806773501595a4e29ec31ea229e84b132.tar.gz
scummvm-rg350-59d0ddf806773501595a4e29ec31ea229e84b132.tar.bz2
scummvm-rg350-59d0ddf806773501595a4e29ec31ea229e84b132.zip
Fix building with msvc8.
svn-id: r23518
Diffstat (limited to 'engines')
-rw-r--r--engines/sword2/animation.cpp38
-rw-r--r--engines/sword2/animation.h2
2 files changed, 21 insertions, 19 deletions
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index b7a712fe54..9624b24197 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -50,25 +50,25 @@ namespace Sword2 {
///////////////////////////////////////////////////////////////////////////////
MovieInfo MoviePlayer::_movies[] = {
- { "carib", 222, false },
- { "escape", 187, false },
- { "eye", 248, false },
- { "finale", 1485, false },
- { "guard", 75, false },
- { "intro", 1800, false },
- { "jungle", 186, false },
- { "museum", 167, false },
- { "pablo", 75, false },
- { "pyramid", 60, false },
- { "quaram", 184, false },
- { "river", 656, false },
- { "sailing", 138, false },
- { "shaman", 788, true },
- { "stone1", 34, true },
- { "stone2", 282, false },
- { "stone3", 65, true },
- { "demo", 60, false },
- { "enddemo", 110, false }
+ MovieInfo("carib", 222, false),
+ MovieInfo("escape", 187, false),
+ MovieInfo("eye", 248, false),
+ MovieInfo("finale", 1485, false),
+ MovieInfo("guard", 75, false),
+ MovieInfo("intro", 1800, false),
+ MovieInfo("jungle", 186, false),
+ MovieInfo("museum", 167, false),
+ MovieInfo("pablo", 75, false),
+ MovieInfo("pyramid", 60, false),
+ MovieInfo("quaram", 184, false),
+ MovieInfo("river", 656, false),
+ MovieInfo("sailing", 138, false),
+ MovieInfo("shaman", 788, true),
+ MovieInfo("stone1", 34, true),
+ MovieInfo("stone2", 282, false),
+ MovieInfo("stone3", 65, true),
+ MovieInfo("demo", 60, false),
+ MovieInfo("enddemo", 110, false)
};
MoviePlayer::MoviePlayer(Sword2Engine *vm) {
diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index 09ece3b8e8..0a937d48df 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -43,6 +43,8 @@ struct MovieTextObject {
};
struct MovieInfo {
+ MovieInfo(const char *name, const uint frames, const bool seamless) : name(name), frames(frames), seamless(seamless) {}
+
const char *name;
const uint frames;
const bool seamless;