]> git.localhorst.tv Git - l2e.git/blobdiff - src/main.cpp
removed stupid file headers that eclipse put in
[l2e.git] / src / main.cpp
index 2c8096225135354f911130e2d116798945fdecaf..0e12f5b92ca0bce784a0daf5940eec610a020c1d 100644 (file)
@@ -1,22 +1,20 @@
-/*
- * 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/Hero.h"
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "battle/Resources.h"
-#include "battle/Stats.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::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;
@@ -71,10 +76,16 @@ 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));
 
@@ -82,120 +93,405 @@ int main(int argc, char **argv) {
                InitSDL sdl;
                InitImage image(IMG_INIT_PNG);
 
-               battle::Resources::CreateTypeDescription();
-               ComplexAnimation::CreateTypeDescription();
-               Font::CreateTypeDescription();
-               Frame::CreateTypeDescription();
-               Gauge::CreateTypeDescription();
-               Hero::CreateTypeDescription();
-               Ikari::CreateTypeDescription();
                Interpreter::CreateTypeDescriptions();
-               Item::CreateTypeDescription();
-               graphics::MenuProperties::CreateTypeDescription();
-               PartyLayout::CreateTypeDescription();
-               SimpleAnimation::CreateTypeDescription();
-               Spell::CreateTypeDescription();
-               Sprite::CreateTypeDescription();
-               Stats::CreateTypeDescription();
+
+               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();
+
+               map::Area::CreateTypeDescription();
+               map::Entity::CreateTypeDescription();
+               map::Map::CreateTypeDescription();
+               map::Tile::CreateTypeDescription();
+               map::Trigger::CreateTypeDescription();
+
+               Arguments args;
+               args.Read(argc, argv);
+
                ParsedSource source;
-               Parser("test-data/test.l2s", source).Parse();
-               Parser("test-data/ikaris.l2s", source).Parse();
-               Parser("test-data/items.l2s", source).Parse();
-               Parser("test-data/spells.l2s", source).Parse();
-               Parser("test-data/constants.l2s", source).Parse();
+
+               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();
 
-               int battleResId(TypeDescription::GetTypeId("BattleResources"));
-               int heroId(TypeDescription::GetTypeId("Hero"));
-               int itemId(TypeDescription::GetTypeId("Item"));
-               int monsterId(TypeDescription::GetTypeId("Monster"));
-               int partyLayoutId(TypeDescription::GetTypeId("PartyLayout"));
-               int spellId(TypeDescription::GetTypeId("Spell"));
+               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");
 
                // temporary test data
                SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
-               PartyLayout monstersLayout(*reinterpret_cast<PartyLayout *>(intp.GetObject(partyLayoutId, "monstersLayout")));
-               PartyLayout heroesLayout(*reinterpret_cast<PartyLayout *>(intp.GetObject(partyLayoutId, "heroesLayout")));
-
-               Monster monster(*reinterpret_cast<Monster *>(intp.GetObject(monsterId, "lizard")));
-               Hero maxim(*reinterpret_cast<Hero *>(intp.GetObject(heroId, "maxim")));
-               Hero selan(*reinterpret_cast<Hero *>(intp.GetObject(heroId, "selan")));
-               Hero guy(*reinterpret_cast<Hero *>(intp.GetObject(heroId, "guy")));
-               Hero dekar(*reinterpret_cast<Hero *>(intp.GetObject(heroId, "dekar")));
-
-               battle::Resources *battleRes(reinterpret_cast<battle::Resources *>(intp.GetObject(battleResId, "battleResources")));
-
-               maxim.AddSpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "resetSpell")));
-               Spell *strongSpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "strongSpell")));
-               maxim.AddSpell(strongSpell);
-               selan.AddSpell(strongSpell);
-               Spell *strongerSpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "strongerSpell")));
-               maxim.AddSpell(strongerSpell);
-               selan.AddSpell(strongerSpell);
-               Spell *championSpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "championSpell")));
-               maxim.AddSpell(championSpell);
-               selan.AddSpell(championSpell);
-               Spell *rallySpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "rallySpell")));
-               maxim.AddSpell(rallySpell);
-               selan.AddSpell(rallySpell);
-               selan.AddSpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "escapeSpell")));
-               Spell *valorSpell(reinterpret_cast<Spell *>(intp.GetObject(spellId, "valorSpell")));
-               maxim.AddSpell(valorSpell);
-               selan.AddSpell(valorSpell);
-
-               Inventory inventory;
-               inventory.Add(reinterpret_cast<Item *>(intp.GetObject(itemId, "antidoteItem")), 9);
-               inventory.Add(reinterpret_cast<Item *>(intp.GetObject(itemId, "magicJarItem")), 4);
-               inventory.Add(reinterpret_cast<Item *>(intp.GetObject(itemId, "hiPotionItem")), 4);
-               inventory.Add(reinterpret_cast<Item *>(intp.GetObject(itemId, "powerPotionItem")), 4);
-               inventory.Add(reinterpret_cast<Item *>(intp.GetObject(itemId, "escapeItem")), 2);
-               inventory.Add(reinterpret_cast<Item *>(intp.GetObject(itemId, "sleepBallItem")), 1);
-               battleRes->inventory = &inventory;
-
-               maxim.SetWeapon(reinterpret_cast<Item *>(intp.GetObject(itemId, "zircoSwordItem")));
-               maxim.SetArmor(reinterpret_cast<Item *>(intp.GetObject(itemId, "zirconArmorItem")));
-               maxim.SetShield(reinterpret_cast<Item *>(intp.GetObject(itemId, "holyShieldItem")));
-               maxim.SetHelmet(reinterpret_cast<Item *>(intp.GetObject(itemId, "legendHelmItem")));
-               maxim.SetRing(reinterpret_cast<Item *>(intp.GetObject(itemId, "sProRingItem")));
-               maxim.SetJewel(reinterpret_cast<Item *>(intp.GetObject(itemId, "evilJewelItem")));
-
-//             selan.SetWeapon(reinterpret_cast<Item *>(intp.GetObject(itemId, "zircoWhipItem")));
-               selan.SetArmor(reinterpret_cast<Item *>(intp.GetObject(itemId, "zirconPlateItem")));
-               selan.SetShield(reinterpret_cast<Item *>(intp.GetObject(itemId, "zircoGlovesItem")));
-               selan.SetHelmet(reinterpret_cast<Item *>(intp.GetObject(itemId, "holyCapItem")));
-               selan.SetRing(reinterpret_cast<Item *>(intp.GetObject(itemId, "ghostRingItem")));
-               selan.SetJewel(reinterpret_cast<Item *>(intp.GetObject(itemId, "eagleRockItem")));
-
-//             guy.SetWeapon(reinterpret_cast<Item *>(intp.GetObject(itemId, "zircoAxItem")));
-               guy.SetArmor(reinterpret_cast<Item *>(intp.GetObject(itemId, "zirconArmorItem")));
-               guy.SetShield(reinterpret_cast<Item *>(intp.GetObject(itemId, "megaShieldItem")));
-               guy.SetHelmet(reinterpret_cast<Item *>(intp.GetObject(itemId, "zircoHelmetItem")));
-               guy.SetRing(reinterpret_cast<Item *>(intp.GetObject(itemId, "powerRingItem")));
-               guy.SetJewel(reinterpret_cast<Item *>(intp.GetObject(itemId, "evilJewelItem")));
+               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
-//             dekar.SetWeapon(reinterpret_cast<Item *>(intp.GetObject(itemId, "lizardBlowItem")));
-               dekar.SetArmor(reinterpret_cast<Item *>(intp.GetObject(itemId, "holyRobeItem")));
-               dekar.SetShield(reinterpret_cast<Item *>(intp.GetObject(itemId, "zircoGlovesItem")));
-               dekar.SetHelmet(reinterpret_cast<Item *>(intp.GetObject(itemId, "holyCapItem")));
-               dekar.SetRing(reinterpret_cast<Item *>(intp.GetObject(itemId, "rocketRingItem")));
-               dekar.SetJewel(reinterpret_cast<Item *>(intp.GetObject(itemId, "krakenRockItem")));
+//             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());
+
+               menu::Resources menuResources;
+               gameConfig.menuResources = &menuResources;
+
+               Texture menubg;
+               menubg.SetSurface(IMG_Load("test-data/menubg.png"));
+               menubg.SetSize(Vector<int>(64, 64));
+               menuResources.menubg = &menubg;
+
+               menuResources.statusFont = gameConfig.battleResources->normalFont;
+
+               graphics::Sprite statusLabels(IMG_Load("test-data/status-labels.png"), 32, 16);
+               menuResources.statusLabels = &statusLabels;
+
+               graphics::Frame statusFrame(IMG_Load("test-data/status-frame.png"), 32, 32, 32, 32);
+               menuResources.statusFrame = &statusFrame;
+
+               graphics::Sprite menuFontSprite(IMG_Load("test-data/menu-font.png"), 16, 16);
+               graphics::Font menuFont(&menuFontSprite, 0, -2);
+               graphics::Sprite menuInactiveFontSprite(IMG_Load("test-data/menu-font-inactive.png"), 16, 16);
+               graphics::Font menuInactiveFont(&menuInactiveFontSprite, 0, -2);
+
+               menuResources.normalFont = &menuFont;
+               menuResources.inactiveFont = &menuInactiveFont;
+
+               graphics::Sprite menuCursor(IMG_Load("test-data/menu-cursor.png"), 32, 16);
+               menuResources.menuCursor = &menuCursor;
+               graphics::Sprite menuActiveCursor(IMG_Load("test-data/menu-cursor-active.png"), 32, 18);
+               menuResources.menuActiveCursor = &menuActiveCursor;
+
+               graphics::MenuProperties mainMenuProperties;
+               mainMenuProperties.cols = 2;
+               mainMenuProperties.rows = 4;
+               mainMenuProperties.charsPerEntry = 8;
+               mainMenuProperties.rowGap = 8;
+               mainMenuProperties.colGap = 32;
+               mainMenuProperties.cursor = &menuCursor;
+               mainMenuProperties.font = &menuFont;
+               mainMenuProperties.wrapX = true;
+               mainMenuProperties.wrapY = true;
+               menuResources.mainMenuProperties = &mainMenuProperties;
+
+               menuResources.mainMenuItemText = "ITEM";
+               menuResources.mainMenuSpellText = "SPELL";
+               menuResources.mainMenuCapsuleText = "CAPSULE";
+               menuResources.mainMenuEquipmentText = "EQUIP";
+               menuResources.mainMenuStatusText = "STATUS";
+               menuResources.mainMenuChangeText = "CHANGE";
+               menuResources.mainMenuConfigText = "CONFIG";
+               menuResources.mainMenuScenarioText = "SCENARIO";
+
+               menuResources.mainMenuTimeText = "TIME";
+               menuResources.mainMenuGoldText = "GOLD";
+
+               graphics::Sprite heroCursor(IMG_Load("test-data/hero-cursor.png"), 64, 16);
+               menuResources.heroCursor = &heroCursor;
+               menuResources.heroCursorBlinkTime = 532;
+
+               menuResources.noEquipmentText = "No equip";
+
+               graphics::Sprite shoulderNav(IMG_Load("test-data/shoulder-nav.png"), 160, 16);
+               menuResources.shoulderNav = &shoulderNav;
+
+               menuResources.atpLabel = "ATP";
+               menuResources.dfpLabel = "DFP";
+               menuResources.strLabel = "STR";
+               menuResources.aglLabel = "AGL";
+               menuResources.intLabel = "INT";
+               menuResources.gutLabel = "GUT";
+               menuResources.mgrLabel = "MGR";
+
+               menuResources.ipLabel = "IP";
+               menuResources.experienceLabel = "NOW EXP";
+               menuResources.nextLevelLabel = "NEXT LEVEL";
+
+               graphics::MenuProperties statusMenuProperties;
+               statusMenuProperties.cols = 2;
+               statusMenuProperties.rows = 1;
+               statusMenuProperties.charsPerEntry = 6;
+               statusMenuProperties.rowGap = 0;
+               statusMenuProperties.colGap = 16;
+               statusMenuProperties.cursor = &menuCursor;
+               statusMenuProperties.font = &menuFont;
+               statusMenuProperties.wrapX = true;
+               menuResources.statusMenuProperties = &statusMenuProperties;
+
+               menuResources.nextLabel = "NEXT";
+               menuResources.returnLabel = "RETURN";
+
+               graphics::MenuProperties itemMenuProperties;
+               itemMenuProperties.cols = 3;
+               itemMenuProperties.rows = 1;
+               itemMenuProperties.charsPerEntry = 5;
+               itemMenuProperties.rowGap = 8;
+               itemMenuProperties.colGap = 16;
+               itemMenuProperties.cursor = &menuCursor;
+               itemMenuProperties.selectedCursor = &menuActiveCursor;
+               itemMenuProperties.font = &menuFont;
+               itemMenuProperties.wrapX = true;
+               itemMenuProperties.wrapY = true;
+               menuResources.itemMenuProperties = &itemMenuProperties;
+               menuResources.itemMenuUseText = "USE";
+               menuResources.itemMenuSortText = "SORT";
+               menuResources.itemMenuDropText = "DROP";
+
+               graphics::MenuProperties inventoryMenuProperties;
+               inventoryMenuProperties.cols = 1;
+               inventoryMenuProperties.rows = 6;
+               inventoryMenuProperties.charsPerEntry = 13;
+               inventoryMenuProperties.rowGap = 8;
+               inventoryMenuProperties.cursor = &menuCursor;
+               inventoryMenuProperties.selectedCursor = &menuActiveCursor;
+               inventoryMenuProperties.font = &menuFont;
+               inventoryMenuProperties.disabledFont = &menuInactiveFont;
+               inventoryMenuProperties.iconSpace = 16;
+               inventoryMenuProperties.charsPerNumber = 2;
+               inventoryMenuProperties.delimiter = ':';
+               menuResources.inventoryMenuProperties = &inventoryMenuProperties;
+
+               graphics::MenuProperties spellMenuProperties;
+               spellMenuProperties.cols = 2;
+               spellMenuProperties.rows = 6;
+               spellMenuProperties.charsPerEntry = 8;
+               spellMenuProperties.rowGap = 8;
+               spellMenuProperties.colGap = 48;
+               spellMenuProperties.cursor = &menuCursor;
+               spellMenuProperties.selectedCursor = &menuActiveCursor;
+               spellMenuProperties.font = &menuFont;
+               spellMenuProperties.disabledFont = &menuInactiveFont;
+               spellMenuProperties.iconSpace = 0;
+               spellMenuProperties.charsPerNumber = 2;
+               spellMenuProperties.delimiter = ':';
+               menuResources.spellMenuProperties = &spellMenuProperties;
+
+               graphics::MenuProperties equipmentActionMenuProperties;
+               equipmentActionMenuProperties.cols = 1;
+               equipmentActionMenuProperties.rows = 5;
+               equipmentActionMenuProperties.charsPerEntry = 10;
+               equipmentActionMenuProperties.rowGap = 8;
+               equipmentActionMenuProperties.cursor = &menuCursor;
+               equipmentActionMenuProperties.selectedCursor = &menuActiveCursor;
+               equipmentActionMenuProperties.font = &menuFont;
+               equipmentActionMenuProperties.iconSpace = 0;
+               menuResources.equipmentActionMenuProperties = &equipmentActionMenuProperties;
+
+               graphics::MenuProperties equipmentMenuProperties;
+               equipmentMenuProperties.cols = 1;
+               equipmentMenuProperties.rows = 6;
+               equipmentMenuProperties.charsPerEntry = 12;
+               equipmentMenuProperties.rowGap = 16;
+               equipmentMenuProperties.cursor = &menuCursor;
+               equipmentMenuProperties.selectedCursor = &menuActiveCursor;
+               equipmentMenuProperties.font = menuResources.statusFont;
+               equipmentMenuProperties.iconSpace = 16;
+               equipmentMenuProperties.wrapY = true;
+               menuResources.equipmentMenuProperties = &equipmentMenuProperties;
+
+               menuResources.equipMenuEquipLabel = "EQUIP";
+               menuResources.equipMenuStrongestLabel = "STRONGEST";
+               menuResources.equipMenuRemoveLabel = "REMOVE";
+               menuResources.equipMenuRemoveAllLabel = "REMOVE ALL";
+               menuResources.equipMenuDropLabel = "DROP";
+
+               graphics::MenuProperties configMenuProperties;
+               configMenuProperties.cols = 1;
+               configMenuProperties.rows = 4;
+               configMenuProperties.charsPerEntry = 8;
+               configMenuProperties.rowGap = 32;
+               configMenuProperties.cursor = &menuCursor;
+               configMenuProperties.font = &menuFont;
+               configMenuProperties.wrapY = true;
+               menuResources.configMenuProperties = &configMenuProperties;
+
+               menuResources.configMessageSpeedLabel = "MESSAGE\n   SPEED";
+               menuResources.configMessageSpeedFast = "FAST";
+               menuResources.configMessageSpeedNormal = "NORMAL";
+               menuResources.configMessageSpeedSlow = "SLOW";
+               menuResources.configBattleCursorLabel = "BATTLE\n  CURSOR";
+               menuResources.configStatusCursorLabel = "STATUS\n  CURSOR";
+               menuResources.configCursorClear = "CLEAR";
+               menuResources.configCursorMemory = "MEMORY";
+               menuResources.configMusicLabel = "MUSIC";
+               menuResources.configMusicStereo = "STEREO";
+               menuResources.configMusicMono = "MONO";
+
+               graphics::MenuProperties scenarioMenuProperties;
+               scenarioMenuProperties.cols = 1;
+               scenarioMenuProperties.rows = 6;
+               scenarioMenuProperties.charsPerEntry = 14;
+               scenarioMenuProperties.rowGap = 8;
+               scenarioMenuProperties.cursor = &menuCursor;
+               scenarioMenuProperties.font = &menuFont;
+               menuResources.scenarioMenuProperties = &scenarioMenuProperties;
+               menuResources.scenarioMenuHeadline = "SCENARIO ITEM";
 
                InitScreen screen(width, height);
 
-               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);
+               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->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);
@@ -208,12 +504,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;