X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=e1969307c93ff83dff5c88adfda6f2066c1e0e2d;hb=8f54789ae7d974035b9103982c38e1714a15728b;hp=780b8c27b70c85e004d77d45e0a1a3b6e8358971;hpb=5ef75aee810e5a687fae24e3f95886241e36efda;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 780b8c2..e196930 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,15 +6,62 @@
  */
 
 #include "app/Application.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/Ikari.h"
+#include "common/Inventory.h"
+#include "common/Item.h"
+#include "common/Spell.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 "loader/Interpreter.h"
+#include "loader/ParsedSource.h"
+#include "loader/Parser.h"
+#include "sdl/InitImage.h"
 #include "sdl/InitScreen.h"
 #include "sdl/InitSDL.h"
 
+#include <cstdlib>
+#include <ctime>
 #include <exception>
 #include <iostream>
+#include <SDL.h>
+#include <SDL_image.h>
 
 using app::Application;
+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::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 loader::Interpreter;
+using loader::ParsedSource;
+using loader::Parser;
+using sdl::InitImage;
 using sdl::InitScreen;
 using sdl::InitSDL;
 
@@ -27,18 +74,465 @@ int main(int argc, char **argv) {
 	const int width = 800;
 	const int height = 480;
 
-	// temporary
-	SDL_Surface *bg(SDL_CreateRGBSurface(0, width, height, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF));
-	SDL_FillRect(bg, 0, SDL_MapRGB(bg->format, 0, 0, 0));
+	const int framerate = 33;
+
+//	std::srand(std::time(0));
 
 	try {
 		InitSDL sdl;
+		InitImage image(IMG_INIT_PNG);
+
+		ParsedSource source;
+		Parser parser("test-data/test.l2s", source);
+		parser.Parse();
+		Interpreter intp(source);
+		intp.ReadSource();
+
 		InitScreen screen(width, height);
 
-		Application app(screen.Screen(), new BattleState(bg));
+		// temporary test data
+		SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
+		PartyLayout monstersLayout(*intp.GetPartyLayout("monstersLayout"));
+		PartyLayout heroesLayout(*intp.GetPartyLayout("heroesLayout"));
+
+		Monster monster(*intp.GetMonster("lizard"));
+		Hero maxim(*intp.GetHero("maxim"));
+		Hero selan(*intp.GetHero("selan"));
+		Hero guy(*intp.GetHero("guy"));
+		Hero dekar(*intp.GetHero("dekar"));
+
+		battle::Resources battleRes;
+
+		battleRes.swapCursor = intp.GetSprite("swapCursor");
+		battleRes.attackIcons = intp.GetSprite("attackIcons");
+		battleRes.attackChoiceIcons = intp.GetSprite("attackChoiceIcons");
+		battleRes.moveIcons = intp.GetSprite("moveIcons");
+		battleRes.titleFrame = intp.GetFrame("titleFrame");
+		battleRes.titleFont = intp.GetFont("largeFont");
+		battleRes.numberAnimationPrototype = intp.GetAnimation("numberAnimationPrototype");
+		battleRes.bigNumberSprite = intp.GetSprite("bigNumbers");
+		battleRes.greenNumberSprite = intp.GetSprite("bigGreenNumbers");
+
+		battleRes.heroTagLabels = intp.GetSprite("heroTagLabels");
+		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;
+
+		battleRes.heroTagFont = intp.GetFont("heroTagFont");
+		battleRes.heroTagFrame = intp.GetFrame("heroTagFrame");
+		battleRes.activeHeroTagFrame = intp.GetFrame("activeHeroTagFrame");
+		battleRes.smallHeroTagFrame = intp.GetFrame("smallHeroTagFrame");
+		battleRes.lastSmallHeroTagFrame = intp.GetFrame("lastSmallHeroTagFrame");
+		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);
+
+		// 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);
+		app.Buttons().MapKey(SDLK_w, Input::PAD_UP);
+		app.Buttons().MapKey(SDLK_d, Input::PAD_RIGHT);
+		app.Buttons().MapKey(SDLK_s, Input::PAD_DOWN);
+		app.Buttons().MapKey(SDLK_a, Input::PAD_LEFT);
+		app.Buttons().MapKey(SDLK_RIGHT, Input::ACTION_A);
+		app.Buttons().MapKey(SDLK_DOWN, Input::ACTION_B);
+		app.Buttons().MapKey(SDLK_UP, Input::ACTION_X);
+		app.Buttons().MapKey(SDLK_LEFT, Input::ACTION_Y);
+		app.Buttons().MapKey(SDLK_RETURN, Input::START);
+		app.Buttons().MapKey(SDLK_SPACE, Input::SELECT);
+		app.Buttons().MapKey(SDLK_RSHIFT, Input::SHOULDER_RIGHT);
+		app.Buttons().MapKey(SDLK_LSHIFT, Input::SHOULDER_LEFT);
 		app.Run();
 
 		return 0;
+	} catch (Parser::Error &e) {
+		cerr << "parsing exception in file " << e.File() << " on line " << e.Line() << ": " << e.what() << endl;
+		return 1;
 	} catch (exception &e) {
 		cerr << "exception in main(): " << e.what() << endl;
 		return 1;