mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-02 04:15:34 +00:00
Code Issues Releases Wiki Activity

renamed Widgets::MWEnchantment to Widgets::MWEffectList so it can be

Browse source 
reused for potion effects
This commit is contained in:
scrawl 2012-04-30 01:08:10 +02:00
parent f733382f74
commit b82c39c8be
5 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/potion.cpp
View file

@ -124,6 +124,8 @@ namespace MWClass
text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight); text += "\n" + store.gameSettings.search("sWeight")->str + ": " + MWGui::ToolTips::toString(ref->base->data.weight);
text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str); text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
ESM::EffectList list = ref->base->effects;
if (MWBase::Environment::get().getWindowManager()->getFullHelp()) { if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner"); text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");
text += MWGui::ToolTips::getMiscString(ref->base->script, "Script"); text += MWGui::ToolTips::getMiscString(ref->base->script, "Script");

2
apps/openmw/mwgui/tooltips.cpp
View file

@ -233,7 +233,7 @@ IntSize ToolTips::createToolTip(const ToolTipInfo& info)
IntCoord coord(0, 6, totalSize.width, 24); IntCoord coord(0, 6, totalSize.width, 24);
Widgets::MWEnchantmentPtr enchantWidget = enchantArea->createWidget<Widgets::MWEnchantment> Widgets::MWEffectListPtr enchantWidget = enchantArea->createWidget<Widgets::MWEffectList>
("MW_StatName", coord, Align::Default, "ToolTipEnchantWidget"); ("MW_StatName", coord, Align::Default, "ToolTipEnchantWidget");
enchantWidget->setWindowManager(mWindowManager); enchantWidget->setWindowManager(mWindowManager);
enchantWidget->setEnchantmentId(info.enchant); enchantWidget->setEnchantmentId(info.enchant);

14
apps/openmw/mwgui/widgets.cpp
View file

@ -266,20 +266,20 @@ MWSpell::~MWSpell()
{ {
} }
/* MWEnchantment */ /* MWEffectList */
MWEnchantment::MWEnchantment() MWEffectList::MWEffectList()
: mWindowManager(nullptr) : mWindowManager(nullptr)
{ {
} }
void MWEnchantment::setEnchantmentId(const std::string &enchantId) void MWEffectList::setEnchantmentId(const std::string &enchantId)
{ {
id = enchantId; id = enchantId;
updateWidgets(); updateWidgets();
} }
void MWEnchantment::createEffectWidgets(std::vector<MyGUI::WidgetPtr> &effects, MyGUI::WidgetPtr creator, MyGUI::IntCoord &coord, bool center, bool constant) void MWEffectList::createEffectWidgets(std::vector<MyGUI::WidgetPtr> &effects, MyGUI::WidgetPtr creator, MyGUI::IntCoord &coord, bool center, bool constant)
{ {
const ESMS::ESMStore &store = mWindowManager->getStore(); const ESMS::ESMStore &store = mWindowManager->getStore();
const ESM::Enchantment *enchant = store.enchants.search(id); const ESM::Enchantment *enchant = store.enchants.search(id);
@ -324,16 +324,16 @@ void MWEnchantment::createEffectWidgets(std::vector<MyGUI::WidgetPtr> &effects,
coord.width = maxwidth; coord.width = maxwidth;
} }
void MWEnchantment::updateWidgets() void MWEffectList::updateWidgets()
{ {
} }
void MWEnchantment::initialiseOverride() void MWEffectList::initialiseOverride()
{ {
Base::initialiseOverride(); Base::initialiseOverride();
} }
MWEnchantment::~MWEnchantment() MWEffectList::~MWEffectList()
{ {
} }

10
apps/openmw/mwgui/widgets.hpp
View file

@ -145,11 +145,11 @@ namespace MWGui
}; };
typedef MWSpell* MWSpellPtr; typedef MWSpell* MWSpellPtr;
class MYGUI_EXPORT MWEnchantment : public Widget class MYGUI_EXPORT MWEffectList : public Widget
{ {
MYGUI_RTTI_DERIVED( MWEnchantment ); MYGUI_RTTI_DERIVED( MWEffectList );
public: public:
MWEnchantment(); MWEffectList();
typedef MWMechanics::Stat<int> EnchantmentValue; typedef MWMechanics::Stat<int> EnchantmentValue;
@ -168,7 +168,7 @@ namespace MWGui
const std::string &getSpellId() const { return id; } const std::string &getSpellId() const { return id; }
protected: protected:
virtual ~MWEnchantment(); virtual ~MWEffectList();
virtual void initialiseOverride(); virtual void initialiseOverride();
@ -178,7 +178,7 @@ namespace MWGui
WindowManager* mWindowManager; WindowManager* mWindowManager;
std::string id; std::string id;
}; };
typedef MWEnchantment* MWEnchantmentPtr; typedef MWEffectList* MWEffectListPtr;
class MYGUI_EXPORT MWSpellEffect : public Widget class MYGUI_EXPORT MWSpellEffect : public Widget
{ {

2
apps/openmw/mwgui/window_manager.cpp
View file

@ -104,7 +104,7 @@ WindowManager::WindowManager(
MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSkill>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSkill>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWAttribute>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWAttribute>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSpell>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSpell>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWEnchantment>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWEffectList>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSpellEffect>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWSpellEffect>("Widget");
MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWDynamicStat>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<MWGui::Widgets::MWDynamicStat>("Widget");