X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=ca54210181f34e52b8a9e0c2f17060b985a8a5c9;hb=6dff93b1a6e9b727dbe26747456f4b23efca86da;hp=31724d5b22acd42f67b0222f8a954234c77981ad;hpb=0285546b22f9e8f496ca6b1abffdd232647b6b6a;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 31724d5..ca54210 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,10 +2,12 @@
 #include "app/Arguments.h"
 #include "app/Input.h"
 #include "battle/BattleState.h"
+#include "battle/Capsule.h"
 #include "battle/Hero.h"
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "battle/Resources.h"
+#include "common/Capsule.h"
 #include "common/GameConfig.h"
 #include "common/GameState.h"
 #include "common/Hero.h"
@@ -16,6 +18,7 @@
 #include "common/Spell.h"
 #include "common/Stats.h"
 #include "geometry/Vector.h"
+#include "graphics/CharSelect.h"
 #include "graphics/ComplexAnimation.h"
 #include "graphics/Font.h"
 #include "graphics/Frame.h"
@@ -55,6 +58,7 @@ using app::Input;
 using battle::BattleState;
 using battle::Monster;
 using battle::PartyLayout;
+using common::Capsule;
 using common::GameConfig;
 using common::GameState;
 using common::Hero;
@@ -99,6 +103,7 @@ int main(int argc, char **argv) {
 		battle::Monster::CreateTypeDescription();
 		battle::PartyLayout::CreateTypeDescription();
 
+		common::Capsule::CreateTypeDescription();
 		common::Hero::CreateTypeDescription();
 		common::Ikari::CreateTypeDescription();
 		common::Item::CreateTypeDescription();
@@ -107,6 +112,7 @@ int main(int argc, char **argv) {
 		common::TargetingMode::CreateTypeDescription();
 
 		graphics::Animation::CreateTypeDescription();
+		graphics::CharSelect::CreateTypeDescription();
 		graphics::ComplexAnimation::CreateTypeDescription();
 		graphics::Font::CreateTypeDescription();
 		graphics::Frame::CreateTypeDescription();
@@ -190,6 +196,10 @@ int main(int argc, char **argv) {
 		gameState.party[3] = &gameState.heroes[3];
 		gameState.partySize = 4;
 
+		gameState.capsules[1] = *caster.GetCapsule("flash");
+		gameState.capsules[1].UpgradeClass();
+		gameState.capsule = &gameState.capsules[1];
+
 		GameConfig gameConfig;
 		gameConfig.state = &gameState;
 		gameConfig.heroesLayout = caster.GetPartyLayout("heroesLayout");
@@ -287,6 +297,7 @@ int main(int argc, char **argv) {
 			battleState->AddMonster(monster);
 			battleState->AddMonster(monster);
 			battleState->AddMonster(monster);
+			battleState->SetCapsule(caster.GetCapsule("flash"));
 			battleState->AddHero(gameState.heroes[0]);
 			battleState->AddHero(gameState.heroes[1]);
 			battleState->AddHero(gameState.heroes[2]);