aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-07-15 22:04:42 +0000
committerTorbjörn Andersson2006-07-15 22:04:42 +0000
commit68c150df3cb9b46f8505156be9a6b2663774dd60 (patch)
tree60ce8087921ec4d70c631da1b4605eb36f62d338 /engines
parentdb58d3477b7b79774bc1fba3e19cec4080548978 (diff)
downloadscummvm-rg350-68c150df3cb9b46f8505156be9a6b2663774dd60.tar.gz
scummvm-rg350-68c150df3cb9b46f8505156be9a6b2663774dd60.tar.bz2
scummvm-rg350-68c150df3cb9b46f8505156be9a6b2663774dd60.zip
This is more consistent with how we usually initialize arrays of structs, and
seems to still keep msvc8 happy. svn-id: r23521
Diffstat (limited to 'engines')
-rw-r--r--engines/sword2/animation.cpp40
-rw-r--r--engines/sword2/animation.h8
2 files changed, 23 insertions, 25 deletions
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index 9624b24197..b677ccec5a 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -49,26 +49,26 @@ namespace Sword2 {
// Basic movie player
///////////////////////////////////////////////////////////////////////////////
-MovieInfo MoviePlayer::_movies[] = {
- 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)
+const MovieInfo MoviePlayer::_movies[19] = {
+ { "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 }
};
MoviePlayer::MoviePlayer(Sword2Engine *vm) {
diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index cda279e6ab..6e95a5a4d4 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -43,11 +43,9 @@ 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;
+ uint frames;
+ bool seamless;
};
class MoviePlayer {
@@ -80,7 +78,7 @@ protected:
int _framesSkipped;
bool _forceFrame;
- static struct MovieInfo _movies[];
+ static const MovieInfo _movies[];
MovieTextObject **_textList;
int _currentText;