]> git.localhorst.tv Git - l2e.git/blobdiff - src/main.cpp
added capsule mockup (battle)
[l2e.git] / src / main.cpp
index a09f014c6a509ca588cd951efb7ce10ca8675907..59348338391daea0d5c6ea5fdb1578fdd4f32fe3 100644 (file)
@@ -1,44 +1,75 @@
-/*
- * 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 "geometry/Point.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/Frame.h"
 #include "graphics/Gauge.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::Capsule;
 using battle::Monster;
 using battle::PartyLayout;
-using geometry::Point;
-using graphics::Font;
-using graphics::Frame;
-using graphics::Gauge;
-using graphics::Menu;
-using graphics::Sprite;
+using common::GameConfig;
+using common::GameState;
+using common::Hero;
+using common::Spell;
+using geometry::Vector;
+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;
@@ -47,191 +78,239 @@ 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;
+
+       bool battle(false);
+
+//     std::srand(std::time(0));
 
        try {
                InitSDL sdl;
                InitImage image(IMG_INIT_PNG);
-               InitScreen screen(width, height);
+
+               Interpreter::CreateTypeDescriptions();
+
+               battle::Resources::CreateTypeDescription();
+               battle::Monster::CreateTypeDescription();
+               battle::PartyLayout::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);
+
+               ParsedSource source;
+
+               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;
+
+               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(Point<Uint8>(88, 104));
-               monstersLayout.AddPosition(Point<Uint8>(128, 104));
-               monstersLayout.AddPosition(Point<Uint8>(168, 104));
-               monstersLayout.AddPosition(Point<Uint8>(208, 104));
-               PartyLayout heroesLayout;
-               heroesLayout.AddPosition(Point<Uint8>(27, 219));
-               heroesLayout.AddPosition(Point<Uint8>(104, 227));
-               heroesLayout.AddPosition(Point<Uint8>(66, 238));
-               heroesLayout.AddPosition(Point<Uint8>(143, 246));
-
-               SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
-               Sprite dummySprite(monsterImg, 64, 64);
-               Monster monster;
-               monster.SetSprite(&dummySprite);
-
-               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);
-
-               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);
-
-               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);
-
-               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);
-
-               battle::Resources battleRes;
-
-               SDL_Surface *attackIconsImg(IMG_Load("test-data/attack-type-icons.png"));
-               Sprite attackIconsSprite(attackIconsImg, 32, 32);
-               battleRes.attackIcons = &attackIconsSprite;
-               SDL_Surface *moveIconsImg(IMG_Load("test-data/move-icons.png"));
-               Sprite moveIconsSprite(moveIconsImg, 32, 32);
-               battleRes.moveIcons = &moveIconsSprite;
-               SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png"));
-               Sprite heroTagSprite(heroTagImg, 32, 16);
-               battleRes.heroTagLabels = &heroTagSprite;
-               SDL_Surface *numbersImg(IMG_Load("test-data/numbers.png"));
-               Sprite numbersSprite(numbersImg, 16, 16);
-               Font heroTagFont(&numbersSprite);
-               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 *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);
-               normalFont.MapRange('A', 'M', 0, 1);
-               normalFont.MapRange('N', 'Z', 0, 2);
-               normalFont.MapRange('a', 'm', 0, 3);
-               normalFont.MapRange('n', 'z', 0, 4);
-               normalFont.MapChar(':', 10, 0);
-               normalFont.MapChar('!', 10, 0);
-               normalFont.MapChar('?', 10, 0);
-               // TODO: add '.' character
-               battleRes.normalFont = &normalFont;
-
-               SDL_Surface *disabledFontImg(IMG_Load("test-data/disabled-font.png"));
-               Sprite disabledFontSprite(disabledFontImg, 16, 16);
-               Font disabledFont(&disabledFontSprite);
-               disabledFont.MapRange('A', 'M', 0, 1);
-               disabledFont.MapRange('N', 'Z', 0, 2);
-               disabledFont.MapRange('a', 'm', 0, 3);
-               disabledFont.MapRange('n', 'z', 0, 4);
-               disabledFont.MapChar(':', 10, 0);
-               disabledFont.MapChar('!', 10, 0);
-               disabledFont.MapChar('?', 10, 0);
-               // TODO: add '.' character
-               battleRes.disabledFont = &disabledFont;
-
-               SDL_Surface *handCursorImg(IMG_Load("test-data/cursor-hand.png"));
-               Sprite handCursorSprite(handCursorImg, 32, 32);
-               battleRes.menuCursor = &handCursorSprite;
-
-               battleRes.spellMenuHeadline = "Please choose a spell.";
-               battleRes.spellMenuPrototype = Menu</* Spell */ void *>(&normalFont, &disabledFont, &handCursorSprite, 12, 6, 8, 2, 32);
-               battleRes.spellMenuPrototype.Add("Reset    : 0", 0, false);
-               battleRes.spellMenuPrototype.Add("Strong   : 3", 0);
-               battleRes.spellMenuPrototype.Add("Stronger : 8", 0);
-               battleRes.spellMenuPrototype.Add("Champion :16", 0);
-               battleRes.spellMenuPrototype.Add("Rally    :10", 0);
-               battleRes.spellMenuPrototype.Add("Escape   : 8", 0, false);
-               battleRes.spellMenuPrototype.Add("Valor    :30", 0);
-               battleRes.spellMenuPrototype.Add("Poison   : 2", 0);
-               battleRes.spellMenuPrototype.Add("Warp     : 8", 0, false);
-               battleRes.spellMenuPrototype.Add("Release  : 2", 0);
-               battleRes.spellMenuPrototype.Add("Waken    : 4", 0);
-               battleRes.spellMenuPrototype.Add("Light    : 0", 0, false);
-               battleRes.spellMenuPrototype.Add("Fake     : 4", 0);
-               battleRes.spellMenuPrototype.Add("Trick    : 5", 0);
-               battleRes.spellMenuPrototype.Add("Flash    : 5", 0);
-               battleRes.spellMenuPrototype.Add("Fireball : 6", 0);
-               battleRes.spellMenuPrototype.Add("Vortex   : 7", 0);
-               battleRes.spellMenuPrototype.Add("Blizzard : 8", 0);
-               battleRes.spellMenuPrototype.Add("Spark    : 3", 0);
-
-               battleRes.itemMenuHeadline = "Please choose an item.";
-               battleRes.itemMenuPrototype = Menu</* Item */ void *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 1, 32);
-               battleRes.itemMenuPrototype.Add("Antidote    : 9", 0);
-               battleRes.itemMenuPrototype.Add("Magic jar   : 4", 0);
-               battleRes.itemMenuPrototype.Add("Miracle     : 4", 0);
-               battleRes.itemMenuPrototype.Add("Hi-Potion   : 6", 0);
-               battleRes.itemMenuPrototype.Add("Hi-Magic    : 7", 0);
-               battleRes.itemMenuPrototype.Add("Regain      : 4", 0);
-               battleRes.itemMenuPrototype.Add("Power potion: 4", 0, false);
-               battleRes.itemMenuPrototype.Add("Life potion : 1", 0, false);
-               battleRes.itemMenuPrototype.Add("Escape      : 2", 0, false);
-               battleRes.itemMenuPrototype.Add("Power gourd : 3", 0);
-               battleRes.itemMenuPrototype.Add("Mystery pin : 2", 0);
-
-               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);
+               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
+//             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) {
+                       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->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);
@@ -244,9 +323,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 2;
        } catch (exception &e) {
                cerr << "exception in main(): " << e.what() << endl;
                return 1;