X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FResources.cpp;h=548afc3572aae5496cd428c7b25ca9636454e44d;hb=6dff93b1a6e9b727dbe26747456f4b23efca86da;hp=f625e67421119dc816f5b4cd28164b2911033dcf;hpb=7f0a586b8238c7093a8942ff5b5c4122edd386fc;p=l2e.git

diff --git a/src/menu/Resources.cpp b/src/menu/Resources.cpp
index f625e67..548afc3 100644
--- a/src/menu/Resources.cpp
+++ b/src/menu/Resources.cpp
@@ -1,5 +1,6 @@
 #include "Resources.h"
 
+#include "../graphics/CharSelect.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
 #include "../graphics/Menu.h"
@@ -8,6 +9,7 @@
 #include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
+using graphics::CharSelect;
 using graphics::Font;
 using graphics::Frame;
 using graphics::MenuProperties;
@@ -71,6 +73,7 @@ Resources::Resources()
 , itemMenuUseText(0)
 , itemMenuSortText(0)
 , itemMenuDropText(0)
+, itemMenuSelectText(0)
 
 , inventoryMenuProperties(0)
 
@@ -103,6 +106,7 @@ Resources::Resources()
 , capsulebg(0)
 
 , capsuleMenuProperties(0)
+, capsuleFeedMenuProperties(0)
 
 , capsuleFeedLabel(0)
 , capsuleChangeLabel(0)
@@ -114,6 +118,23 @@ Resources::Resources()
 , capsuleAttack2Label(0)
 , capsuleAttack3Label(0)
 , capsuleNoAttackText(0)
+, capsuleNotHungryText(0)
+
+, capsuleNameCharSelectTemplate(0)
+
+, capsuleSelectTopLeft(0)
+, capsuleSelectTopRight(0)
+, capsuleSelectTopRepeat(0)
+, capsuleSelectBottomLeft(0)
+, capsuleSelectBottomRight(0)
+, capsuleSelectBottomRepeat(0)
+, capsuleSelectLeftRepeat(0)
+, capsuleSelectRightRepeat(0)
+, capsuleSelectLadder(0)
+, capsuleSelectCursor(0)
+
+, capsuleAlignmentWheel(0)
+, capsuleAlignmentCursor(0)
 
 { }
 
