]> git.localhorst.tv Git - l2e.git/blobdiff - src/main.cpp
load capsule in battles created by MapState
[l2e.git] / src / main.cpp
index ddd6b7adcda7cefc261bbb074316eccc1334d6ab..2611a722aeba9b20ebf2431e33606e846be645e8 100644 (file)
@@ -1,22 +1,22 @@
-/*
- * main.cpp
- *
- *  Created on: Aug 1, 2012
- *      Author: holy
- */
-
 #include "app/Application.h"
+#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 "battle/Stats.h"
+#include "common/Capsule.h"
+#include "common/GameConfig.h"
+#include "common/GameState.h"
+#include "common/Hero.h"
 #include "common/Ikari.h"
 #include "common/Inventory.h"
 #include "common/Item.h"
+#include "common/Script.h"
 #include "common/Spell.h"
+#include "common/Stats.h"
 #include "geometry/Vector.h"
 #include "graphics/ComplexAnimation.h"
 #include "graphics/Font.h"
 #include "graphics/Menu.h"
 #include "graphics/SimpleAnimation.h"
 #include "graphics/Sprite.h"
+#include "graphics/Texture.h"
+#include "loader/Caster.h"
+#include "loader/Interpreter.h"
 #include "loader/ParsedSource.h"
 #include "loader/Parser.h"
+#include "loader/TypeDescription.h"
+#include "map/Area.h"
+#include "map/Entity.h"
+#include "map/Map.h"
+#include "map/MapState.h"
+#include "map/Tile.h"
+#include "map/Trigger.h"
+#include "menu/Resources.h"
 #include "sdl/InitImage.h"
 #include "sdl/InitScreen.h"
 #include "sdl/InitSDL.h"
 
 #include <cstdlib>
+#include <cstring>
 #include <ctime>
 #include <exception>
 #include <iostream>
+#include <string>
 #include <SDL.h>
 #include <SDL_image.h>
 
 using app::Application;
+using app::Arguments;
 using app::Input;
 using battle::BattleState;
-using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
-using battle::Stats;
-using common::Ikari;
-using common::Inventory;
-using common::Item;
+using common::Capsule;
+using common::GameConfig;
+using common::GameState;
+using common::Hero;
 using common::Spell;
 using geometry::Vector;
-using graphics::ComplexAnimation;
-using graphics::Font;
-using graphics::Frame;
-using graphics::Gauge;
-using graphics::Menu;
-using graphics::SimpleAnimation;
-using graphics::Sprite;
+using graphics::Texture;
+using loader::Caster;
+using loader::Interpreter;
 using loader::ParsedSource;
 using loader::Parser;
+using loader::TypeDescription;
+using map::Entity;
+using map::MapState;
 using sdl::InitImage;
 using sdl::InitScreen;
 using sdl::InitSDL;
@@ -67,660 +79,237 @@ using std::cerr;
 using std::cout;
 using std::endl;
 using std::exception;
