X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FResources.h;h=89c99efef6b3622d1c31c16151ab8259a97d6ab7;hb=6d080d21d8055df9962296863b4c0954bc81410b;hp=c0fb48cf159bec8ca258ab68f8eed59b37a8fcea;hpb=3c72a71fbf6de96333a641051a20c6bf8b3a5df3;p=l2e.git

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index c0fb48c..89c99ef 100644
--- a/src/battle/Resources.h
+++ b/src/battle/Resources.h
@@ -13,6 +13,7 @@
 namespace common {
 	class Inventory;
 	class Item;
+	class Spell;
 }
 namespace graphics {
 	class Font;
@@ -25,6 +26,7 @@ namespace battle {
 
 struct Resources {
 
+	graphics::Sprite *swapCursor;
 	graphics::Sprite *moveIcons;
 	graphics::Sprite *attackIcons;
 	graphics::Sprite *attackChoiceIcons;
@@ -50,18 +52,27 @@ struct Resources {
 	graphics::Sprite *itemTargetCursor;
 
 	const char *spellMenuHeadline;
-	graphics::Menu</* Spell */ void *> spellMenuPrototype;
+	graphics::Menu<const common::Spell *> spellMenuPrototype;
 
 	common::Inventory *inventory;
 	const char *itemMenuHeadline;
 	graphics::Menu<const common::Item *> itemMenuPrototype;
 
 	const char *ikariMenuHeadline;
-	graphics::Menu</* Ikari or Item */ void *> ikariMenuPrototype;
+	graphics::Menu<const common::Item *> ikariMenuPrototype;
+	const char *noEquipmentText;
+
+	graphics::Sprite *weaponMenuIcon;
+	graphics::Sprite *armorMenuIcon;
+	graphics::Sprite *shieldMenuIcon;
+	graphics::Sprite *helmetMenuIcon;
+	graphics::Sprite *ringMenuIcon;
+	graphics::Sprite *jewelMenuIcon;
 
 
 	Resources()
-	: moveIcons(0)
+	: swapCursor(0)
+	, moveIcons(0)
 	, attackIcons(0)
 	, attackChoiceIcons(0)
 
@@ -89,6 +100,14 @@ struct Resources {
 	, inventory(0)
 	, itemMenuHeadline("")
 	, ikariMenuHeadline("")
+	, noEquipmentText("")
+
+	, weaponMenuIcon(0)
+	, armorMenuIcon(0)
+	, shieldMenuIcon(0)
+	, helmetMenuIcon(0)
+	, ringMenuIcon(0)
+	, jewelMenuIcon(0)
 	{ }
 
 };