X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=e1969307c93ff83dff5c88adfda6f2066c1e0e2d;hb=8f54789ae7d974035b9103982c38e1714a15728b;hp=935d4519f46ed1dd52882f217f062cb66e315045;hpb=1ad6b01c2cac5f771fcef0911c6d81230e50d0ed;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index 935d451..e196930 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,142 +92,28 @@ int main(int argc, char **argv) { // temporary test data SDL_Surface *bg(IMG_Load("test-data/battle-bg.png")); - PartyLayout monstersLayout; - monstersLayout.AddPosition(Vector(88, 88)); - monstersLayout.AddPosition(Vector(128, 88)); - monstersLayout.AddPosition(Vector(168, 88)); - monstersLayout.AddPosition(Vector(208, 88)); - PartyLayout heroesLayout; - heroesLayout.AddPosition(Vector(48, 136)); - heroesLayout.AddPosition(Vector(128, 136)); - heroesLayout.AddPosition(Vector(80, 152)); - heroesLayout.AddPosition(Vector(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(-4, 0), 2); - guyAttackAnimation.AddFrames(1, 0, Vector(-8, 0), 2); - guyAttackAnimation.AddFrames(2, 0, Vector(-8, 0), 2); - guyAttackAnimation.AddFrame(2, 0, Vector(-4, 0)); - guyAttackAnimation.AddFrames(2, 0, Vector(), 2); - guyAttackAnimation.AddFrame(2, 1); - guyAttackAnimation.AddFrame(2, 1, Vector(4, 0)); - guyAttackAnimation.AddFrame(2, 1, Vector(10, 0)); - guyAttackAnimation.AddFrame(2, 2, Vector(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(4, 0)); - dekarAttackAnimation.AddFrame(1, 0, Vector(8, 2)); - dekarAttackAnimation.AddFrame(2, 0, Vector(12, 4)); - dekarAttackAnimation.AddFrame(2, 0, Vector(16, 4)); - dekarAttackAnimation.AddFrames(2, 0, Vector(10, 2), 4); - dekarAttackAnimation.AddFrame(2, 1, Vector(6, 2)); - dekarAttackAnimation.AddFrame(2, 1, Vector()); - dekarAttackAnimation.AddFrame(2, 2, Vector(-2, 0)); - dekarAttackAnimation.AddFrames(2, 2, Vector(0, 0), 3); - dekar.SetAttackAnimation(&dekarAttackAnimation); - ComplexAnimation dekarSpellAnimation(&dekarSprite, framerate); - dekarSpellAnimation.AddFrames(2, 0, Vector(), 6); - dekarSpellAnimation.AddFrames(2, 1, Vector(), 2); - dekarSpellAnimation.AddFrames(2, 2, Vector(), 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; - SDL_Surface *swapCursorImg(IMG_Load("test-data/swap-cursor.png")); - Sprite swapCursorSprite(swapCursorImg, 32, 32); - battleRes.swapCursor = &swapCursorSprite; - SDL_Surface *attackIconsImg(IMG_Load("test-data/attack-type-icons.png")); - Sprite attackIconsSprite(attackIconsImg, 32, 32); - battleRes.attackIcons = &attackIconsSprite; - SDL_Surface *attackChoiceIconsImg(IMG_Load("test-data/attack-choice-icons.png")); - Sprite attackChoiceIconsSprite(attackChoiceIconsImg, 16, 16); - battleRes.attackChoiceIcons = &attackChoiceIconsSprite; - SDL_Surface *moveIconsImg(IMG_Load("test-data/move-icons.png")); - Sprite moveIconsSprite(moveIconsImg, 32, 32); - battleRes.moveIcons = &moveIconsSprite; - - SDL_Surface *titleFrameImg(IMG_Load("test-data/title-frame.png")); - Frame titleFrame(titleFrameImg, 16, 16); - battleRes.titleFrame = &titleFrame; - - SDL_Surface *largeFontImg(IMG_Load("test-data/large-font.png")); - Sprite largeFontSprite(largeFontImg, 16, 32); - Font largeFont(&largeFontSprite, 0, -2); - battleRes.titleFont = &largeFont; - - ComplexAnimation numberAnimationPrototype(0, framerate); - numberAnimationPrototype.AddFrame(0, 0); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -26)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -42)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -48)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -42)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -26)); - numberAnimationPrototype.AddFrame(0, 0); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -20)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -24)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -20)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); - numberAnimationPrototype.AddFrame(0, 0); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -6)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -10)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -10)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -6)); - numberAnimationPrototype.AddFrames(0, 0, Vector(), 14); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -36)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -32)); - numberAnimationPrototype.AddFrame(0, 0, Vector(0, -18)); - battleRes.numberAnimationPrototype = &numberAnimationPrototype; - - SDL_Surface *bigNumbersImg(IMG_Load("test-data/big-numbers.png")); - Sprite bigNumbersSprite(bigNumbersImg, 16, 32); - battleRes.bigNumberSprite = &bigNumbersSprite; - SDL_Surface *bigGreenNumbersImg(IMG_Load("test-data/big-green-numbers.png")); - Sprite bigGreenNumbersSprite(bigGreenNumbersImg, 16, 32); - battleRes.greenNumberSprite = &bigGreenNumbersSprite; - - SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png")); - Sprite heroTagSprite(heroTagImg, 32, 16); - battleRes.heroTagLabels = &heroTagSprite; + battleRes.swapCursor = intp.GetSprite("swapCursor"); + battleRes.attackIcons = intp.GetSprite("attackIcons"); + battleRes.attackChoiceIcons = intp.GetSprite("attackChoiceIcons"); + battleRes.moveIcons = intp.GetSprite("moveIcons"); + battleRes.titleFrame = intp.GetFrame("titleFrame"); + battleRes.titleFont = intp.GetFont("largeFont"); + battleRes.numberAnimationPrototype = intp.GetAnimation("numberAnimationPrototype"); + battleRes.bigNumberSprite = intp.GetSprite("bigNumbers"); + battleRes.greenNumberSprite = intp.GetSprite("bigGreenNumbers"); + + battleRes.heroTagLabels = intp.GetSprite("heroTagLabels"); battleRes.levelLabelCol = 0; battleRes.levelLabelRow = 0; battleRes.healthLabelCol = 0; @@ -240,20 +125,11 @@ int main(int argc, char **argv) { battleRes.ikariLabelCol = 0; battleRes.ikariLabelRow = 4; - SDL_Surface *numbersImg(IMG_Load("test-data/numbers.png")); - Sprite numbersSprite(numbersImg, 16, 16); - Font heroTagFont(&numbersSprite, 0, -3); - battleRes.heroTagFont = &heroTagFont; - SDL_Surface *tagFramesImg(IMG_Load("test-data/tag-frames.png")); - Frame heroTagFrame(tagFramesImg, 16, 16, 1, 1, 0, 33); - battleRes.heroTagFrame = &heroTagFrame; - Frame activeHeroTagFrame(tagFramesImg, 16, 16); - battleRes.activeHeroTagFrame = &activeHeroTagFrame; - SDL_Surface *smallTagFrameImg(IMG_Load("test-data/small-tag-frame.png")); - Frame smallTagFrame(smallTagFrameImg, 8, 16); - battleRes.smallHeroTagFrame = &smallTagFrame; - Frame lastSmallTagFrame(smallTagFrameImg, 8, 16, 1, 1, 0, 33); - battleRes.lastSmallHeroTagFrame = &lastSmallTagFrame; + battleRes.heroTagFont = intp.GetFont("heroTagFont"); + battleRes.heroTagFrame = intp.GetFrame("heroTagFrame"); + battleRes.activeHeroTagFrame = intp.GetFrame("activeHeroTagFrame"); + battleRes.smallHeroTagFrame = intp.GetFrame("smallHeroTagFrame"); + battleRes.lastSmallHeroTagFrame = intp.GetFrame("lastSmallHeroTagFrame"); battleRes.heroesBgColor = SDL_MapRGB(screen.Screen()->format, 0x18, 0x28, 0x31); SDL_Surface *gauges(IMG_Load("test-data/gauges.png"));