Merge pull request #23 from khaledhosny/C2797

Fix build with latest Visual Studio
This commit is contained in:
Thomas Goyne 2014-11-23 16:31:50 -08:00
commit 7833b1bcbc
1 changed files with 2 additions and 2 deletions

View File

@ -129,13 +129,13 @@ struct AssDialogueBase {
/// Layer number /// Layer number
int Layer = 0; int Layer = 0;
/// Margins: 0 = Left, 1 = Right, 2 = Top (Vertical) /// Margins: 0 = Left, 1 = Right, 2 = Top (Vertical)
std::array<int, 3> Margin = {{0, 0, 0}}; std::array<int, 3> Margin = std::array<int, 3>{{ 0, 0, 0 }};
/// Starting time /// Starting time
agi::Time Start = 0; agi::Time Start = 0;
/// Ending time /// Ending time
agi::Time End = 5000; agi::Time End = 5000;
/// Style name /// Style name
boost::flyweight<std::string> Style{ "Default" }; boost::flyweight<std::string> Style = boost::flyweight<std::string>("Default");
/// Actor name /// Actor name
boost::flyweight<std::string> Actor; boost::flyweight<std::string> Actor;
/// Effect name /// Effect name