]> git.localhorst.tv Git - l2e.git/blobdiff - src/main.cpp
moved map data to maps.l2s
[l2e.git] / src / main.cpp
index 9d8e8d62650f1641d057dc434eb25895b858bf2e..40b38f1bb98dd6d3d3f71844cc428e66150aaff1 100644 (file)
@@ -6,17 +6,22 @@
  */
 
 #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 "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 "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::GameConfig;
+using common::GameState;
+using common::Hero;
 using common::Ikari;
 using common::Inventory;
 using common::Item;
+using common::Script;
 using common::Spell;
+using common::Stats;
 using geometry::Vector;
 using graphics::ComplexAnimation;
 using graphics::Font;
@@ -58,9 +77,17 @@ 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 map::Trigger;
 using sdl::InitImage;
 using sdl::InitScreen;
 using sdl::InitSDL;
@@ -69,104 +96,221 @@ 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 float walkSpeed = 128.0f;
+
+       bool battle(false);
+
 //     std::srand(std::time(0));
 
        try {
                InitSDL sdl;
                InitImage image(IMG_INIT_PNG);
 
+               Area::CreateTypeDescription();
+               battle::Resources::CreateTypeDescription();
+               ComplexAnimation::CreateTypeDescription();
+               Font::CreateTypeDescription();
+               Frame::CreateTypeDescription();
+               Gauge::CreateTypeDescription();
+               Hero::CreateTypeDescription();
+               Ikari::CreateTypeDescription();
+               Interpreter::CreateTypeDescriptions();
+               Item::CreateTypeDescription();
+               Map::CreateTypeDescription();
+               graphics::MenuProperties::CreateTypeDescription();
+               Monster::CreateTypeDescription();
+               PartyLayout::CreateTypeDescription();
+               SimpleAnimation::CreateTypeDescription();
+               Spell::CreateTypeDescription();
+               Sprite::CreateTypeDescription();
+               Stats::CreateTypeDescription();
+               common::TargetingMode::CreateTypeDescription();
+               Tile::CreateTypeDescription();
+               Trigger::CreateTypeDescription();
+               Entity::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.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();
 
-               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);
+
+               {
+                       Map *map1(caster.GetMap("map1"));
+                       Map *map2(caster.GetMap("map2"));
+                       std::cout << map1 << ' ' << map2 << std::endl;
+               }
+
+               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];
+
+               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(*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(intp.GetBattleResources("battleResources"));
-
-               maxim.AddSpell(intp.GetSpell("resetSpell"));
-               Spell *strongSpell(intp.GetSpell("strongSpell"));
-               maxim.AddSpell(strongSpell);
-               selan.AddSpell(strongSpell);
-               Spell *strongerSpell(intp.GetSpell("strongerSpell"));
-               maxim.AddSpell(strongerSpell);
-               selan.AddSpell(strongerSpell);
-               Spell *championSpell(intp.GetSpell("championSpell"));
-               maxim.AddSpell(championSpell);
-               selan.AddSpell(championSpell);
-               Spell *rallySpell(intp.GetSpell("rallySpell"));
-               maxim.AddSpell(rallySpell);
-               selan.AddSpell(rallySpell);
-               selan.AddSpell(intp.GetSpell("escapeSpell"));
-               Spell *valorSpell(intp.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);
-               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"));
+               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("antidoteItem"), 9);
+               gameState.inventory.Add(caster.GetItem("magicJarItem"), 4);
+               gameState.inventory.Add(caster.GetItem("hiPotionItem"), 4);
+               gameState.inventory.Add(caster.GetItem("powerPotionItem"), 4);
+               gameState.inventory.Add(caster.GetItem("escapeItem"), 2);
+               gameState.inventory.Add(caster.GetItem("sleepBallItem"), 1);
+
+               gameState.heroes[0].SetWeapon(caster.GetItem("zircoSwordItem"));
+               gameState.heroes[0].SetArmor(caster.GetItem("zirconArmorItem"));
+               gameState.heroes[0].SetShield(caster.GetItem("holyShieldItem"));
+               gameState.heroes[0].SetHelmet(caster.GetItem("legendHelmItem"));
+               gameState.heroes[0].SetRing(caster.GetItem("sProRingItem"));
+               gameState.heroes[0].SetJewel(caster.GetItem("evilJewelItem"));
+
+//             gameState.heroes[1].SetWeapon(cst.GetItem("zircoWhipItem"));
+               gameState.heroes[1].SetArmor(caster.GetItem("zirconPlateItem"));
+               gameState.heroes[1].SetShield(caster.GetItem("zircoGlovesItem"));
+               gameState.heroes[1].SetHelmet(caster.GetItem("holyCapItem"));
+               gameState.heroes[1].SetRing(caster.GetItem("ghostRingItem"));
+               gameState.heroes[1].SetJewel(caster.GetItem("eagleRockItem"));
+
+//             gameState.heroes[2].SetWeapon(cst.GetItem("zircoAxItem"));
+               gameState.heroes[2].SetArmor(caster.GetItem("zirconArmorItem"));
+               gameState.heroes[2].SetShield(caster.GetItem("megaShieldItem"));
+               gameState.heroes[2].SetHelmet(caster.GetItem("zircoHelmetItem"));
+               gameState.heroes[2].SetRing(caster.GetItem("powerRingItem"));
+               gameState.heroes[2].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);
+//             gameState.heroes[3].SetWeapon(cst.GetItem("lizardBlowItem"));
+               gameState.heroes[3].SetArmor(caster.GetItem("holyRobeItem"));
+               gameState.heroes[3].SetShield(caster.GetItem("zircoGlovesItem"));
+               gameState.heroes[3].SetHelmet(caster.GetItem("holyCapItem"));
+               gameState.heroes[3].SetRing(caster.GetItem("rocketRingItem"));
+               gameState.heroes[3].SetJewel(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());
+
+               InitScreen screen(width, height);
+
+               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);
@@ -179,12 +323,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;