@@ -177,6 +198,7 @@ void Resources::CreateTypeDescription() {
 	td.AddField("itemMenuUseText", FieldDescription(((char *)&r.itemMenuUseText) - ((char *)&r), Interpreter::STRING_ID).SetReferenced());
 	td.AddField("itemMenuSortText", FieldDescription(((char *)&r.itemMenuSortText) - ((char *)&r), Interpreter::STRING_ID).SetReferenced());
 	td.AddField("itemMenuDropText", FieldDescription(((char *)&r.itemMenuDropText) - ((char *)&r), Interpreter::STRING_ID).SetReferenced());
+	td.AddField("itemMenuSelectText", FieldDescription(((char *)&r.itemMenuSelectText) - ((char *)&r), Interpreter::STRING_ID).SetReferenced());
 
 	td.AddField("inventoryMenu", FieldDescription(((char *)&r.inventoryMenuProperties) - ((char *)&r), MenuProperties::TYPE_ID).SetReferenced().SetDescription("properties of the inventory menu"));
 	td.AddField("spellMenu", FieldDescription(((char *)&r.spellMenuProperties) - ((char *)&r), MenuProperties::TYPE_ID).SetReferenced().SetDescription("properties of the spell menu"));
@@ -208,6 +230,7 @@ void Resources::CreateTypeDescription() {
 	td.AddField("capsulebg", FieldDescription(((char *)&r.capsulebg) - ((char *)&r), Texture::TYPE_ID).SetReferenced().SetDescription("background texture for the capsule menus"));
 
 	td.AddField("capsuleMenu", FieldDescription(((char *)&r.capsuleMenuProperties) - ((char *)&r), MenuProperties::TYPE_ID).SetReferenced().SetDescription("properties of the capsule main menu (the bottom bar)"));
+	td.AddField("capsuleFeedMenu", FieldDescription(((char *)&r.capsuleFeedMenuProperties) - ((char *)&r), MenuProperties::TYPE_ID).SetReferenced().SetDescription("properties of the capsule feed menu (above the inventory)"));
 
 	td.AddField("capsuleFeedLabel", FieldDescription(((char *)&r.capsuleFeedLabel) - ((char *)&r), Interpreter::STRING_ID).SetReferenced());
 	td.AddField("capsuleChangeLabel", FieldDescription(((char *)&r.capsuleChangeLabel) - ((char *)&r), Interpreter::STRING_ID).SetReferenced());
@@ -219,6 +242,23 @@ void Resources::CreateTypeDescription() {
 	td.AddField("capsuleAttack2Label", FieldDescription(((char *)&r.capsuleAttack2Label) - ((char *)&r), Interpreter::STRING_ID).SetReferenced());
 	td.AddField("capsuleAttack3Label", FieldDescription(((char *)&r.capsuleAttack3Label) - ((char *)&r), Interpreter::STRING_ID).SetReferenced());
 	td.AddField("capsuleNoAttackText", FieldDescription(((char *)&r.capsuleNoAttackText) - ((char *)&r), Interpreter::STRING_ID).SetReferenced());
+	td.AddField("capsuleNotHungryText", FieldDescription(((char *)&r.capsuleNotHungryText) - ((char *)&r), Interpreter::STRING_ID).SetReferenced());
+
+	td.AddField("capsuleNameSelect", FieldDescription(((char *)&r.capsuleNameCharSelectTemplate) - ((char *)&r), CharSelect::TYPE_ID).SetReferenced().SetDescription("properties of the letter array for changing the capsule name"));
+
+	td.AddField("capsuleSelectTopLeft", FieldDescription(((char *)&r.capsuleSelectTopLeft) - ((char *)&r), Sprite::TYPE_ID).SetReferenced());
+	td.AddField("capsuleSelectTopRight", FieldDescription(((char *)&r.capsuleSelectTopRight) - ((char *)&r), Sprite::TYPE_ID).SetReferenced());
+	td.AddField("capsuleSelectTopRepeat", FieldDescription(((char *)&r.capsuleSelectTopRepeat) - ((char *)&r), Sprite::TYPE_ID).SetReferenced());
+	td.AddField("capsuleSelectBottomLeft", FieldDescription(((char *)&r.capsuleSelectBottomLeft) - ((char *)&r), Sprite::TYPE_ID).SetReferenced());
+	td.AddField("capsuleSelectBottomRight", FieldDescription(((char *)&r.capsuleSelectBottomRight) - ((char *)&r), Sprite::TYPE_ID).SetReferenced());
+	td.AddField("capsuleSelectBottomRepeat", FieldDescription(((char *)&r.capsuleSelectBottomRepeat) - ((char *)&r), Sprite::TYPE_ID).SetReferenced());
+	td.AddField("capsuleSelectLeftRepeat", FieldDescription(((char *)&r.capsuleSelectLeftRepeat) - ((char *)&r), Texture::TYPE_ID).SetReferenced());
+	td.AddField("capsuleSelectRightRepeat", FieldDescription(((char *)&r.capsuleSelectRightRepeat) - ((char *)&r), Texture::TYPE_ID).SetReferenced());
+	td.AddField("capsuleSelectLadder", FieldDescription(((char *)&r.capsuleSelectLadder) - ((char *)&r), Sprite::TYPE_ID).SetReferenced());
+	td.AddField("capsuleSelectCursor", FieldDescription(((char *)&r.capsuleSelectCursor) - ((char *)&r), Sprite::TYPE_ID).SetReferenced());
+
+	td.AddField("capsuleAlignmentWheel", FieldDescription(((char *)&r.capsuleAlignmentWheel) - ((char *)&r), Sprite::TYPE_ID).SetReferenced());
+	td.AddField("capsuleAlignmentCursor", FieldDescription(((char *)&r.capsuleAlignmentCursor) - ((char *)&r), Sprite::TYPE_ID).SetReferenced());
 }
 
 void Resources::Construct(void *data) {