[Scummvm-cvs-logs] SF.net SVN: scummvm: [23521] scummvm/trunk/engines/sword2
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Thu Jul 20 22:51:54 CEST 2006
Revision: 23521
http://svn.sourceforge.net/scummvm/?rev=23521&view=rev
Author: eriktorbjorn
Date: 2006-07-15 15:04:42 -0700 (Sat, 15 Jul 2006)
Log Message:
-----------
This is more consistent with how we usually initialize arrays of structs, and
seems to still keep msvc8 happy.
Modified Paths:
--------------
scummvm/trunk/engines/sword2/animation.cpp
scummvm/trunk/engines/sword2/animation.h
Modified: scummvm/trunk/engines/sword2/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword2/animation.cpp 2006-07-15 21:27:29 UTC (rev 23520)
+++ scummvm/trunk/engines/sword2/animation.cpp 2006-07-15 22:04:42 UTC (rev 23521)
@@ -49,26 +49,26 @@
// 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) {
Modified: scummvm/trunk/engines/sword2/animation.h
===================================================================
--- scummvm/trunk/engines/sword2/animation.h 2006-07-15 21:27:29 UTC (rev 23520)
+++ scummvm/trunk/engines/sword2/animation.h 2006-07-15 22:04:42 UTC (rev 23521)
@@ -43,11 +43,9 @@
};
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 @@
int _framesSkipped;
bool _forceFrame;
- static struct MovieInfo _movies[];
+ static const MovieInfo _movies[];
MovieTextObject **_textList;
int _currentText;
More information about the Scummvm-git-logs
mailing list