+using std::string;
+using std::vector;
 
 int main(int argc, char **argv) {
-       const int width = 800;
-       const int height = 480;
+       const int width = 512;
+       const int height = 448;
+
+       const float walkSpeed = 128.0f;
 
-       const int framerate = 33;
+       bool battle(false);
 
 //     std::srand(std::time(0));
 
        try {
-               ParsedSource source;
-               Parser parser("test-data/test.l2s", source);
-               parser.Parse();
+               InitSDL sdl;
+               InitImage image(IMG_INIT_PNG);
 
-               cout << source;
+               Interpreter::CreateTypeDescriptions();
+
+               battle::Resources::CreateTypeDescription();
+               battle::Monster::CreateTypeDescription();
+               battle::PartyLayout::CreateTypeDescription();
+
+               common::Capsule::CreateTypeDescription();
+               common::Hero::CreateTypeDescription();
+               common::Ikari::CreateTypeDescription();
+               common::Item::CreateTypeDescription();
+               common::Stats::CreateTypeDescription();
+               common::Spell::CreateTypeDescription();
+               common::TargetingMode::CreateTypeDescription();
+
+               graphics::Animation::CreateTypeDescription();
+               graphics::ComplexAnimation::CreateTypeDescription();
+               graphics::Font::CreateTypeDescription();
+               graphics::Frame::CreateTypeDescription();
+               graphics::Gauge::CreateTypeDescription();
+               graphics::MenuProperties::CreateTypeDescription();
+               graphics::SimpleAnimation::CreateTypeDescription();
+               graphics::Sprite::CreateTypeDescription();
+               graphics::Texture::CreateTypeDescription();
+
+               map::Area::CreateTypeDescription();
+               map::Entity::CreateTypeDescription();
+               map::Map::CreateTypeDescription();
+               map::Tile::CreateTypeDescription();
+               map::Trigger::CreateTypeDescription();
+
+               menu::Resources::CreateTypeDescription();
+
+               Arguments args;
+               args.Read(argc, argv);
 
-               return 0;
+               ParsedSource source;
 
-               InitSDL sdl;
-               InitImage image(IMG_INIT_PNG);
-               InitScreen screen(width, height);
+               for (vector<char *>::const_iterator i(args.Infiles().begin()), end(args.Infiles().end()); i != end; ++i) {
+                       Parser(*i, source).Parse();
+               }
+
+               switch (args.GetRunLevel()) {
+                       case Arguments::WRITE:
+                       {
+                               int length(std::strlen(args.OutfilePath()));
+                               switch (args.OutfilePath()[length - 1]) {
+                                       case 'h': {
+                                               std::ofstream outstream(args.OutfilePath());
+                                               source.WriteHeader(outstream);
+                                               break;
+                                       }
+                                       default: {
+                                               throw std::runtime_error(string("don't know how to write file ") + args.OutfilePath());
+                                       }
+                               }
+                               return 0;
+                       }
+                       case Arguments::DUMP: {
+                               std::cout << source << std::endl;
+                               return 0;
+                       }
+                       case Arguments::SOURCE_WIKI: {
+                               TypeDescription::WriteSourceWiki(std::cout);
+                               return 0;
+                       }
+                       case Arguments::BATTLE:
+                               battle = true;
+                               break;
+                       case Arguments::PLAY:
+                       case Arguments::MAP:
+                               break;
+               }
+
+               Interpreter intp(source);
+               intp.ReadSource();
+
+               if (intp.PostponedDefinitions().size() > 0) {
+                       for (vector<Interpreter::PostponedDefinition>::const_iterator i(intp.PostponedDefinitions().begin()), end(intp.PostponedDefinitions().end()); i != end; ++i) {
+                               std::cerr << "missing definition of " << TypeDescription::Get(i->linkedType).TypeName() << " " << i->identifier << std::endl;
+                       }
+                       return 3;
+               }
+
+               Caster caster(intp);
+
+               GameState gameState;
+
+               gameState.heroes[0] = *caster.GetHero("maxim");
+               gameState.heroes[1] = *caster.GetHero("selan");
+               gameState.heroes[2] = *caster.GetHero("guy");
+               gameState.heroes[3] = *caster.GetHero("dekar");
+
+               gameState.party[0] = &gameState.heroes[0];
+               gameState.party[1] = &gameState.heroes[1];
+               gameState.party[2] = &gameState.heroes[2];
+               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");
+               gameConfig.battleResources = caster.GetBattleResources("battleResources");
+               gameConfig.menuResources = caster.GetMenuResources("menuResources");
 
                // temporary test data
                SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
-               PartyLayout monstersLayout;
-               monstersLayout.AddPosition(Vector<Uint8>(88, 88));
-               monstersLayout.AddPosition(Vector<Uint8>(128, 88));
-               monstersLayout.AddPosition(Vector<Uint8>(168, 88));
-               monstersLayout.AddPosition(Vector<Uint8>(208, 88));
-               PartyLayout heroesLayout;
-               heroesLayout.AddPosition(Vector<Uint8>(48, 136));
-               heroesLayout.AddPosition(Vector<Uint8>(128, 136));
-               heroesLayout.AddPosition(Vector<Uint8>(80, 152));
-               heroesLayout.AddPosition(Vector<Uint8>(160, 152));
-
-               SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
-               Sprite monsterSprite(monsterImg, 64, 64);
-               Monster monster;
-               monster.SetName("Lizard");
-               monster.SetSprite(&monsterSprite);
-               monster.SetLevel(1);
-               monster.SetMaxHealth(8);
-               monster.SetHealth(8);
-               monster.SetStats(Stats(14, 6, 6, 6, 6, 6, 6));
-               monster.SetReward(3, 5);
-               ComplexAnimation monsterAttackAnimation(&monsterSprite, 4 * framerate);
-               monsterAttackAnimation.AddFrame(0, 1, Vector<int>(0, 16));
-               monsterAttackAnimation.AddFrame(0, 0, Vector<int>(0, 16));
-               monsterAttackAnimation.AddFrame(0, 1, Vector<int>(0, 16));
-               monster.SetAttackAnimation(&monsterAttackAnimation);
-               SDL_Surface *monsterMeleeImg(IMG_Load("test-data/attack-monster.png"));
-               Sprite monsterMeleeSprite(monsterMeleeImg, 96, 64);
-               SimpleAnimation monsterMeleeAnimation(&monsterMeleeSprite, framerate, 14);
-               monster.SetMeleeAnimation(&monsterMeleeAnimation);
-
-               SDL_Surface *maximImg(IMG_Load("test-data/maxim.png"));
-               Sprite maximSprite(maximImg, 64, 64);
-               Hero maxim;
-               maxim.SetName("Maxim");
-               maxim.SetLevel(1);
-               maxim.SetSprite(&maximSprite);
-               maxim.SetMaxHealth(33);
-               maxim.SetHealth(33);
-               maxim.SetMaxMana(20);
-               maxim.SetMana(20);
-               maxim.SetIP(0);
-               maxim.SetStats(Stats(28, 22, 28, 17, 14, 100, 10));
-               ComplexAnimation maximAttackAnimation(&maximSprite, framerate);
-               maximAttackAnimation.AddFrames(1, 0, Vector<int>(0,  0), 7);
-               maximAttackAnimation.AddFrames(1, 0, Vector<int>(4, -1), 2);
-               maximAttackAnimation.AddFrames(2, 0, Vector<int>(4, -2), 2);
-               maximAttackAnimation.AddFrames(2, 0, Vector<int>(6, -2), 2);
-               maximAttackAnimation.AddFrames(2, 1, Vector<int>(6, -1), 1);
-               maximAttackAnimation.AddFrames(2, 1, Vector<int>(3, -1), 2);
-               maximAttackAnimation.AddFrames(2, 1, Vector<int>(0,  0), 1);
-               maximAttackAnimation.AddFrames(2, 2, Vector<int>(0,  0), 2);
-               maximAttackAnimation.AddFrames(2, 2, Vector<int>(2,  0), 1);
-               maximAttackAnimation.AddFrames(1, 0, Vector<int>(0,  0), 7);
-               maxim.SetAttackAnimation(&maximAttackAnimation);
-               ComplexAnimation maximSpellAnimation(&maximSprite, 5 * framerate);
-               maximSpellAnimation.AddFrames(3, 0, Vector<int>(), 2);
-               maximSpellAnimation.AddFrame(3, 1);
-               maxim.SetSpellAnimation(&maximSpellAnimation);
-               SDL_Surface *maximMeleeImg(IMG_Load("test-data/melee-maxim.png"));
-               Sprite maximMeleeSprite(maximMeleeImg, 96, 96);
-               SimpleAnimation maximMeleeAnimation(&maximMeleeSprite, 2 * framerate, 4);
-               maxim.SetMeleeAnimation(&maximMeleeAnimation);
-
-               SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
-               Sprite selanSprite(selanImg, 64, 64);
-               Hero selan;
-               selan.SetName("Selan");
-               selan.SetLevel(1);
-               selan.SetSprite(&selanSprite);
-               selan.SetMaxHealth(28);
-               selan.SetHealth(28);
-               selan.SetMaxMana(23);
-               selan.SetMana(23);
-               selan.SetIP(0);
-               selan.SetStats(Stats(23, 21, 23, 19, 22, 80, 13));
-               ComplexAnimation selanAttackAnimation(&selanSprite, framerate);
-               selanAttackAnimation.AddFrames(1, 0, Vector<int>(4, 0), 2);
-               selanAttackAnimation.AddFrame(1, 0, Vector<int>(8, 2));
-               selanAttackAnimation.AddFrame(2, 0, Vector<int>(10, 4));
-               selanAttackAnimation.AddFrame(2, 0, Vector<int>(14, 4));
-               selanAttackAnimation.AddFrames(2, 0, Vector<int>(12, 2), 3);
-               selanAttackAnimation.AddFrames(2, 1, Vector<int>(14, 2), 2);
-               selanAttackAnimation.AddFrame(2, 1, Vector<int>(2, 0));
-               selanAttackAnimation.AddFrame(2, 2, Vector<int>(-2, -4));
-               selanAttackAnimation.AddFrame(2, 2, Vector<int>(-8, -8));
-               selanAttackAnimation.AddFrame(2, 2);
-               selan.SetAttackAnimation(&selanAttackAnimation);
-               ComplexAnimation selanSpellAnimation(&selanSprite, framerate);
-               selanSpellAnimation.AddFrames(2, 0, Vector<int>(), 3);
-               selanSpellAnimation.AddFrames(2, 1, Vector<int>(), 2);
-               selanSpellAnimation.AddFrames(2, 2, Vector<int>(), 3);
-               selanSpellAnimation.AddFrames(2, 3, Vector<int>(), 2);
-               selan.SetSpellAnimation(&selanSpellAnimation);
-               SDL_Surface *selanMeleeImg(IMG_Load("test-data/melee-selan.png"));
-               Sprite selanMeleeSprite(selanMeleeImg, 96, 96);
-               SimpleAnimation selanMeleeAnimation(&selanMeleeSprite, 2 * framerate, 4);
-               selan.SetMeleeAnimation(&selanMeleeAnimation);
-
-               SDL_Surface *guyImg(IMG_Load("test-data/guy.png"));
-               Sprite guySprite(guyImg, 64, 64);
-               Hero guy;
-               guy.SetName("Guy");
-               guy.SetLevel(1);
-               guy.SetSprite(&guySprite);
-               guy.SetMaxHealth(38);
-               guy.SetHealth(38);
-               guy.SetMaxMana(0);
-               guy.SetMana(0);
-               guy.SetIP(0);
-               guy.SetStats(Stats(38, 25, 38, 13, 8, 90, 8));
-               ComplexAnimation guyAttackAnimation(&guySprite, framerate);
-               guyAttackAnimation.AddFrames(1, 0, Vector<int>(-4, 0), 2);
-               guyAttackAnimation.AddFrames(1, 0, Vector<int>(-8, 0), 2);
-               guyAttackAnimation.AddFrames(2, 0, Vector<int>(-8, 0), 2);
-               guyAttackAnimation.AddFrame(2, 0, Vector<int>(-4, 0));
-               guyAttackAnimation.AddFrames(2, 0, Vector<int>(), 2);
-               guyAttackAnimation.AddFrame(2, 1);
-               guyAttackAnimation.AddFrame(2, 1, Vector<int>(4, 0));
-               guyAttackAnimation.AddFrame(2, 1, Vector<int>(10, 0));
-               guyAttackAnimation.AddFrame(2, 2, Vector<int>(10, 0));
-               guyAttackAnimation.AddFrame(2, 2);
-               guy.SetAttackAnimation(&guyAttackAnimation);
-               SDL_Surface *guyMeleeImg(IMG_Load("test-data/melee-guy.png"));
-               Sprite guyMeleeSprite(guyMeleeImg, 96, 96);
-               SimpleAnimation guyMeleeAnimation(&guyMeleeSprite, 2 * framerate, 4);
-               guy.SetMeleeAnimation(&guyMeleeAnimation);
-
-               SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png"));
-               Sprite dekarSprite(dekarImg, 64, 64);
-               Hero dekar;
-               dekar.SetName("Dekar");
-               dekar.SetLevel(1);
-               dekar.SetSprite(&dekarSprite);
-               dekar.SetMaxHealth(38);
-               dekar.SetHealth(38);
-               dekar.SetMaxMana(0);
-               dekar.SetMana(0);
-               dekar.SetIP(0);
-               dekar.SetStats(Stats(46, 29, 46, 13, 7, 100, 5));
-               ComplexAnimation dekarAttackAnimation(&dekarSprite, framerate);
-               dekarAttackAnimation.AddFrame(1, 0, Vector<int>(4, 0));
-               dekarAttackAnimation.AddFrame(1, 0, Vector<int>(8, 2));
-               dekarAttackAnimation.AddFrame(2, 0, Vector<int>(12, 4));
-               dekarAttackAnimation.AddFrame(2, 0, Vector<int>(16, 4));
-               dekarAttackAnimation.AddFrames(2, 0, Vector<int>(10, 2), 4);
-               dekarAttackAnimation.AddFrame(2, 1, Vector<int>(6, 2));
-               dekarAttackAnimation.AddFrame(2, 1, Vector<int>());
-               dekarAttackAnimation.AddFrame(2, 2, Vector<int>(-2, 0));
-               dekarAttackAnimation.AddFrames(2, 2, Vector<int>(0, 0), 3);
-               dekar.SetAttackAnimation(&dekarAttackAnimation);
-               ComplexAnimation dekarSpellAnimation(&dekarSprite, framerate);
-               dekarSpellAnimation.AddFrames(2, 0, Vector<int>(), 6);
-               dekarSpellAnimation.AddFrames(2, 1, Vector<int>(), 2);
-               dekarSpellAnimation.AddFrames(2, 2, Vector<int>(), 3);
-               dekar.SetSpellAnimation(&dekarSpellAnimation);
-               SDL_Surface *dekarMeleeImg(IMG_Load("test-data/melee-dekar.png"));
-               Sprite dekarMeleeSprite(dekarMeleeImg, 96, 96);
-               SimpleAnimation dekarMeleeAnimation(&dekarMeleeSprite, 2 * framerate, 4);
-               dekar.SetMeleeAnimation(&dekarMeleeAnimation);
-
-               battle::Resources battleRes;
-
-               SDL_Surface *swapCursorImg(IMG_Load("test-data/swap-cursor.png"));
-               Sprite swapCursorSprite(swapCursorImg, 32, 32);
-               battleRes.swapCursor = &swapCursorSprite;
-               SDL_Surface *attackIconsImg(IMG_Load("test-data/attack-type-icons.png"));
-               Sprite attackIconsSprite(attackIconsImg, 32, 32);
-               battleRes.attackIcons = &attackIconsSprite;
-               SDL_Surface *attackChoiceIconsImg(IMG_Load("test-data/attack-choice-icons.png"));
-               Sprite attackChoiceIconsSprite(attackChoiceIconsImg, 16, 16);
-               battleRes.attackChoiceIcons = &attackChoiceIconsSprite;
-               SDL_Surface *moveIconsImg(IMG_Load("test-data/move-icons.png"));
-               Sprite moveIconsSprite(moveIconsImg, 32, 32);
-               battleRes.moveIcons = &moveIconsSprite;
-
-               SDL_Surface *titleFrameImg(IMG_Load("test-data/title-frame.png"));
-               Frame titleFrame(titleFrameImg, 16, 16);
-               battleRes.titleFrame = &titleFrame;
-
-               SDL_Surface *largeFontImg(IMG_Load("test-data/large-font.png"));
-               Sprite largeFontSprite(largeFontImg, 16, 32);
-               Font largeFont(&largeFontSprite, 0, -2);
-               battleRes.titleFont = &largeFont;
-
-               ComplexAnimation numberAnimationPrototype(0, framerate);
-               numberAnimationPrototype.AddFrame(0, 0);
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -48));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -42));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -26));
-               numberAnimationPrototype.AddFrame(0, 0);
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -24));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -20));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
-               numberAnimationPrototype.AddFrame(0, 0);
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -12));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -10));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -6));
-               numberAnimationPrototype.AddFrames(0, 0, Vector<int>(), 14);
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -36));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -32));
-               numberAnimationPrototype.AddFrame(0, 0, Vector<int>(0, -18));
-               battleRes.numberAnimationPrototype = &numberAnimationPrototype;
-
-               SDL_Surface *bigNumbersImg(IMG_Load("test-data/big-numbers.png"));
-               Sprite bigNumbersSprite(bigNumbersImg, 16, 32);
-               battleRes.bigNumberSprite = &bigNumbersSprite;
-               SDL_Surface *bigGreenNumbersImg(IMG_Load("test-data/big-green-numbers.png"));
-               Sprite bigGreenNumbersSprite(bigGreenNumbersImg, 16, 32);
-               battleRes.greenNumberSprite = &bigGreenNumbersSprite;
-
-               SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png"));
-               Sprite heroTagSprite(heroTagImg, 32, 16);
-               battleRes.heroTagLabels = &heroTagSprite;
-               battleRes.levelLabelCol = 0;
-               battleRes.levelLabelRow = 0;
-               battleRes.healthLabelCol = 0;
-               battleRes.healthLabelRow = 1;
-               battleRes.manaLabelCol = 0;
-               battleRes.manaLabelRow = 2;
-               battleRes.moveLabelCol = 0;
-               battleRes.moveLabelRow = 3;
-               battleRes.ikariLabelCol = 0;
-               battleRes.ikariLabelRow = 4;
-
-               SDL_Surface *numbersImg(IMG_Load("test-data/numbers.png"));
-               Sprite numbersSprite(numbersImg, 16, 16);
-               Font heroTagFont(&numbersSprite, 0, -3);
-               battleRes.heroTagFont = &heroTagFont;
-               SDL_Surface *tagFramesImg(IMG_Load("test-data/tag-frames.png"));
-               Frame heroTagFrame(tagFramesImg, 16, 16, 1, 1, 0, 33);
-               battleRes.heroTagFrame = &heroTagFrame;
-               Frame activeHeroTagFrame(tagFramesImg, 16, 16);
-               battleRes.activeHeroTagFrame = &activeHeroTagFrame;
-               SDL_Surface *smallTagFrameImg(IMG_Load("test-data/small-tag-frame.png"));
-               Frame smallTagFrame(smallTagFrameImg, 8, 16);
-               battleRes.smallHeroTagFrame = &smallTagFrame;
-               Frame lastSmallTagFrame(smallTagFrameImg, 8, 16, 1, 1, 0, 33);
-               battleRes.lastSmallHeroTagFrame = &lastSmallTagFrame;
-               battleRes.heroesBgColor = SDL_MapRGB(screen.Screen()->format, 0x18, 0x28, 0x31);
-
-               SDL_Surface *gauges(IMG_Load("test-data/gauges.png"));
-               Gauge healthGauge(gauges, 0, 16, 0, 0, 16, 6, 1, 6);
-               battleRes.healthGauge = &healthGauge;
-               Gauge manaGauge(gauges, 0, 32, 0, 0, 16, 6, 1, 6);
-               battleRes.manaGauge = &manaGauge;
-               Gauge ikariGauge(gauges, 0, 48, 0, 0, 16, 6, 1, 6);
-               battleRes.ikariGauge = &ikariGauge;
-
-               SDL_Surface *selectFrameImg(IMG_Load("test-data/select-frame.png"));
-               Frame selectFrame(selectFrameImg, 16, 16);
-               battleRes.selectFrame = &selectFrame;
-
-               SDL_Surface *normalFontImg(IMG_Load("test-data/normal-font.png"));
-               Sprite normalFontSprite(normalFontImg, 16, 16);
-               Font normalFont(&normalFontSprite, 0, -2);
-               battleRes.normalFont = &normalFont;
-
-               SDL_Surface *disabledFontImg(IMG_Load("test-data/disabled-font.png"));
-               Sprite disabledFontSprite(disabledFontImg, 16, 16);
-               Font disabledFont(&disabledFontSprite, 0, -2);
-               battleRes.disabledFont = &disabledFont;
-
-               SDL_Surface *handCursorImg(IMG_Load("test-data/cursor-hand.png"));
-               Sprite handCursorSprite(handCursorImg, 32, 32);
-               battleRes.menuCursor = &handCursorSprite;
-
-               SDL_Surface *targetingIconsImg(IMG_Load("test-data/targeting-icons.png"));
-               Sprite weaponTargetCursor(targetingIconsImg, 32, 32);
-               Sprite magicTargetCursor(targetingIconsImg, 32, 32, 0, 32);
-               Sprite itemTargetCursor(targetingIconsImg, 32, 32, 0, 64);
-               battleRes.weaponTargetCursor = &weaponTargetCursor;
-               battleRes.magicTargetCursor = &magicTargetCursor;
-               battleRes.itemTargetCursor = &itemTargetCursor;
-
-               Spell resetSpell;
-               resetSpell.SetName("Reset");
-               maxim.AddSpell(&resetSpell);
-               Spell strongSpell;
-               strongSpell.SetName("Strong");
-               strongSpell.SetCost(3);
-               strongSpell.SetUsableInBattle();
-               strongSpell.GetTargetingMode().TargetMultipleAllies();
-               maxim.AddSpell(&strongSpell);
-               selan.AddSpell(&strongSpell);
-               Spell strongerSpell;
-               strongerSpell.SetName("Stronger");
-               strongerSpell.SetCost(8);
-               strongerSpell.SetUsableInBattle();
-               strongerSpell.GetTargetingMode().TargetMultipleAllies();
-               maxim.AddSpell(&strongerSpell);
-               selan.AddSpell(&strongerSpell);
-               Spell championSpell;
-               championSpell.SetName("Champion");
-               championSpell.SetCost(16);
-               championSpell.SetUsableInBattle();
-               championSpell.GetTargetingMode().TargetMultipleAllies();
-               maxim.AddSpell(&championSpell);
-               selan.AddSpell(&championSpell);
-               Spell rallySpell;
-               rallySpell.SetName("Rally");
-               rallySpell.SetCost(10);
-               rallySpell.SetUsableInBattle();
-               rallySpell.GetTargetingMode().TargetMultipleAllies();
-               maxim.AddSpell(&rallySpell);
-               selan.AddSpell(&rallySpell);
-               Spell escapeSpell;
-               escapeSpell.SetName("Escape");
-               escapeSpell.SetCost(8);
-               selan.AddSpell(&escapeSpell);
-               Spell valorSpell;
-               valorSpell.SetName("Valor");
-               valorSpell.SetCost(30);
-               valorSpell.SetUsableInBattle();
-               valorSpell.GetTargetingMode().TargetMultipleAllies();
-               maxim.AddSpell(&valorSpell);
-               selan.AddSpell(&valorSpell);
-
-               battleRes.spellMenuHeadline = "Please choose a spell.";
-               battleRes.spellMenuPrototype = Menu<const Spell *>(&normalFont, &disabledFont, &handCursorSprite, 9, 6, 8, 0, 2, 32, 2, ':');
-
-               SDL_Surface *itemIcons(IMG_Load("test-data/item-icons.png"));
-               Sprite potionIcon(itemIcons, 16, 16);
-               Sprite ballIcon(itemIcons, 16, 16, 0, 16);
-               Sprite crankIcon(itemIcons, 16, 16, 0, 32);
-               Sprite spearIcon(itemIcons, 16, 16, 0, 48);
-               Sprite swordIcon(itemIcons, 16, 16, 0, 64);
-               Sprite axIcon(itemIcons, 16, 16, 0, 80);
-               Sprite rodIcon(itemIcons, 16, 16, 0, 96);
-               Sprite armorIcon(itemIcons, 16, 16, 0, 112);
-               Sprite shieldIcon(itemIcons, 16, 16, 0, 128);
-               Sprite helmetIcon(itemIcons, 16, 16, 0, 144);
-               Sprite ringIcon(itemIcons, 16, 16, 0, 160);
-               Sprite jewelIcon(itemIcons, 16, 16, 0, 176);
-
-               battleRes.weaponMenuIcon = &swordIcon;
-               battleRes.armorMenuIcon = &armorIcon;
-               battleRes.shieldMenuIcon = &shieldIcon;
-               battleRes.helmetMenuIcon = &helmetIcon;
-               battleRes.ringMenuIcon = &ringIcon;
-               battleRes.jewelMenuIcon = &jewelIcon;
-
-               Inventory inventory;
-               Item antidote;
-               antidote.SetName("Antidote");
-               antidote.SetMenuIcon(&potionIcon);
-               antidote.SetUsableInBattle();
-               antidote.GetTargetingMode().TargetSingleAlly();
-               inventory.Add(&antidote, 9);
-               Item magicJar;
-               magicJar.SetName("Magic jar");
-               magicJar.SetMenuIcon(&potionIcon);
-               magicJar.SetUsableInBattle();
-               magicJar.GetTargetingMode().TargetSingleAlly();
-               inventory.Add(&magicJar, 4);
-               Item hiPotion;
-               hiPotion.SetName("Hi-Potion");
-               hiPotion.SetMenuIcon(&potionIcon);
-               hiPotion.SetUsableInBattle();
-               hiPotion.GetTargetingMode().TargetSingleAlly();
-               inventory.Add(&hiPotion, 4);
-               Item powerPotion;
-               powerPotion.SetName("Power potion");
-               powerPotion.SetMenuIcon(&potionIcon);
-               inventory.Add(&powerPotion, 4);
-               Item escape;
-               escape.SetName("Escape");
-               inventory.Add(&escape, 2);
-               Item sleepBall;
-               sleepBall.SetName("Sleep ball");
-               sleepBall.SetMenuIcon(&ballIcon);
-               sleepBall.SetUsableInBattle();
-               sleepBall.GetTargetingMode().TargetSingleEnemy();
-               inventory.Add(&sleepBall, 1);
-               Item multiBall;
-               multiBall.SetName("Multi-ball!");
-               multiBall.SetMenuIcon(&ballIcon);
-               multiBall.SetUsableInBattle();
-               multiBall.GetTargetingMode().TargetMultipleEnemies();
-               inventory.Add(&multiBall, 1);
-               Item figgoru;
-               figgoru.SetName("Figgoru");
-               figgoru.SetMenuIcon(&crankIcon);
-               figgoru.GetTargetingMode().TargetAllEnemies();
-               inventory.Add(&figgoru, 1);
-               battleRes.inventory = &inventory;
-
-               battleRes.itemMenuHeadline = "Please choose an item.";
-               battleRes.itemMenuPrototype = Menu<const common::Item *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':');
-
-               SDL_Surface *swordAttackImg(IMG_Load("test-data/attack-sword.png"));
-               Sprite swordAttackSprite(swordAttackImg, 96, 96);
-               SimpleAnimation swordAttackAnimation(&swordAttackSprite, 2 * framerate, 4);
-
-               Item zircoSword;
-               zircoSword.SetName("Zirco sword");
-               zircoSword.SetMenuIcon(&swordIcon);
-               zircoSword.GetTargetingMode().TargetSingleEnemy();
-               Ikari firestorm;
-               firestorm.SetName("Firestorm");
-               firestorm.SetCost(224);
-               firestorm.GetTargetingMode().TargetAllEnemies();
-               firestorm.SetPhysical();
-               zircoSword.SetIkari(&firestorm);
-               zircoSword.SetAttackAnimation(&swordAttackAnimation);
-               maxim.SetWeapon(&zircoSword);
-               Item zirconArmor;
-               zirconArmor.SetName("Zircon armor");
-               zirconArmor.SetMenuIcon(&armorIcon);
-               Ikari magicCure;
-               magicCure.SetName("Magic cure");
-               magicCure.SetCost(128);
-               magicCure.GetTargetingMode().TargetSingleAlly();
-               magicCure.SetMagical();
-               zirconArmor.SetIkari(&magicCure);
-               maxim.SetArmor(&zirconArmor);
-               Item holyShield;
-               holyShield.SetName("Holy shield");
-               holyShield.SetMenuIcon(&shieldIcon);
-               Ikari lightGuard;
-               lightGuard.SetName("Light guard");
-               lightGuard.SetCost(128);
-               lightGuard.GetTargetingMode().TargetAllAllies(); // actually only targets self
-               lightGuard.SetMagical();
-               holyShield.SetIkari(&lightGuard);
-               maxim.SetShield(&holyShield);
-               Item legendHelm;
-               legendHelm.SetName("Legend helm");
-               legendHelm.SetMenuIcon(&helmetIcon);
-               Ikari boomerang;
-               boomerang.SetName("Boomerang");
-               boomerang.SetCost(164);
-               boomerang.GetTargetingMode().TargetAllAllies(); // actually only targets self
-               boomerang.SetMagical();
-               legendHelm.SetIkari(&boomerang);
-               maxim.SetHelmet(&legendHelm);
-               Item sProRing;
-               sProRing.SetName("S-pro ring");
-               sProRing.SetMenuIcon(&ringIcon);
-               Ikari courage;
-               courage.SetName("Courage");
-               courage.SetCost(64);
-               courage.GetTargetingMode().TargetMultipleAllies();
-               courage.SetMagical();
-               sProRing.SetIkari(&courage);
-               maxim.SetRing(&sProRing);
-               Item evilJewel;
-               evilJewel.SetName("Evil jewel");
-               evilJewel.SetMenuIcon(&jewelIcon);
-               Ikari gloomy;
-               gloomy.SetName("Gloomy");
-               gloomy.SetCost(164);
-               gloomy.GetTargetingMode().TargetAllEnemies();
-               gloomy.SetMagical();
-               evilJewel.SetIkari(&gloomy);
-               maxim.SetJewel(&evilJewel);
-
-               Item zircoWhip;
-               zircoWhip.SetName("Zirco whip");
-               zircoWhip.SetMenuIcon(&rodIcon);
-               zircoWhip.GetTargetingMode().TargetSingleEnemy();
-               Ikari thundershriek;
-               thundershriek.SetName("Thundershriek");
-               thundershriek.SetCost(224);
-               thundershriek.GetTargetingMode().TargetAllEnemies();
-               thundershriek.SetPhysical();
-               zircoWhip.SetIkari(&thundershriek);
-//             selan.SetWeapon(&zircoWhip);
-               Item zirconPlate;
-               zirconPlate.SetName("Zircon plate");
-               zirconPlate.SetMenuIcon(&armorIcon);
-               Ikari suddenCure;
-               suddenCure.SetName("Sudden cure");
-               suddenCure.SetCost(96);
-               suddenCure.GetTargetingMode().TargetAllAllies();
-               suddenCure.SetMagical();
-               zirconPlate.SetIkari(&suddenCure);
-               selan.SetArmor(&zirconPlate);
-               Item zircoGloves;
-               zircoGloves.SetName("Zirco gloves");
-               zircoGloves.SetMenuIcon(&shieldIcon);
-               Ikari forcefield;
-               forcefield.SetName("Forcefield");
-               forcefield.SetCost(64);
-               forcefield.GetTargetingMode().TargetAllAllies();
-               forcefield.SetMagical();
-               zircoGloves.SetIkari(&forcefield);
-               selan.SetShield(&zircoGloves);
-               Item holyCap;
-               holyCap.SetName("Holy cap");
-               holyCap.SetMenuIcon(&helmetIcon);
-               Ikari vulnerable;
-               vulnerable.SetName("Vulnerable");
-               vulnerable.SetCost(196);
-               vulnerable.GetTargetingMode().TargetAllEnemies();
-               vulnerable.SetPhysical();
-               holyCap.SetIkari(&vulnerable);
-               selan.SetHelmet(&holyCap);
-               Item ghostRing;
-               ghostRing.SetName("Ghost ring");
-               ghostRing.SetMenuIcon(&ringIcon);
-               Ikari destroy;
-               destroy.SetName("Destroy");
-               destroy.SetCost(128);
-               destroy.GetTargetingMode().TargetMultipleEnemies();
-               destroy.SetMagical();
-               ghostRing.SetIkari(&destroy);
-               selan.SetRing(&ghostRing);
-               Item eagleRock;
-               eagleRock.SetName("Eagle rock");
-               eagleRock.SetMenuIcon(&jewelIcon);
-               Ikari dive;
-               dive.SetName("Dive");
-               dive.SetCost(128);
-               dive.GetTargetingMode().TargetSingleEnemy();
-               dive.SetPhysical();
-               eagleRock.SetIkari(&dive);
-               selan.SetJewel(&eagleRock);
-
-               Item zircoAx;
-               zircoAx.SetName("Zirco ax");
-               zircoAx.SetMenuIcon(&axIcon);
-               zircoAx.GetTargetingMode().TargetSingleEnemy();
-               Ikari torrent;
-               torrent.SetName("Torrent");
-               torrent.SetCost(224);
-               torrent.GetTargetingMode().TargetAllEnemies();
-               torrent.SetPhysical();
-               zircoAx.SetIkari(&torrent);
-//             guy.SetWeapon(&zircoAx);
-               guy.SetArmor(&zirconArmor);
-               Item megaShield;
-               megaShield.SetName("Mega shield");
-               megaShield.SetMenuIcon(&shieldIcon);
-               Ikari ironBarrier;
-               ironBarrier.SetName("Iron barrier");
-               ironBarrier.SetCost(255);
-               ironBarrier.GetTargetingMode().TargetAllAllies(); // actually only targets self
-               ironBarrier.SetMagical();
-               megaShield.SetIkari(&ironBarrier);
-               guy.SetShield(&megaShield);
-               Item zircoHelmet;
-               zircoHelmet.SetName("Zirco helmet");
-               zircoHelmet.SetMenuIcon(&helmetIcon);
-               Ikari slow;
-               slow.SetName("Slow");
-               slow.SetCost(196);
-               slow.GetTargetingMode().TargetAllEnemies();
-               slow.SetPhysical();
-               zircoHelmet.SetIkari(&slow);
-               guy.SetHelmet(&zircoHelmet);
-               Item powerRing;
-               powerRing.SetName("Power ring");
-               powerRing.SetMenuIcon(&ringIcon);
-               Ikari trick;
-               trick.SetName("Trick");
-               trick.SetCost(32);
-               trick.GetTargetingMode().TargetAllEnemies();
-               trick.SetMagical();
-               zircoHelmet.SetIkari(&trick);
-               guy.SetRing(&powerRing);
-               guy.SetJewel(&evilJewel);
+               PartyLayout monstersLayout(*caster.GetPartyLayout("monstersLayout"));
+
+               Monster monster(*caster.GetMonster("lizard"));
+
+               gameState.heroes[0].AddSpell(caster.GetSpell("resetSpell"));
+               Spell *strongSpell(caster.GetSpell("strongSpell"));
+               gameState.heroes[0].AddSpell(strongSpell);
+               gameState.heroes[1].AddSpell(strongSpell);
+               Spell *strongerSpell(caster.GetSpell("strongerSpell"));
+               gameState.heroes[0].AddSpell(strongerSpell);
+               gameState.heroes[1].AddSpell(strongerSpell);
+               Spell *championSpell(caster.GetSpell("championSpell"));
+               gameState.heroes[0].AddSpell(championSpell);
+               gameState.heroes[1].AddSpell(championSpell);
+               Spell *rallySpell(caster.GetSpell("rallySpell"));
+               gameState.heroes[0].AddSpell(rallySpell);
+               gameState.heroes[1].AddSpell(rallySpell);
+               gameState.heroes[1].AddSpell(caster.GetSpell("escapeSpell"));
+               Spell *valorSpell(caster.GetSpell("valorSpell"));
+               gameState.heroes[0].AddSpell(valorSpell);
+               gameState.heroes[1].AddSpell(valorSpell);
+
+               gameState.inventory.Add(caster.GetItem("zirconPlateItem"));
+               gameState.inventory.Add(caster.GetItem("antidoteItem"), 9);
+               gameState.inventory.Add(caster.GetItem("powerRingItem"));
+               gameState.inventory.Add(caster.GetItem("magicJarItem"), 4);
+               gameState.inventory.Add(caster.GetItem("sProRingItem"));
+               gameState.inventory.Add(caster.GetItem("hiPotionItem"), 4);
+               gameState.inventory.Add(caster.GetItem("powerRingItem"));
+               gameState.inventory.Add(caster.GetItem("powerPotionItem"), 4);
+               gameState.inventory.Add(caster.GetItem("zircoSwordItem"));
+               gameState.inventory.Add(caster.GetItem("escapeItem"), 2);
+               gameState.inventory.Add(caster.GetItem("zircoHelmetItem"));
+               gameState.inventory.Add(caster.GetItem("sleepBallItem"), 1);
+               gameState.inventory.Add(caster.GetItem("zirconPlateItem"));
+
+               gameState.heroes[0].SetEquipment(Hero::EQUIP_WEAPON, caster.GetItem("zircoSwordItem"));
+               gameState.heroes[0].SetEquipment(Hero::EQUIP_ARMOR, caster.GetItem("zirconArmorItem"));
+               gameState.heroes[0].SetEquipment(Hero::EQUIP_SHIELD, caster.GetItem("holyShieldItem"));
+               gameState.heroes[0].SetEquipment(Hero::EQUIP_HELMET, caster.GetItem("legendHelmItem"));
+               gameState.heroes[0].SetEquipment(Hero::EQUIP_RING, caster.GetItem("sProRingItem"));
+               gameState.heroes[0].SetEquipment(Hero::EQUIP_JEWEL, caster.GetItem("evilJewelItem"));
+
+//             gameState.heroes[1].SetEquipment(Hero::EQUIP_WEAPON, caster.GetItem("zircoWhipItem"));
+               gameState.heroes[1].SetEquipment(Hero::EQUIP_ARMOR, caster.GetItem("zirconPlateItem"));
+               gameState.heroes[1].SetEquipment(Hero::EQUIP_SHIELD, caster.GetItem("zircoGlovesItem"));
+               gameState.heroes[1].SetEquipment(Hero::EQUIP_HELMET, caster.GetItem("holyCapItem"));
+               gameState.heroes[1].SetEquipment(Hero::EQUIP_RING, caster.GetItem("ghostRingItem"));
+               gameState.heroes[1].SetEquipment(Hero::EQUIP_JEWEL, caster.GetItem("eagleRockItem"));
+
+//             gameState.heroes[2].SetEquipment(Hero::EQUIP_WEAPON, caster.GetItem("zircoAxItem"));
+               gameState.heroes[2].SetEquipment(Hero::EQUIP_ARMOR, caster.GetItem("zirconArmorItem"));
+               gameState.heroes[2].SetEquipment(Hero::EQUIP_SHIELD, caster.GetItem("megaShieldItem"));
+               gameState.heroes[2].SetEquipment(Hero::EQUIP_HELMET, caster.GetItem("zircoHelmetItem"));
+               gameState.heroes[2].SetEquipment(Hero::EQUIP_RING, caster.GetItem("powerRingItem"));
+               gameState.heroes[2].SetEquipment(Hero::EQUIP_JEWEL, caster.GetItem("evilJewelItem"));
 
                // NOTE: this is actually Artea equipment
