X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=ab02016cff4d67511af6f986f595067c58dfd875;hb=f6085f8568f2c754ed2eac294171e542139581f4;hp=6bce28f0efe5d5e9eee4dbc044f0d6567c0139f9;hpb=867fd5d9b79c3b9c1d0fb17ba9f55cfe971b93d5;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 6bce28f..965da00 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,27 +6,70 @@
  */
 
 #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 "geometry/Point.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/Caster.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::Caster;
+using loader::Interpreter;
+using loader::ParsedSource;
+using loader::Parser;
+using loader::TypeDescription;
+using sdl::InitImage;
 using sdl::InitScreen;
 using sdl::InitSDL;
 
@@ -34,51 +77,162 @@ 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;
 
-	// temporary test data
-	SDL_Surface *bg(SDL_CreateRGBSurface(0, width, height, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF));
-	SDL_FillRect(bg, 0, SDL_MapRGB(bg->format, 0xFF, 0xFF, 0xFF));
-	SDL_Rect r;
-	r.x = 1;
-	r.y = 1;
-	r.w = width - 2;
-	r.h = height - 2;
-	SDL_FillRect(bg, &r, SDL_MapRGB(bg->format, 0, 0, 0));
-	PartyLayout monstersLayout;
-	monstersLayout.AddPosition(Point<Uint8>(50, 100));
-	monstersLayout.AddPosition(Point<Uint8>(100, 100));
-	monstersLayout.AddPosition(Point<Uint8>(150, 100));
-	monstersLayout.AddPosition(Point<Uint8>(200, 100));
-	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 *white96(SDL_CreateRGBSurface(0, 96, 96, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF));
-	SDL_FillRect(white96, 0, SDL_MapRGB(bg->format, 0xFF, 0xFF, 0xFF));
-	Sprite dummySprite(white96, 96, 96);
-	Monster monster;
-	monster.SetSprite(&dummySprite);
-	Hero hero;
-	hero.SetSprite(&dummySprite);
+//	std::srand(std::time(0));
 
 	try {
 		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();
+		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();
+
+		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);
+
+		// temporary test data
+		SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
+		PartyLayout monstersLayout(*caster.GetPartyLayout("monstersLayout"));
+		PartyLayout heroesLayout(*caster.GetPartyLayout("heroesLayout"));
+
+		Monster monster(*caster.GetMonster("lizard"));
+		Hero maxim(*caster.GetHero("maxim"));
+		Hero selan(*caster.GetHero("selan"));
+		Hero guy(*caster.GetHero("guy"));
+		Hero dekar(*caster.GetHero("dekar"));
+
+		battle::Resources *battleRes(caster.GetBattleResources("battleResources"));
+
+		maxim.AddSpell(caster.GetSpell("resetSpell"));
+		Spell *strongSpell(caster.GetSpell("strongSpell"));
+		maxim.AddSpell(strongSpell);
+		selan.AddSpell(strongSpell);
+		Spell *strongerSpell(caster.GetSpell("strongerSpell"));
+		maxim.AddSpell(strongerSpell);
+		selan.AddSpell(strongerSpell);
+		Spell *championSpell(caster.GetSpell("championSpell"));
+		maxim.AddSpell(championSpell);
+		selan.AddSpell(championSpell);
+		Spell *rallySpell(caster.GetSpell("rallySpell"));
+		maxim.AddSpell(rallySpell);
+		selan.AddSpell(rallySpell);
+		selan.AddSpell(caster.GetSpell("escapeSpell"));
+		Spell *valorSpell(caster.GetSpell("valorSpell"));
+		maxim.AddSpell(valorSpell);
+		selan.AddSpell(valorSpell);
+
+		Inventory inventory;
+		inventory.Add(caster.GetItem("antidoteItem"), 9);
+		inventory.Add(caster.GetItem("magicJarItem"), 4);
+		inventory.Add(caster.GetItem("hiPotionItem"), 4);
+		inventory.Add(caster.GetItem("powerPotionItem"), 4);
+		inventory.Add(caster.GetItem("escapeItem"), 2);
+		inventory.Add(caster.GetItem("sleepBallItem"), 1);
+		battleRes->inventory = &inventory;
+
+		maxim.SetWeapon(caster.GetItem("zircoSwordItem"));
+		maxim.SetArmor(caster.GetItem("zirconArmorItem"));
+		maxim.SetShield(caster.GetItem("holyShieldItem"));
+		maxim.SetHelmet(caster.GetItem("legendHelmItem"));
+		maxim.SetRing(caster.GetItem("sProRingItem"));
+		maxim.SetJewel(caster.GetItem("evilJewelItem"));
+
+//		selan.SetWeapon(cst.GetItem("zircoWhipItem"));
+		selan.SetArmor(caster.GetItem("zirconPlateItem"));
+		selan.SetShield(caster.GetItem("zircoGlovesItem"));
+		selan.SetHelmet(caster.GetItem("holyCapItem"));
+		selan.SetRing(caster.GetItem("ghostRingItem"));
+		selan.SetJewel(caster.GetItem("eagleRockItem"));
+
+//		guy.SetWeapon(cst.GetItem("zircoAxItem"));
+		guy.SetArmor(caster.GetItem("zirconArmorItem"));
+		guy.SetShield(caster.GetItem("megaShieldItem"));
+		guy.SetHelmet(caster.GetItem("zircoHelmetItem"));
+		guy.SetRing(caster.GetItem("powerRingItem"));
+		guy.SetJewel(caster.GetItem("evilJewelItem"));
+
+		// NOTE: this is actually Artea equipment
+//		dekar.SetWeapon(cst.GetItem("lizardBlowItem"));
+		dekar.SetArmor(caster.GetItem("holyRobeItem"));
+		dekar.SetShield(caster.GetItem("zircoGlovesItem"));
+		dekar.SetHelmet(caster.GetItem("holyCapItem"));
+		dekar.SetRing(caster.GetItem("rocketRingItem"));
+		dekar.SetJewel(caster.GetItem("krakenRockItem"));
+
 		InitScreen screen(width, height);
 
-		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout));
+		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, battleRes));
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
-		battleState->AddHero(hero);
-		battleState->AddHero(hero);
-		battleState->AddHero(hero);
-		battleState->AddHero(hero);
+		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);
@@ -95,6 +249,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 2;
 	} catch (exception &e) {
 		cerr << "exception in main(): " << e.what() << endl;
 		return 1;