X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=424404febe492414d4584d9291037e70717837e9;hb=af9e0b57dac45dc5591f16fb34236b1356cda8a2;hp=71a29e58292b0f889661cd691db808d250226d19;hpb=0f5f8a6eaa938f88fd3d1e92dec2462b30840e21;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 71a29e5..424404f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,7 +17,6 @@
 #include "common/Inventory.h"
 #include "common/Item.h"
 #include "common/Spell.h"
-#include "geometry/Point.h"
 #include "geometry/Vector.h"
 #include "graphics/ComplexAnimation.h"
 #include "graphics/Font.h"
@@ -26,6 +25,8 @@
 #include "graphics/Menu.h"
 #include "graphics/SimpleAnimation.h"
 #include "graphics/Sprite.h"
+#include "loader/ParsedSource.h"
+#include "loader/Parser.h"
 #include "sdl/InitImage.h"
 #include "sdl/InitScreen.h"
 #include "sdl/InitSDL.h"
@@ -33,6 +34,7 @@
 #include <cstdlib>
 #include <ctime>
 #include <exception>
+#include <fstream>
 #include <iostream>
 #include <SDL.h>
 #include <SDL_image.h>
@@ -48,7 +50,6 @@ using common::Ikari;
 using common::Inventory;
 using common::Item;
 using common::Spell;
-using geometry::Point;
 using geometry::Vector;
 using graphics::ComplexAnimation;
 using graphics::Font;
@@ -57,6 +58,8 @@ using graphics::Gauge;
 using graphics::Menu;
 using graphics::SimpleAnimation;
 using graphics::Sprite;
+using loader::ParsedSource;
+using loader::Parser;
 using sdl::InitImage;
 using sdl::InitScreen;
 using sdl::InitSDL;
