X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=f6a069c2331eb73a695de2a7f1a3a87c858b4243;hb=350233c2834eb36e66220aba490f1876bd6b19bf;hp=9d8e8d62650f1641d057dc434eb25895b858bf2e;hpb=953e7c370a2f955d2aaf9b41a3e9cc3a4911c852;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 9d8e8d6..f6a069c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "app/Application.h"
+#include "app/Arguments.h"
 #include "app/Input.h"
 #include "battle/BattleState.h"
 #include "battle/Hero.h"
@@ -25,21 +26,31 @@
 #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 "map/Area.h"
+#include "map/Entity.h"
+#include "map/Map.h"
+#include "map/MapState.h"
+#include "map/Tile.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;
@@ -58,9 +69,16 @@ 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 map::Area;
+using map::Entity;
+using map::Map;
+using map::MapState;
+using map::Tile;
 using sdl::InitImage;
 using sdl::InitScreen;
 using sdl::InitSDL;
@@ -69,104 +87,268 @@ 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 bool battle(false);
+
 //	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;
-		Parser parser("test-data/test.l2s", source);
-		parser.Parse();
+
+		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();
 
-		InitScreen screen(width, height);
+		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(*intp.GetPartyLayout("monstersLayout"));
-		PartyLayout heroesLayout(*intp.GetPartyLayout("heroesLayout"));
+		PartyLayout monstersLayout(*caster.GetPartyLayout("monstersLayout"));
+		PartyLayout heroesLayout(*caster.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"));
+		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(intp.GetBattleResources("battleResources"));
+		battle::Resources *battleRes(caster.GetBattleResources("battleResources"));
 
-		maxim.AddSpell(intp.GetSpell("resetSpell"));
-		Spell *strongSpell(intp.GetSpell("strongSpell"));
+		maxim.AddSpell(caster.GetSpell("resetSpell"));
+		Spell *strongSpell(caster.GetSpell("strongSpell"));
 		maxim.AddSpell(strongSpell);
 		selan.AddSpell(strongSpell);
-		Spell *strongerSpell(intp.GetSpell("strongerSpell"));
+		Spell *strongerSpell(caster.GetSpell("strongerSpell"));
 		maxim.AddSpell(strongerSpell);
 		selan.AddSpell(strongerSpell);
-		Spell *championSpell(intp.GetSpell("championSpell"));
+		Spell *championSpell(caster.GetSpell("championSpell"));
 		maxim.AddSpell(championSpell);
 		selan.AddSpell(championSpell);
-		Spell *rallySpell(intp.GetSpell("rallySpell"));
+		Spell *rallySpell(caster.GetSpell("rallySpell"));
 		maxim.AddSpell(rallySpell);
 		selan.AddSpell(rallySpell);
-		selan.AddSpell(intp.GetSpell("escapeSpell"));
-		Spell *valorSpell(intp.GetSpell("valorSpell"));
+		selan.AddSpell(caster.GetSpell("escapeSpell"));
+		Spell *valorSpell(caster.GetSpell("valorSpell"));
 		maxim.AddSpell(valorSpell);
 		selan.AddSpell(valorSpell);
 
 		Inventory inventory;
-		inventory.Add(intp.GetItem("antidoteItem"), 9);
-		inventory.Add(intp.GetItem("magicJarItem"), 4);
-		inventory.Add(intp.GetItem("hiPotionItem"), 4);
-		inventory.Add(intp.GetItem("powerPotionItem"), 4);
-		inventory.Add(intp.GetItem("escapeItem"), 2);
-		inventory.Add(intp.GetItem("sleepBallItem"), 1);
+		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(intp.GetItem("zircoSwordItem"));
-		maxim.SetArmor(intp.GetItem("zirconArmorItem"));
-		maxim.SetShield(intp.GetItem("holyShieldItem"));
-		maxim.SetHelmet(intp.GetItem("legendHelmItem"));
-		maxim.SetRing(intp.GetItem("sProRingItem"));
-		maxim.SetJewel(intp.GetItem("evilJewelItem"));
-
-//		selan.SetWeapon(intp.GetItem("zircoWhipItem"));
-		selan.SetArmor(intp.GetItem("zirconPlateItem"));
-		selan.SetShield(intp.GetItem("zircoGlovesItem"));
-		selan.SetHelmet(intp.GetItem("holyCapItem"));
-		selan.SetRing(intp.GetItem("ghostRingItem"));
-		selan.SetJewel(intp.GetItem("eagleRockItem"));
-
-//		guy.SetWeapon(intp.GetItem("zircoAxItem"));
-		guy.SetArmor(intp.GetItem("zirconArmorItem"));
-		guy.SetShield(intp.GetItem("megaShieldItem"));
-		guy.SetHelmet(intp.GetItem("zircoHelmetItem"));
-		guy.SetRing(intp.GetItem("powerRingItem"));
-		guy.SetJewel(intp.GetItem("evilJewelItem"));
+		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(intp.GetItem("lizardBlowItem"));
-		dekar.SetArmor(intp.GetItem("holyRobeItem"));
-		dekar.SetShield(intp.GetItem("zircoGlovesItem"));
-		dekar.SetHelmet(intp.GetItem("holyCapItem"));
-		dekar.SetRing(intp.GetItem("rocketRingItem"));
-		dekar.SetJewel(intp.GetItem("krakenRockItem"));
-
-		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);
+//		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"));
+
+		Tile tiles[64];
+
+		tiles[ 0].SetOffset(Vector<int>(2, 1));
+		tiles[ 1].SetOffset(Vector<int>(4, 0));
+		tiles[ 2].SetOffset(Vector<int>(3, 0));
+		tiles[ 3].SetOffset(Vector<int>(3, 0));
+		tiles[ 4].SetOffset(Vector<int>(0, 1));
+		tiles[ 5].SetOffset(Vector<int>(2, 0));
+		tiles[ 6].SetOffset(Vector<int>(2, 0));
+		tiles[ 7].SetOffset(Vector<int>(2, 0));
+
+		tiles[ 8].SetOffset(Vector<int>(2, 1));
+		tiles[ 9].SetOffset(Vector<int>(4, 0));
+		tiles[10].SetOffset(Vector<int>(3, 0));
+		tiles[11].SetOffset(Vector<int>(3, 0));
+		tiles[12].SetOffset(Vector<int>(0, 2));
+		tiles[13].SetOffset(Vector<int>(1, 2));
+		tiles[14].SetOffset(Vector<int>(1, 2));
+		tiles[15].SetOffset(Vector<int>(1, 2));
+
+		tiles[16].SetOffset(Vector<int>(2, 1));
+		tiles[17].SetOffset(Vector<int>(4, 0));
+		tiles[18].SetOffset(Vector<int>(3, 0));
+		tiles[19].SetOffset(Vector<int>(3, 0));
+		tiles[20].SetOffset(Vector<int>(0, 3));
+		tiles[21].SetOffset(Vector<int>(1, 3));
+		tiles[22].SetOffset(Vector<int>(1, 3));
+		tiles[23].SetOffset(Vector<int>(2, 3));
+
+		tiles[24].SetOffset(Vector<int>(2, 1));
+		tiles[25].SetOffset(Vector<int>(4, 0));
+		tiles[26].SetOffset(Vector<int>(3, 0));
+		tiles[27].SetOffset(Vector<int>(3, 0));
+		tiles[28].SetOffset(Vector<int>(0, 4));
+		tiles[29].SetOffset(Vector<int>(1, 4));
+		tiles[30].SetOffset(Vector<int>(1, 4));
+		tiles[31].SetOffset(Vector<int>(2, 4));
+
+		tiles[32].SetOffset(Vector<int>(2, 1));
+		tiles[33].SetOffset(Vector<int>(4, 0));
+		tiles[34].SetOffset(Vector<int>(3, 0));
+		tiles[35].SetOffset(Vector<int>(3, 0));
+		tiles[36].SetOffset(Vector<int>(3, 0));
+		tiles[37].SetOffset(Vector<int>(3, 0));
+		tiles[38].SetOffset(Vector<int>(3, 0));
+		tiles[39].SetOffset(Vector<int>(3, 0));
+
+		tiles[40].SetOffset(Vector<int>(2, 1));
+		tiles[41].SetOffset(Vector<int>(4, 0));
+		tiles[42].SetOffset(Vector<int>(3, 0));
+		tiles[43].SetOffset(Vector<int>(3, 0));
+		tiles[44].SetOffset(Vector<int>(3, 0));
+		tiles[45].SetOffset(Vector<int>(4, 0));
+		tiles[46].SetOffset(Vector<int>(4, 0));
+		tiles[47].SetOffset(Vector<int>(4, 0));
+
+		tiles[48].SetOffset(Vector<int>(2, 1));
+		tiles[49].SetOffset(Vector<int>(4, 0));
+		tiles[50].SetOffset(Vector<int>(3, 0));
+		tiles[51].SetOffset(Vector<int>(3, 0));
+		tiles[52].SetOffset(Vector<int>(0, 0));
+		tiles[53].SetOffset(Vector<int>(1, 0));
+		tiles[54].SetOffset(Vector<int>(1, 0));
+		tiles[55].SetOffset(Vector<int>(1, 0));
+
+		tiles[56].SetOffset(Vector<int>(2, 1));
+		tiles[57].SetOffset(Vector<int>(4, 0));
+		tiles[58].SetOffset(Vector<int>(3, 0));
+		tiles[59].SetOffset(Vector<int>(3, 0));
+		tiles[60].SetOffset(Vector<int>(0, 1));
+		tiles[61].SetOffset(Vector<int>(1, 1));
+		tiles[62].SetOffset(Vector<int>(1, 1));
+		tiles[63].SetOffset(Vector<int>(1, 1));
+
+		Area area;
+		area.SetTiles(tiles, 64);
+		area.SetWidth(8);
+
+		SDL_Surface *tilesetImg(IMG_Load("test-data/tileset.png"));
+		Sprite tileset(tilesetImg, 32, 32);
+
+		Map map;
+		map.SetAreas(&area, 1);
+		map.SetTileset(&tileset);
+		map.SetWidth(1);
+
+		SDL_Surface *mapMaximImg(IMG_Load("test-data/maxim-map.png"));
+		Sprite mapMaximSprite(mapMaximImg, 32, 64);
+		Entity mapMaxim;
+		mapMaxim.SetSprite(&mapMaximSprite);
+		mapMaxim.Position() = Vector<float>(80, 160);
+
+		InitScreen screen(width, height);
+
+		app::State *state(0);
+
+		if (battle) {
+			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);
+			state = battleState;
+		} else {
+			MapState *mapState(new MapState(&map));
+			mapState->AddEntity(&mapMaxim);
+			mapState->ControlEntity(&mapMaxim);
+			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);
@@ -184,7 +366,7 @@ int main(int argc, char **argv) {
 		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;