X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=a1fbfaf940d9cb29d3e2b16a366bff96fa17e645;hb=1aa61eca26f5b4a4cb856a39e802f5899548b691;hp=00b04d7dfe60750d247036709a7226d4ef0f0ef4;hpb=03dabc4ea94ac00e73c4a61260eaeb7f4a0973fe;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 00b04d7..a1fbfaf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -74,8 +74,6 @@ int main(int argc, char **argv) {
 	const int width = 800;
 	const int height = 480;
 
-	const int framerate = 33;
-
 //	std::srand(std::time(0));
 
 	try {
@@ -130,7 +128,7 @@ int main(int argc, char **argv) {
 		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);
+		battleRes.heroesBgColor = intp.GetColor("heroesBgColor").MapRGB(screen.Screen()->format);
 
 		battleRes.healthGauge = intp.GetGauge("healthGauge");
 		battleRes.manaGauge = intp.GetGauge("manaGauge");
@@ -164,7 +162,7 @@ int main(int argc, char **argv) {
 		selan.AddSpell(valorSpell);
 
 		battleRes.spellMenuHeadline = intp.GetString("spellMenuHeadline");
-		battleRes.spellMenuPrototype = Menu<const Spell *>(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 9, 6, 8, 0, 2, 32, 2, ':');
+		battleRes.spellMenuPrototype = Menu<const Spell *>(*intp.GetMenuProperties("spellMenuPrototype"));
 
 		battleRes.weaponMenuIcon = intp.GetSprite("swordIcon");
 		battleRes.armorMenuIcon = intp.GetSprite("armorIcon");
@@ -183,11 +181,7 @@ int main(int argc, char **argv) {
 		battleRes.inventory = &inventory;
 
 		battleRes.itemMenuHeadline = intp.GetString("itemMenuHeadline");
-		battleRes.itemMenuPrototype = Menu<const common::Item *>(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 15, 6, 8, 16, 1, 32, 2, ':');
-
-		SDL_Surface *swordAttackImg(IMG_Load("test-data/attack-sword.png"));
-		Sprite swordAttackSprite(swordAttackImg, 96, 96);
-		SimpleAnimation swordAttackAnimation(&swordAttackSprite, 2 * framerate, 4);
+		battleRes.itemMenuPrototype = Menu<const common::Item *>(*intp.GetMenuProperties("itemMenuPrototype"));
 
 		maxim.SetWeapon(intp.GetItem("zircoSwordItem"));
 		maxim.SetArmor(intp.GetItem("zirconArmorItem"));
@@ -211,55 +205,17 @@ int main(int argc, char **argv) {
 		guy.SetJewel(intp.GetItem("evilJewelItem"));
 
 		// NOTE: this is actually Artea equipment
-		Item lizardBlow;
-		lizardBlow.SetName("Lizard blow");
-		lizardBlow.SetMenuIcon(intp.GetSprite("swordIcon"));
-		lizardBlow.GetTargetingMode().TargetSingleEnemy();
-		Ikari dragonRush;
-		dragonRush.SetName("Dragon rush");
-		dragonRush.SetCost(164);
-		dragonRush.GetTargetingMode().TargetSingleEnemy();
-		dragonRush.SetPhysical();
-		lizardBlow.SetIkari(&dragonRush);
-//		dekar.SetWeapon(&lizardBlow);
-		Item holyRobe;
-		holyRobe.SetName("Holy robe");
-		holyRobe.SetMenuIcon(intp.GetSprite("armorIcon"));
-		Ikari crisisCure;
-		crisisCure.SetName("Crisis cure");
-		crisisCure.SetCost(164);
-		crisisCure.GetTargetingMode().TargetAllAllies();
-		crisisCure.SetMagical();
-		holyRobe.SetIkari(&crisisCure);
-		dekar.SetArmor(&holyRobe);
+//		dekar.SetWeapon(intp.GetItem("lizardBlowItem"));
+		dekar.SetArmor(intp.GetItem("holyRobeItem"));
 		dekar.SetShield(intp.GetItem("zircoGlovesItem"));
 		dekar.SetHelmet(intp.GetItem("holyCapItem"));
-		Item rocketRing;
-		rocketRing.SetName("Rocket ring");
-		rocketRing.SetMenuIcon(intp.GetSprite("ringIcon"));
-		Ikari fake;
-		fake.SetName("Fake");
-		fake.SetCost(32);
-		fake.GetTargetingMode().TargetSingleAlly();
-		fake.SetMagical();
-		rocketRing.SetIkari(&fake);
-		dekar.SetRing(&rocketRing);
-		Item krakenRock;
-		krakenRock.SetName("Kraken rock");
-		krakenRock.SetMenuIcon(intp.GetSprite("jewelIcon"));
-		Ikari tenLegger;
-		tenLegger.SetName("Ten-legger");
-		tenLegger.SetCost(164);
-		tenLegger.GetTargetingMode().TargetAllEnemies();
-		tenLegger.SetPhysical();
-		rocketRing.SetIkari(&tenLegger);
-		dekar.SetJewel(&krakenRock);
-
-		battleRes.ikariMenuHeadline = "Please choose equipment.";
-		battleRes.noEquipmentText = "No equip";
-		battleRes.ikariMenuPrototype = Menu<const Item *>(intp.GetFont("normalFont"), intp.GetFont("disabledFont"), intp.GetSprite("handCursor"), 12, 6, intp.GetFont("normalFont")->CharHeight() / 2, intp.GetFont("normalFont")->CharWidth(), 1, intp.GetFont("normalFont")->CharWidth() * 2, 0, ':', 12, intp.GetFont("normalFont")->CharWidth());
+		dekar.SetRing(intp.GetItem("rocketRingItem"));
+		dekar.SetJewel(intp.GetItem("krakenRockItem"));
 
-		battleRes.escapeText = "Escapes.";
+		battleRes.ikariMenuHeadline = intp.GetString("ikariMenuHeadline");
+		battleRes.noEquipmentText = intp.GetString("noEquipmentText");
+		battleRes.ikariMenuPrototype = Menu<const Item *>(*intp.GetMenuProperties("ikariMenuPrototype"));
+		battleRes.escapeText = intp.GetString("escapeText");
 
 		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
 		battleState->AddMonster(monster);