mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 15:35:23 +00:00
Code Issues Projects Releases Wiki Activity

fixed gold pickup sound for international MW versions, fix npc tooltip

Browse Source
This commit is contained in:
scrawl 2012-04-16 20:20:18 +02:00
parent 282f37b1b7
commit c4825cdb43
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwclass/misc.cpp
View File

@ -7,6 +7,7 @@
#include "../mwworld/ptr.hpp" #include "../mwworld/ptr.hpp"
#include "../mwworld/actiontake.hpp" #include "../mwworld/actiontake.hpp"
#include "../mwworld/world.hpp"
#include "../mwworld/environment.hpp" #include "../mwworld/environment.hpp"
#include "../mwrender/objects.hpp" #include "../mwrender/objects.hpp"
@ -90,7 +91,7 @@ namespace MWClass
ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref = ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
ptr.get<ESM::Miscellaneous>(); ptr.get<ESM::Miscellaneous>();
if (ref->base->name =="Gold") if (ref->base->name == environment.mWorld->getStore().gameSettings.search("sGold")->str)
{ {
return std::string("Item Gold Up"); return std::string("Item Gold Up");
} }
@ -102,7 +103,7 @@ namespace MWClass
ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref = ESMS::LiveCellRef<ESM::Miscellaneous, MWWorld::RefData> *ref =
ptr.get<ESM::Miscellaneous>(); ptr.get<ESM::Miscellaneous>();
if (ref->base->name =="Gold") if (ref->base->name == environment.mWorld->getStore().gameSettings.search("sGold")->str)
{ {
return std::string("Item Gold Down"); return std::string("Item Gold Down");
} }

14
apps/openmw/mwgui/tooltips.cpp
View File

@ -158,7 +158,12 @@ IntSize ToolTips::getToolTipViaPtr ()
/// \todo We don't want tooltips for NPCs in combat mode. /// \todo We don't want tooltips for NPCs in combat mode.
ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>* ref = mFocusObject.get<ESM::NPC>(); ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData>* ref = mFocusObject.get<ESM::NPC>();
tooltipSize = createToolTip(ref->base->name, ""); std::string text;
if (mFullHelp) {
text += "\n Script: " + ref->base->script;
}
tooltipSize = createToolTip(ref->base->name, text);
} }
// -------------------- Creature ------------------------------- // -------------------- Creature -------------------------------
@ -167,7 +172,12 @@ IntSize ToolTips::getToolTipViaPtr ()
/// \todo We don't want tooltips for Creatures in combat mode. /// \todo We don't want tooltips for Creatures in combat mode.
ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData>* ref = mFocusObject.get<ESM::Creature>(); ESMS::LiveCellRef<ESM::Creature, MWWorld::RefData>* ref = mFocusObject.get<ESM::Creature>();
tooltipSize = createToolTip(ref->base->name, ""); std::string text;
if (mFullHelp) {
text += "\n Script: " + ref->base->script;
}
tooltipSize = createToolTip(ref->base->name, text);
} }
// -------------------- Container ------------------------------- // -------------------- Container -------------------------------