X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FResources.h;h=719eec48f6428a94a9e126c4f908ac499c6161a1;hb=d5959073b2c413ba1bd6f3d14bc8bcf59304e488;hp=5e68281548b4e1bc8cef7b9de7d01bb22a7cc62b;hpb=187a0f2c37bd4c1e80c5c4351aaf80695508817f;p=l2e.git diff --git a/src/battle/Resources.h b/src/battle/Resources.h index 5e68281..719eec4 100644 --- a/src/battle/Resources.h +++ b/src/battle/Resources.h @@ -8,8 +8,7 @@ #ifndef BATTLE_RESOURCES_H_ #define BATTLE_RESOURCES_H_ -#include "../graphics/ComplexAnimation.h" -#include "../graphics/Menu.h" +#include "../graphics/Color.h" #include @@ -19,6 +18,7 @@ namespace common { class Spell; } namespace graphics { + class Animation; class Font; class Frame; class Gauge; @@ -60,19 +60,19 @@ struct Resources { graphics::Sprite *itemTargetCursor; const char *spellMenuHeadline; - graphics::Menu spellMenuPrototype; + graphics::MenuProperties *spellMenuProperties; common::Inventory *inventory; const char *itemMenuHeadline; - graphics::Menu itemMenuPrototype; + graphics::MenuProperties *itemMenuProperties; const char *ikariMenuHeadline; - graphics::Menu ikariMenuPrototype; + graphics::MenuProperties *ikariMenuProperties; const char *noEquipmentText; const char *escapeText; - graphics::ComplexAnimation numberAnimationPrototype; + const graphics::Animation *numberAnimationPrototype; const graphics::Sprite *bigNumberSprite; const graphics::Sprite *greenNumberSprite; @@ -95,7 +95,7 @@ struct Resources { int ikariLabelCol; int ikariLabelRow; - Uint32 heroesBgColor; + graphics::Color heroesBgColor; Resources() @@ -130,13 +130,17 @@ struct Resources { , itemTargetCursor(0) , spellMenuHeadline("") + , spellMenuProperties(0) , inventory(0) , itemMenuHeadline("") + , itemMenuProperties(0) , ikariMenuHeadline("") + , ikariMenuProperties(0) , noEquipmentText("") , escapeText("") + , numberAnimationPrototype(0) , bigNumberSprite(0) , greenNumberSprite(0) @@ -158,7 +162,6 @@ struct Resources { , ikariLabelCol(0) , ikariLabelRow(0) - , heroesBgColor(0) { } };