@@ -75,6 +78,15 @@ int main(int argc, char **argv) {
 //	std::srand(std::time(0));
 
 	try {
+		std::ifstream file("test-data/test.l2s");
+		ParsedSource source;
+		Parser parser(file, source);
+		parser.Parse();
+
+		cout << source;
+
+		return 0;
+
 		InitSDL sdl;
 		InitImage image(IMG_INIT_PNG);
 		InitScreen screen(width, height);
@@ -82,15 +94,15 @@ int main(int argc, char **argv) {
 		// temporary test data
 		SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
 		PartyLayout monstersLayout;
-		monstersLayout.AddPosition(Point<Uint8>(88, 88));
-		monstersLayout.AddPosition(Point<Uint8>(128, 88));
-		monstersLayout.AddPosition(Point<Uint8>(168, 88));
-		monstersLayout.AddPosition(Point<Uint8>(208, 88));
+		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(Point<Uint8>(48, 136));
-		heroesLayout.AddPosition(Point<Uint8>(128, 136));
-		heroesLayout.AddPosition(Point<Uint8>(80, 152));
-		heroesLayout.AddPosition(Point<Uint8>(160, 152));
+		heroesLayout.AddPosition(Vector<Uint8>(48, 136));
+		heroesLayout.AddPosition(Vector<Uint8>(128, 136));
+		heroesLayout.AddPosition(Vector<Uint8>(80, 152));
+		heroesLayout.AddPosition(Vector<Uint8>(160, 152));
 
 		SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
 		Sprite monsterSprite(monsterImg, 64, 64);
@@ -125,8 +137,7 @@ int main(int argc, char **argv) {
 		maxim.SetIP(0);
 		maxim.SetStats(Stats(28, 22, 28, 17, 14, 100, 10));
 		ComplexAnimation maximAttackAnimation(&maximSprite, framerate);
-		// TODO: cross check double frames; could be related to differences in framerates
-		maximAttackAnimation.AddFrames(1, 0, Vector<int>(0,  0), 7); // TODO: maybe this could also be a pause before the battle animation
+		maximAttackAnimation.AddFrames(1, 0, Vector<int>(0,  0), 7);
 		maximAttackAnimation.AddFrames(1, 0, Vector<int>(4, -1), 2);
 		maximAttackAnimation.AddFrames(2, 0, Vector<int>(4, -2), 2);
 		maximAttackAnimation.AddFrames(2, 0, Vector<int>(6, -2), 2);
@@ -135,7 +146,7 @@ int main(int argc, char **argv) {
 		maximAttackAnimation.AddFrames(2, 1, Vector<int>(0,  0), 1);
 		maximAttackAnimation.AddFrames(2, 2, Vector<int>(0,  0), 2);
 		maximAttackAnimation.AddFrames(2, 2, Vector<int>(2,  0), 1);
-		maximAttackAnimation.AddFrames(1, 0, Vector<int>(0,  0), 7); // TODO: maybe this could also be a pause between two animations
+		maximAttackAnimation.AddFrames(1, 0, Vector<int>(0,  0), 7);
 		maxim.SetAttackAnimation(&maximAttackAnimation);
 		ComplexAnimation maximSpellAnimation(&maximSprite, 5 * framerate);
 		maximSpellAnimation.AddFrames(3, 0, Vector<int>(), 2);
@@ -485,6 +496,7 @@ int main(int argc, char **argv) {
 		Item zircoSword;
 		zircoSword.SetName("Zirco sword");
 		zircoSword.SetMenuIcon(&swordIcon);
+		zircoSword.GetTargetingMode().TargetSingleEnemy();
 		Ikari firestorm;
 		firestorm.SetName("Firestorm");
 		firestorm.SetCost(224);
@@ -509,7 +521,7 @@ int main(int argc, char **argv) {
 		Ikari lightGuard;
 		lightGuard.SetName("Light guard");
 		lightGuard.SetCost(128);
-		lightGuard.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
+		lightGuard.GetTargetingMode().TargetAllAllies(); // actually only targets self
 		lightGuard.SetMagical();
 		holyShield.SetIkari(&lightGuard);
 		maxim.SetShield(&holyShield);
@@ -519,7 +531,7 @@ int main(int argc, char **argv) {
 		Ikari boomerang;
 		boomerang.SetName("Boomerang");
 		boomerang.SetCost(164);
-		boomerang.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
+		boomerang.GetTargetingMode().TargetAllAllies(); // actually only targets self
 		boomerang.SetMagical();
 		legendHelm.SetIkari(&boomerang);
 		maxim.SetHelmet(&legendHelm);
@@ -547,6 +559,7 @@ int main(int argc, char **argv) {
 		Item zircoWhip;
 		zircoWhip.SetName("Zirco whip");
 		zircoWhip.SetMenuIcon(&rodIcon);
+		zircoWhip.GetTargetingMode().TargetSingleEnemy();
 		Ikari thundershriek;
 		thundershriek.SetName("Thundershriek");
 		thundershriek.SetCost(224);
@@ -608,6 +621,7 @@ int main(int argc, char **argv) {
 		Item zircoAx;
 		zircoAx.SetName("Zirco ax");
 		zircoAx.SetMenuIcon(&axIcon);
+		zircoAx.GetTargetingMode().TargetSingleEnemy();
 		Ikari torrent;
 		torrent.SetName("Torrent");
 		torrent.SetCost(224);
@@ -622,7 +636,7 @@ int main(int argc, char **argv) {
 		Ikari ironBarrier;
 		ironBarrier.SetName("Iron barrier");
 		ironBarrier.SetCost(255);
-		ironBarrier.GetTargetingMode().TargetAllAllies(); // FIXME: actually only targets self
+		ironBarrier.GetTargetingMode().TargetAllAllies(); // actually only targets self
 		ironBarrier.SetMagical();
 		megaShield.SetIkari(&ironBarrier);
 		guy.SetShield(&megaShield);
@@ -652,6 +666,7 @@ int main(int argc, char **argv) {
 		Item lizardBlow;
 		lizardBlow.SetName("Lizard blow");
 		lizardBlow.SetMenuIcon(&swordIcon);
+		lizardBlow.GetTargetingMode().TargetSingleEnemy();
 		Ikari dragonRush;
 		dragonRush.SetName("Dragon rush");
 		dragonRush.SetCost(164);