X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=2611a722aeba9b20ebf2431e33606e846be645e8;hb=eab84a66cf10866a291687b0e5957f475a0ad465;hp=59348338391daea0d5c6ea5fdb1578fdd4f32fe3;hpb=e1edc92c4fb834c8061118e89c0d7e239742b030;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 5934833..2611a72 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,6 +7,7 @@
 #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"
@@ -54,9 +55,9 @@ using app::Application;
 using app::Arguments;
 using app::Input;
 using battle::BattleState;
-using battle::Capsule;
 using battle::Monster;
 using battle::PartyLayout;
+using common::Capsule;
 using common::GameConfig;
 using common::GameState;
 using common::Hero;
@@ -101,6 +102,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();
@@ -192,6 +194,9 @@ int main(int argc, char **argv) {
 		gameState.party[3] = &gameState.heroes[3];
 		gameState.partySize = 4;
 
+		gameState.capsules[0] = *caster.GetCapsule("flash");
+		gameState.capsule = gameState.capsules;
+
 		GameConfig gameConfig;
 		gameConfig.state = &gameState;
 		gameConfig.heroesLayout = caster.GetPartyLayout("heroesLayout");
@@ -284,18 +289,12 @@ int main(int argc, char **argv) {
 		app::State *state(0);
 
 		if (battle) {
-			graphics::Sprite flashSprite(IMG_Load("test-data/flash.png"), 96, 96);
-			Capsule capsule;
-			capsule.SetName("Flash");
-			capsule.SetHealth(13, 13);
-			capsule.SetBattleSprite(&flashSprite);
-
 			BattleState *battleState(new BattleState(&gameConfig, bg, &monstersLayout));
 			battleState->AddMonster(monster);
 			battleState->AddMonster(monster);
 			battleState->AddMonster(monster);
 			battleState->AddMonster(monster);
-			battleState->SetCapsule(capsule);
+			battleState->SetCapsule(caster.GetCapsule("flash"));
 			battleState->AddHero(gameState.heroes[0]);
 			battleState->AddHero(gameState.heroes[1]);
 			battleState->AddHero(gameState.heroes[2]);