]> git.localhorst.tv Git - l2e.git/blobdiff - src/main.cpp
moved Selan to test.l2s
[l2e.git] / src / main.cpp
index 424404febe492414d4584d9291037e70717837e9..935d4519f46ed1dd52882f217f062cb66e315045 100644 (file)
@@ -25,6 +25,7 @@
 #include "graphics/Menu.h"
 #include "graphics/SimpleAnimation.h"
 #include "graphics/Sprite.h"
+#include "loader/Interpreter.h"
 #include "loader/ParsedSource.h"
 #include "loader/Parser.h"
 #include "sdl/InitImage.h"
@@ -34,7 +35,6 @@
 #include <cstdlib>
 #include <ctime>
 #include <exception>
-#include <fstream>
 #include <iostream>
 #include <SDL.h>
 #include <SDL_image.h>
@@ -58,6 +58,7 @@ using graphics::Gauge;
 using graphics::Menu;
 using graphics::SimpleAnimation;
 using graphics::Sprite;
+using loader::Interpreter;
 using loader::ParsedSource;
 using loader::Parser;
 using sdl::InitImage;
@@ -78,17 +79,16 @@ int main(int argc, char **argv) {
 //     std::srand(std::time(0));
 
        try {
-               std::ifstream file("test-data/test.l2s");
+               InitSDL sdl;
+               InitImage image(IMG_INIT_PNG);
+
                ParsedSource source;
-               Parser parser(file, source);
+               Parser parser("test-data/test.l2s", source);
                parser.Parse();
-
                cout << source;
+               Interpreter intp(source);
+               intp.ReadSource();
 
-               return 0;
-
-               InitSDL sdl;
-               InitImage image(IMG_INIT_PNG);
                InitScreen screen(width, height);
 
                // temporary test data
@@ -104,93 +104,9 @@ int main(int argc, char **argv) {
                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);
-               Monster monster;
-               monster.SetName("Lizard");
-               monster.SetSprite(&monsterSprite);
-               monster.SetLevel(1);
-               monster.SetMaxHealth(8);
-               monster.SetHealth(8);
-               monster.SetStats(Stats(14, 6, 6, 6, 6, 6, 6));
-               monster.SetReward(3, 5);
-               ComplexAnimation monsterAttackAnimation(&monsterSprite, 4 * framerate);
-               monsterAttackAnimation.AddFrame(0, 1, Vector<int>(0, 16));
-               monsterAttackAnimation.AddFrame(0, 0, Vector<int>(0, 16));
-               monsterAttackAnimation.AddFrame(0, 1, Vector<int>(0, 16));
-               monster.SetAttackAnimation(&monsterAttackAnimation);
-               SDL_Surface *monsterMeleeImg(IMG_Load("test-data/attack-monster.png"));
-               Sprite monsterMeleeSprite(monsterMeleeImg, 96, 64);
-               SimpleAnimation monsterMeleeAnimation(&monsterMeleeSprite, framerate, 14);
-               monster.SetMeleeAnimation(&monsterMeleeAnimation);
-
-               SDL_Surface *maximImg(IMG_Load("test-data/maxim.png"));
-               Sprite maximSprite(maximImg, 64, 64);
-               Hero maxim;
-               maxim.SetName("Maxim");
-               maxim.SetLevel(1);
-               maxim.SetSprite(&maximSprite);
-               maxim.SetMaxHealth(33);
-               maxim.SetHealth(33);
-               maxim.SetMaxMana(20);
-               maxim.SetMana(20);
-               maxim.SetIP(0);
-               maxim.SetStats(Stats(28, 22, 28, 17, 14, 100, 10));
-               ComplexAnimation maximAttackAnimation(&maximSprite, framerate);
-               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);
-               maximAttackAnimation.AddFrames(2, 1, Vector<int>(6, -1), 1);
-               maximAttackAnimation.AddFrames(2, 1, Vector<int>(3, -1), 2);
-               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);
-               maxim.SetAttackAnimation(&maximAttackAnimation);
-               ComplexAnimation maximSpellAnimation(&maximSprite, 5 * framerate);
-               maximSpellAnimation.AddFrames(3, 0, Vector<int>(), 2);
-               maximSpellAnimation.AddFrame(3, 1);
-               maxim.SetSpellAnimation(&maximSpellAnimation);
-               SDL_Surface *maximMeleeImg(IMG_Load("test-data/melee-maxim.png"));
-               Sprite maximMeleeSprite(maximMeleeImg, 96, 96);
-               SimpleAnimation maximMeleeAnimation(&maximMeleeSprite, 2 * framerate, 4);
-               maxim.SetMeleeAnimation(&maximMeleeAnimation);
-
-               SDL_Surface *selanImg(IMG_Load("test-data/selan.png"));
-               Sprite selanSprite(selanImg, 64, 64);
-               Hero selan;
-               selan.SetName("Selan");
-               selan.SetLevel(1);
-               selan.SetSprite(&selanSprite);
-               selan.SetMaxHealth(28);
-               selan.SetHealth(28);
-               selan.SetMaxMana(23);
-               selan.SetMana(23);
-               selan.SetIP(0);
-               selan.SetStats(Stats(23, 21, 23, 19, 22, 80, 13));
-               ComplexAnimation selanAttackAnimation(&selanSprite, framerate);
-               selanAttackAnimation.AddFrames(1, 0, Vector<int>(4, 0), 2);
-               selanAttackAnimation.AddFrame(1, 0, Vector<int>(8, 2));
-               selanAttackAnimation.AddFrame(2, 0, Vector<int>(10, 4));
-               selanAttackAnimation.AddFrame(2, 0, Vector<int>(14, 4));
-               selanAttackAnimation.AddFrames(2, 0, Vector<int>(12, 2), 3);
-               selanAttackAnimation.AddFrames(2, 1, Vector<int>(14, 2), 2);
-               selanAttackAnimation.AddFrame(2, 1, Vector<int>(2, 0));
-               selanAttackAnimation.AddFrame(2, 2, Vector<int>(-2, -4));
-               selanAttackAnimation.AddFrame(2, 2, Vector<int>(-8, -8));
-               selanAttackAnimation.AddFrame(2, 2);
-               selan.SetAttackAnimation(&selanAttackAnimation);
-               ComplexAnimation selanSpellAnimation(&selanSprite, framerate);
-               selanSpellAnimation.AddFrames(2, 0, Vector<int>(), 3);
-               selanSpellAnimation.AddFrames(2, 1, Vector<int>(), 2);
-               selanSpellAnimation.AddFrames(2, 2, Vector<int>(), 3);
-               selanSpellAnimation.AddFrames(2, 3, Vector<int>(), 2);
-               selan.SetSpellAnimation(&selanSpellAnimation);
-               SDL_Surface *selanMeleeImg(IMG_Load("test-data/melee-selan.png"));
-               Sprite selanMeleeSprite(selanMeleeImg, 96, 96);
-               SimpleAnimation selanMeleeAnimation(&selanMeleeSprite, 2 * framerate, 4);
-               selan.SetMeleeAnimation(&selanMeleeAnimation);
+               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);
@@ -738,6 +654,9 @@ int main(int argc, char **argv) {
                app.Run();
 
                return 0;
+       } catch (Parser::Error &e) {
+               cerr << "parsing exception in file " << e.File() << " on line " << e.Line() << ": " << e.what() << endl;
+               return 1;
        } catch (exception &e) {
                cerr << "exception in main(): " << e.what() << endl;
                return 1;