X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=dbe50d28f55d4b8be2d4ed531507c3ae14a45e4c;hb=7946f704a4cd3a985d2fb523079fce7fa14c341e;hp=8820004ea2d45e44a4088ff3fb55aa36bd668d57;hpb=859750479ac0c8febfaf4eb603fc599aef4571ca;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 8820004..dbe50d2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,6 +12,8 @@
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "battle/Resources.h"
+#include "common/Inventory.h"
+#include "common/Item.h"
 #include "geometry/Point.h"
 #include "graphics/Font.h"
 #include "graphics/Frame.h"
@@ -33,6 +35,8 @@ using battle::BattleState;
 using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
+using common::Inventory;
+using common::Item;
 using geometry::Point;
 using graphics::Font;
 using graphics::Frame;
@@ -128,6 +132,9 @@ int main(int argc, char **argv) {
 		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;
@@ -222,30 +229,51 @@ int main(int argc, char **argv) {
 		Sprite ringIcon(itemIcons, 16, 16, 0, 160);
 		Sprite stoneIcon(itemIcons, 16, 16, 0, 176);
 
+		Inventory inventory;
+		Item antidote;
+		antidote.SetName("Antidote");
+		antidote.SetMenuIcon(&potionIcon);
+		antidote.SetUsableInBattle();
+		inventory.Add(&antidote, 9);
+		Item magicJar;
+		magicJar.SetName("Magic jar");
+		magicJar.SetMenuIcon(&potionIcon);
+		magicJar.SetUsableInBattle();
+		inventory.Add(&magicJar, 4);
+		Item hiPotion;
+		hiPotion.SetName("Hi-Potion");
+		hiPotion.SetMenuIcon(&potionIcon);
+		hiPotion.SetUsableInBattle();
+		inventory.Add(&hiPotion, 4);
+		Item powerPotion;
+		powerPotion.SetName("Power potion");
+		powerPotion.SetMenuIcon(&potionIcon);
+		inventory.Add(&powerPotion, 4);
+		Item escape;
+		escape.SetName("Escape");
+		inventory.Add(&escape, 2);
+		Item sleepBall;
+		sleepBall.SetName("Sleep ball");
+		sleepBall.SetMenuIcon(&ballIcon);
+		sleepBall.SetUsableInBattle();
+		inventory.Add(&sleepBall, 1);
+		Item figgoru;
+		figgoru.SetName("Figgoru");
+		figgoru.SetMenuIcon(&crankIcon);
+		inventory.Add(&figgoru, 1);
+		battleRes.inventory = &inventory;
+
 		battleRes.itemMenuHeadline = "Please choose an item.";
-		battleRes.itemMenuPrototype = Menu</* Item */ void *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32);
-		battleRes.itemMenuPrototype.Add("Antidote    : 9", 0, true, &potionIcon);
-		battleRes.itemMenuPrototype.Add("Magic jar   : 4", 0, true, &potionIcon);
-		battleRes.itemMenuPrototype.Add("Miracle     : 4", 0, true, &potionIcon);
-		battleRes.itemMenuPrototype.Add("Hi-Potion   : 6", 0, true, &potionIcon);
-		battleRes.itemMenuPrototype.Add("Hi-Magic    : 7", 0, true, &potionIcon);
-		battleRes.itemMenuPrototype.Add("Regain      : 4", 0, true, &potionIcon);
-		battleRes.itemMenuPrototype.Add("Power potion: 4", 0, false, &potionIcon);
-		battleRes.itemMenuPrototype.Add("Life potion : 1", 0, false, &potionIcon);
-		battleRes.itemMenuPrototype.Add("Escape      : 2", 0, false);
-		battleRes.itemMenuPrototype.Add("Power gourd : 3", 0, true, &potionIcon);
-		battleRes.itemMenuPrototype.Add("Mystery pin : 2", 0, true, &potionIcon);
-		battleRes.itemMenuPrototype.Add("Sleep ball  : 1", 0, false, &ballIcon);
-		battleRes.itemMenuPrototype.Add("Figgoru     : 1", 0, false, &crankIcon);
-		battleRes.itemMenuPrototype.Add("Spear       : 1", 0, false, &spearIcon);
-		battleRes.itemMenuPrototype.Add("Silvo rapier: 1", 0, false, &swordIcon);
-		battleRes.itemMenuPrototype.Add("Rainy ax    : 1", 0, false, &axIcon);
-		battleRes.itemMenuPrototype.Add("Pounder rod : 2", 0, false, &rodIcon);
-		battleRes.itemMenuPrototype.Add("Silver mail : 2", 0, false, &armorIcon);
-		battleRes.itemMenuPrototype.Add("Slash shield: 2", 0, false, &shieldIcon);
-		battleRes.itemMenuPrototype.Add("Golden helm : 1", 0, false, &helmetIcon);
-		battleRes.itemMenuPrototype.Add("Protect ring: 1", 0, false, &ringIcon);
-		battleRes.itemMenuPrototype.Add("Mysto jewel : 1", 0, false, &stoneIcon);
+		battleRes.itemMenuPrototype = Menu<const common::Item *>(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':');
+
+		battleRes.ikariMenuHeadline = "Please choose equipment.";
+		battleRes.ikariMenuPrototype = Menu</* Item */ void *>(&normalFont, &disabledFont, &handCursorSprite, 26, 6, 8, 16, 1, 32);
+		battleRes.ikariMenuPrototype.Add("Zirco whip   Thundershriek", 0, false, &swordIcon);
+		battleRes.ikariMenuPrototype.Add("Zircon plate Sudden cure", 0, true, &armorIcon);
+		battleRes.ikariMenuPrototype.Add("Zirco gloves Forcefield", 0, true, &shieldIcon);
+		battleRes.ikariMenuPrototype.Add("Holy cap     Vulnerable", 0, false, &helmetIcon);
+		battleRes.ikariMenuPrototype.Add("Ghost ring   Destroy", 0, true, &ringIcon);
+		battleRes.ikariMenuPrototype.Add("Eagle rock   Dive", 0, true, &stoneIcon);
 
 		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &battleRes));
 		battleState->AddMonster(monster);