X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FResources.h;h=5cc8903131f84a7f625f2820a08f2da5f5b0166b;hb=923422e6a71f57b8fa24b826d1e2914faa144081;hp=b07e2b21f0cf60472aa769013ac729fdc29cc616;hpb=57a9949304b1d938bdb795213a8f46a7e28fcf7c;p=l2e.git

diff --git a/src/battle/Resources.h b/src/battle/Resources.h
index b07e2b2..5cc8903 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,10 +26,14 @@ namespace battle {
 
 struct Resources {
 
+	graphics::Sprite *swapCursor;
 	graphics::Sprite *moveIcons;
 	graphics::Sprite *attackIcons;
 	graphics::Sprite *attackChoiceIcons;
 
+	graphics::Frame *titleFrame;
+	graphics::Font *titleFont;
+
 	graphics::Frame *heroTagFrame;
 	graphics::Frame *activeHeroTagFrame;
 
@@ -45,23 +50,40 @@ struct Resources {
 	graphics::Font *disabledFont;
 
 	graphics::Sprite *menuCursor;
+	graphics::Sprite *weaponTargetCursor;
+	graphics::Sprite *magicTargetCursor;
+	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;
+
+	const char *escapeText;
+
+	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)
 
+	, titleFrame(0)
+	, titleFont(0)
+
 	, heroTagFrame(0)
 	, activeHeroTagFrame(0)
 
@@ -78,10 +100,24 @@ struct Resources {
 	, disabledFont(0)
 
 	, menuCursor(0)
+	, weaponTargetCursor(0)
+	, magicTargetCursor(0)
+	, itemTargetCursor(0)
+
 	, spellMenuHeadline("")
 	, inventory(0)
 	, itemMenuHeadline("")
 	, ikariMenuHeadline("")
+	, noEquipmentText("")
+
+	, escapeText("")
+
+	, weaponMenuIcon(0)
+	, armorMenuIcon(0)
+	, shieldMenuIcon(0)
+	, helmetMenuIcon(0)
+	, ringMenuIcon(0)
+	, jewelMenuIcon(0)
 	{ }
 
 };