libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

This is more consistent with how we usually initialize arrays of structs, and

Browse Source 
seems to still keep msvc8 happy.

svn-id: r23521
This commit is contained in:
Torbjörn Andersson 2006-07-15 22:04:42 +00:00
parent db58d3477b
commit 68c150df3c
2 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
engines/sword2/animation.cpp
View File

@ -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) {

8
engines/sword2/animation.h
View File

@ -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;