X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=793a76fa6f8b1c9e0b33690f2f772f28cfc4fc06;hb=fc8a43f3745e7f3808e29b90a2fa9a958ecaf29b;hp=f971d46e3ac9586c9dad4411d2a01aa4ebee7b6e;hpb=06b6411e5dc8fc6b905530f7adbde8bd0c2bb0ea;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index f971d46..793a76f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -13,6 +13,7 @@ #include "battle/Monster.h" #include "battle/PartyLayout.h" #include "battle/Resources.h" +#include "common/GameState.h" #include "common/Hero.h" #include "common/Ikari.h" #include "common/Inventory.h" @@ -57,6 +58,7 @@ using app::Input; using battle::BattleState; using battle::Monster; using battle::PartyLayout; +using common::GameState; using common::Hero; using common::Ikari; using common::Inventory; @@ -100,7 +102,7 @@ int main(int argc, char **argv) { const int tileSize = 32; const float walkSpeed = 128.0f; - const bool battle(false); + bool battle(false); // std::srand(std::time(0)); @@ -125,6 +127,7 @@ int main(int argc, char **argv) { Sprite::CreateTypeDescription(); Stats::CreateTypeDescription(); common::TargetingMode::CreateTypeDescription(); + Entity::CreateTypeDescription(); Arguments args; args.Read(argc, argv); @@ -135,7 +138,7 @@ int main(int argc, char **argv) { Parser(*i, source).Parse(); } - switch (args.DetectRunLevel()) { + switch (args.GetRunLevel()) { case Arguments::WRITE: { int length(std::strlen(args.OutfilePath())); @@ -155,7 +158,15 @@ int main(int argc, char **argv) { 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; } @@ -171,36 +182,44 @@ int main(int argc, char **argv) { Caster caster(intp); + 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]; + // 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")); + gameState.heroes[0].AddSpell(caster.GetSpell("resetSpell")); Spell *strongSpell(caster.GetSpell("strongSpell")); - maxim.AddSpell(strongSpell); - selan.AddSpell(strongSpell); + gameState.heroes[0].AddSpell(strongSpell); + gameState.heroes[1].AddSpell(strongSpell); Spell *strongerSpell(caster.GetSpell("strongerSpell")); - maxim.AddSpell(strongerSpell); - selan.AddSpell(strongerSpell); + gameState.heroes[0].AddSpell(strongerSpell); + gameState.heroes[1].AddSpell(strongerSpell); Spell *championSpell(caster.GetSpell("championSpell")); - maxim.AddSpell(championSpell); - selan.AddSpell(championSpell); + gameState.heroes[0].AddSpell(championSpell); + gameState.heroes[1].AddSpell(championSpell); Spell *rallySpell(caster.GetSpell("rallySpell")); - maxim.AddSpell(rallySpell); - selan.AddSpell(rallySpell); - selan.AddSpell(caster.GetSpell("escapeSpell")); + gameState.heroes[0].AddSpell(rallySpell); + gameState.heroes[1].AddSpell(rallySpell); + gameState.heroes[1].AddSpell(caster.GetSpell("escapeSpell")); Spell *valorSpell(caster.GetSpell("valorSpell")); - maxim.AddSpell(valorSpell); - selan.AddSpell(valorSpell); + gameState.heroes[0].AddSpell(valorSpell); + gameState.heroes[1].AddSpell(valorSpell); Inventory inventory; inventory.Add(caster.GetItem("antidoteItem"), 9); @@ -211,34 +230,34 @@ int main(int argc, char **argv) { 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")); + 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(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")); +// 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")); Tile tiles1[64]; @@ -499,43 +518,19 @@ int main(int argc, char **argv) { triggers2[0].map = &map1; triggers2[0].target = Vector(8, 3); - SDL_Surface *mapMaximImg(IMG_Load("test-data/maxim-map.png")); - Sprite mapMaximSprite(mapMaximImg, 32, 64); - SimpleAnimation mapMaximAnimation(&mapMaximSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true); - Entity mapMaxim; - mapMaxim.SetAnimation(&mapMaximAnimation); - mapMaxim.Position() = Vector(64, 128); - mapMaxim.SpriteOffset() = Vector(0, -32); - - SDL_Surface *mapSelanImg(IMG_Load("test-data/selan-map.png")); - Sprite mapSelanSprite(mapSelanImg, 32, 64); - SimpleAnimation mapSelanAnimation(&mapSelanSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true); - Entity mapSelan; - mapSelan.SetAnimation(&mapSelanAnimation); - mapSelan.Position() = Vector(64, 128); - mapSelan.SpriteOffset() = Vector(0, -32); - mapSelan.SetFlags(Entity::FLAG_NONBLOCKING); - mapMaxim.AddFollower(&mapSelan); - - SDL_Surface *mapGuyImg(IMG_Load("test-data/guy-map.png")); - Sprite mapGuySprite(mapGuyImg, 32, 64); - SimpleAnimation mapGuyAnimation(&mapGuySprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true); - Entity mapGuy; - mapGuy.SetAnimation(&mapGuyAnimation); - mapGuy.Position() = Vector(64, 128); - mapGuy.SpriteOffset() = Vector(0, -32); - mapGuy.SetFlags(Entity::FLAG_NONBLOCKING); - mapSelan.AddFollower(&mapGuy); - - SDL_Surface *mapDekarImg(IMG_Load("test-data/dekar-map.png")); - Sprite mapDekarSprite(mapDekarImg, 32, 64); - SimpleAnimation mapDekarAnimation(&mapDekarSprite, (tileSize/walkSpeed) / 2 * 1000, 2, 0, 0, true); - Entity mapDekar; - mapDekar.SetAnimation(&mapDekarAnimation); - mapDekar.Position() = Vector(64, 128); - mapDekar.SpriteOffset() = Vector(0, -32); - mapDekar.SetFlags(Entity::FLAG_NONBLOCKING); - mapGuy.AddFollower(&mapDekar); + gameState.heroes[0].MapEntity().Position() = Vector(64, 128); + + gameState.heroes[1].MapEntity().Position() = Vector(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(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(64, 128); + gameState.heroes[3].MapEntity().SetFlags(Entity::FLAG_NONBLOCKING); + gameState.heroes[2].MapEntity().AddFollower(&gameState.heroes[3].MapEntity()); SDL_Surface *mapMonsterImg(IMG_Load("test-data/monster-map.png")); Sprite mapMonsterSprite(mapMonsterImg, 32, 32); @@ -556,15 +551,15 @@ int main(int argc, char **argv) { battleState->AddMonster(monster); battleState->AddMonster(monster); battleState->AddMonster(monster); - battleState->AddHero(maxim); - battleState->AddHero(selan); - battleState->AddHero(guy); - battleState->AddHero(dekar); + 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(&map1)); - mapState->ControlEntity(&mapMaxim); + mapState->ControlEntity(&gameState.heroes[0].MapEntity()); mapState->SetWalkingSpeed(walkSpeed); mapMonster.StartAnimation(*mapState);