X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=8f19f435bfa25c3335222094c0ff01342d5066d4;hb=f6f1391a8af068bda8821310fceb762da8c12d67;hp=a09f014c6a509ca588cd951efb7ce10ca8675907;hpb=428ae9a4a106e54f300e95544f78044b24b7e31a;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index a09f014..8f19f43 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,39 +6,67 @@
  */
 
 #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 "geometry/Point.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 "loader/TypeDescription.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 geometry::Point;
+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 loader::TypeDescription;
 using sdl::InitImage;
 using sdl::InitScreen;
 using sdl::InitSDL;
@@ -47,182 +75,152 @@ 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;
 
+//	std::srand(std::time(0));
+
 	try {
 		InitSDL sdl;
 		InitImage image(IMG_INIT_PNG);
-		InitScreen screen(width, height);
+
+		battle::Resources::CreateTypeDescription();
+		ComplexAnimation::CreateTypeDescription();
+		Font::CreateTypeDescription();
+		Frame::CreateTypeDescription();
+		Gauge::CreateTypeDescription();
+		Hero::CreateTypeDescription();
+		Ikari::CreateTypeDescription();
+		Interpreter::CreateTypeDescriptions();
+		Item::CreateTypeDescription();
+		graphics::MenuProperties::CreateTypeDescription();
+		Monster::CreateTypeDescription();
+		PartyLayout::CreateTypeDescription();
+		SimpleAnimation::CreateTypeDescription();
+		Spell::CreateTypeDescription();
+		Sprite::CreateTypeDescription();
+		Stats::CreateTypeDescription();
+		common::TargetingMode::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.DetectRunLevel()) {
+			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::PLAY:
+				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"));
 
 		// 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));
+		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")));
+
+		// 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")));
+
+		InitScreen screen(width, height);
+
+		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, battleRes));
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
@@ -247,6 +245,9 @@ int main(int argc, char **argv) {
 		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;