X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=90f08d53bed888b629406ef15b248de497511e64;hb=dbf125bd2ef4f68af92aa0872e8d8a6abaf4ee00;hp=935d4519f46ed1dd52882f217f062cb66e315045;hpb=1ad6b01c2cac5f771fcef0911c6d81230e50d0ed;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 935d451..90f08d5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -85,7 +85,6 @@ int main(int argc, char **argv) {
 		ParsedSource source;
 		Parser parser("test-data/test.l2s", source);
 		parser.Parse();
-		cout << source;
 		Interpreter intp(source);
 		intp.ReadSource();
 
@@ -93,82 +92,14 @@ int main(int argc, char **argv) {
 
 		// temporary test data
 		SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
-		PartyLayout monstersLayout;
-		monstersLayout.AddPosition(Vector<Uint8>(88, 88));
-		monstersLayout.AddPosition(Vector<Uint8>(128, 88));
-		monstersLayout.AddPosition(Vector<Uint8>(168, 88));
-		monstersLayout.AddPosition(Vector<Uint8>(208, 88));
-		PartyLayout heroesLayout;
-		heroesLayout.AddPosition(Vector<Uint8>(48, 136));
-		heroesLayout.AddPosition(Vector<Uint8>(128, 136));
-		heroesLayout.AddPosition(Vector<Uint8>(80, 152));
-		heroesLayout.AddPosition(Vector<Uint8>(160, 152));
+		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"));
-
-		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);
-		guy.SetStats(Stats(38, 25, 38, 13, 8, 90, 8));
-		ComplexAnimation guyAttackAnimation(&guySprite, framerate);
-		guyAttackAnimation.AddFrames(1, 0, Vector<int>(-4, 0), 2);
-		guyAttackAnimation.AddFrames(1, 0, Vector<int>(-8, 0), 2);
-		guyAttackAnimation.AddFrames(2, 0, Vector<int>(-8, 0), 2);
-		guyAttackAnimation.AddFrame(2, 0, Vector<int>(-4, 0));
-		guyAttackAnimation.AddFrames(2, 0, Vector<int>(), 2);
-		guyAttackAnimation.AddFrame(2, 1);
-		guyAttackAnimation.AddFrame(2, 1, Vector<int>(4, 0));
-		guyAttackAnimation.AddFrame(2, 1, Vector<int>(10, 0));
-		guyAttackAnimation.AddFrame(2, 2, Vector<int>(10, 0));
-		guyAttackAnimation.AddFrame(2, 2);
-		guy.SetAttackAnimation(&guyAttackAnimation);
-		SDL_Surface *guyMeleeImg(IMG_Load("test-data/melee-guy.png"));
-		Sprite guyMeleeSprite(guyMeleeImg, 96, 96);
-		SimpleAnimation guyMeleeAnimation(&guyMeleeSprite, 2 * framerate, 4);
-		guy.SetMeleeAnimation(&guyMeleeAnimation);
-
-		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);
-		dekar.SetStats(Stats(46, 29, 46, 13, 7, 100, 5));
-		ComplexAnimation dekarAttackAnimation(&dekarSprite, framerate);
-		dekarAttackAnimation.AddFrame(1, 0, Vector<int>(4, 0));
-		dekarAttackAnimation.AddFrame(1, 0, Vector<int>(8, 2));
-		dekarAttackAnimation.AddFrame(2, 0, Vector<int>(12, 4));
-		dekarAttackAnimation.AddFrame(2, 0, Vector<int>(16, 4));
-		dekarAttackAnimation.AddFrames(2, 0, Vector<int>(10, 2), 4);
-		dekarAttackAnimation.AddFrame(2, 1, Vector<int>(6, 2));
-		dekarAttackAnimation.AddFrame(2, 1, Vector<int>());
-		dekarAttackAnimation.AddFrame(2, 2, Vector<int>(-2, 0));
-		dekarAttackAnimation.AddFrames(2, 2, Vector<int>(0, 0), 3);
-		dekar.SetAttackAnimation(&dekarAttackAnimation);
-		ComplexAnimation dekarSpellAnimation(&dekarSprite, framerate);
-		dekarSpellAnimation.AddFrames(2, 0, Vector<int>(), 6);
-		dekarSpellAnimation.AddFrames(2, 1, Vector<int>(), 2);
-		dekarSpellAnimation.AddFrames(2, 2, Vector<int>(), 3);
-		dekar.SetSpellAnimation(&dekarSpellAnimation);
-		SDL_Surface *dekarMeleeImg(IMG_Load("test-data/melee-dekar.png"));
-		Sprite dekarMeleeSprite(dekarMeleeImg, 96, 96);
-		SimpleAnimation dekarMeleeAnimation(&dekarMeleeSprite, 2 * framerate, 4);
-		dekar.SetMeleeAnimation(&dekarMeleeAnimation);
+		Hero guy(*intp.GetHero("guy"));
+		Hero dekar(*intp.GetHero("dekar"));
 
 		battle::Resources battleRes;