-               Item lizardBlow;
-               lizardBlow.SetName("Lizard blow");
-               lizardBlow.SetMenuIcon(&swordIcon);
-               lizardBlow.GetTargetingMode().TargetSingleEnemy();
-               Ikari dragonRush;
-               dragonRush.SetName("Dragon rush");
-               dragonRush.SetCost(164);
-               dragonRush.GetTargetingMode().TargetSingleEnemy();
-               dragonRush.SetPhysical();
-               lizardBlow.SetIkari(&dragonRush);
-//             dekar.SetWeapon(&lizardBlow);
-               Item holyRobe;
-               holyRobe.SetName("Holy robe");
-               holyRobe.SetMenuIcon(&armorIcon);
-               Ikari crisisCure;
-               crisisCure.SetName("Crisis cure");
-               crisisCure.SetCost(164);
-               crisisCure.GetTargetingMode().TargetAllAllies();
-               crisisCure.SetMagical();
-               holyRobe.SetIkari(&crisisCure);
-               dekar.SetArmor(&holyRobe);
-               dekar.SetShield(&zircoGloves);
-               dekar.SetHelmet(&holyCap);
-               Item rocketRing;
-               rocketRing.SetName("Rocket ring");
-               rocketRing.SetMenuIcon(&ringIcon);
-               Ikari fake;
-               fake.SetName("Fake");
-               fake.SetCost(32);
-               fake.GetTargetingMode().TargetSingleAlly();
-               fake.SetMagical();
-               rocketRing.SetIkari(&fake);
-               dekar.SetRing(&rocketRing);
-               Item krakenRock;
-               krakenRock.SetName("Kraken rock");
-               krakenRock.SetMenuIcon(&jewelIcon);
-               Ikari tenLegger;
-               tenLegger.SetName("Ten-legger");
-               tenLegger.SetCost(164);
-               tenLegger.GetTargetingMode().TargetAllEnemies();
-               tenLegger.SetPhysical();
-               rocketRing.SetIkari(&tenLegger);
-               dekar.SetJewel(&krakenRock);
-
-               battleRes.ikariMenuHeadline = "Please choose equipment.";
-               battleRes.noEquipmentText = "No equip";
-               battleRes.ikariMenuPrototype = Menu<const Item *>(&normalFont, &disabledFont, &handCursorSprite, 12, 6, normalFont.CharHeight() / 2, normalFont.CharWidth(), 1, normalFont.CharWidth() * 2, 0, ':', 12, normalFont.CharWidth());
-
-               battleRes.escapeText = "Escapes.";
-
-               BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
-               battleState->AddMonster(monster);
-               battleState->AddMonster(monster);
-               battleState->AddMonster(monster);
-               battleState->AddMonster(monster);
-               battleState->AddHero(maxim);
-               battleState->AddHero(selan);
-               battleState->AddHero(guy);
-               battleState->AddHero(dekar);
-               Application app(&screen, battleState);
+//             gameState.heroes[3].SetEquipment(Hero::EQUIP_WEAPON, caster.GetItem("lizardBlowItem"));
+               gameState.heroes[3].SetEquipment(Hero::EQUIP_ARMOR, caster.GetItem("holyRobeItem"));
+               gameState.heroes[3].SetEquipment(Hero::EQUIP_SHIELD, caster.GetItem("zircoGlovesItem"));
+               gameState.heroes[3].SetEquipment(Hero::EQUIP_HELMET, caster.GetItem("holyCapItem"));
+               gameState.heroes[3].SetEquipment(Hero::EQUIP_RING, caster.GetItem("rocketRingItem"));
+               gameState.heroes[3].SetEquipment(Hero::EQUIP_JEWEL, caster.GetItem("krakenRockItem"));
+
+               gameState.heroes[0].MapEntity().Position() = Vector<float>(64, 128);
+
+               gameState.heroes[1].MapEntity().Position() = Vector<float>(64, 128);
+               gameState.heroes[1].MapEntity().SetFlags(Entity::FLAG_NONBLOCKING);
+               gameState.heroes[0].MapEntity().AddFollower(&gameState.heroes[1].MapEntity());
+
+               gameState.heroes[2].MapEntity().Position() = Vector<float>(64, 128);
+               gameState.heroes[2].MapEntity().SetFlags(Entity::FLAG_NONBLOCKING);
+               gameState.heroes[1].MapEntity().AddFollower(&gameState.heroes[2].MapEntity());
+
+               gameState.heroes[3].MapEntity().Position() = Vector<float>(64, 128);
+               gameState.heroes[3].MapEntity().SetFlags(Entity::FLAG_NONBLOCKING);
+               gameState.heroes[2].MapEntity().AddFollower(&gameState.heroes[3].MapEntity());
+
+               InitScreen screen(width, height);
+
+               app::State *state(0);
+
+               if (battle) {
+                       BattleState *battleState(new BattleState(&gameConfig, bg, &monstersLayout));
+                       battleState->AddMonster(monster);
+                       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]);
+                       battleState->AddHero(gameState.heroes[3]);
+                       state = battleState;
+               } else {
+                       MapState *mapState(new MapState(&gameConfig, caster.GetMap("map1")));
+
+                       mapState->ControlEntity(&gameState.heroes[0].MapEntity());
+                       mapState->SetWalkingSpeed(walkSpeed);
+
+                       state = mapState;
+               }
+
+               Application app(screen, state);
                app.Buttons().MapKey(SDLK_w, Input::PAD_UP);
                app.Buttons().MapKey(SDLK_d, Input::PAD_RIGHT);
                app.Buttons().MapKey(SDLK_s, Input::PAD_DOWN);
@@ -733,12 +322,16 @@ int main(int argc, char **argv) {
                app.Buttons().MapKey(SDLK_SPACE, Input::SELECT);
                app.Buttons().MapKey(SDLK_RSHIFT, Input::SHOULDER_RIGHT);
                app.Buttons().MapKey(SDLK_LSHIFT, Input::SHOULDER_LEFT);
+               app.Buttons().MapKey(SDLK_1, Input::DEBUG_1);
+               app.Buttons().MapKey(SDLK_2, Input::DEBUG_2);
+               app.Buttons().MapKey(SDLK_3, Input::DEBUG_3);
+               app.Buttons().MapKey(SDLK_4, Input::DEBUG_4);
                app.Run();
 
                return 0;
        } catch (Parser::Error &e) {
                cerr << "parsing exception in file " << e.File() << " on line " << e.Line() << ": " << e.what() << endl;
-               return 1;
+               return 2;
        } catch (exception &e) {
                cerr << "exception in main(): " << e.what() << endl;
                return 1;