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

Smash case for manual reference IDs as well, consistent with references in data files

Browse source
This commit is contained in:
scrawl 2014-01-04 04:39:06 +01:00
parent 557652112f
commit 710a1e2f37
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,7 +72,7 @@ void InventoryItemModel::update()
// NOTE: Don't show WerewolfRobe objects in the inventory, or allow them to be taken. // NOTE: Don't show WerewolfRobe objects in the inventory, or allow them to be taken.
// Vanilla likely uses a hack like this since there's no other way to prevent it from // Vanilla likely uses a hack like this since there's no other way to prevent it from
// being shown or taken. // being shown or taken.
if(item.getCellRef().mRefID == "WerewolfRobe") if(item.getCellRef().mRefID == "werewolfrobe")
continue; continue;
ItemStack newItem (item, this, item.getRefData().getCount()); ItemStack newItem (item, this, item.getRefData().getCount());

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

@ -425,7 +425,7 @@ namespace MWGui
// NOTE: Don't allow users to select WerewolfRobe objects in the inventory. Vanilla // NOTE: Don't allow users to select WerewolfRobe objects in the inventory. Vanilla
// likely uses a hack like this since there's no other way to prevent it from being // likely uses a hack like this since there's no other way to prevent it from being
// taken. // taken.
if(item.getCellRef().mRefID == "WerewolfRobe") if(item.getCellRef().mRefID == "werewolfrobe")
return MWWorld::Ptr(); return MWWorld::Ptr();
return item; return item;
} }

2
apps/openmw/mwworld/manualref.hpp
View file

@ -64,7 +64,7 @@ namespace MWWorld
// initialise // initialise
ESM::CellRef& cellRef = mPtr.getCellRef(); ESM::CellRef& cellRef = mPtr.getCellRef();
cellRef.mRefID = name; cellRef.mRefID = Misc::StringUtils::lowerCase(name);
cellRef.mRefnum = -1; cellRef.mRefnum = -1;
cellRef.mScale = 1; cellRef.mScale = 1;
cellRef.mFactIndex = 0; cellRef.mFactIndex = 0;

4
apps/openmw/mwworld/worldimp.cpp
View file

@ -1967,11 +1967,11 @@ namespace MWWorld
{ {
InventoryStore &inv = actor.getClass().getInventoryStore(actor); InventoryStore &inv = actor.getClass().getInventoryStore(actor);
inv.equip(InventoryStore::Slot_Robe, inv.ContainerStore::add("WerewolfRobe", 1, actor), actor); inv.equip(InventoryStore::Slot_Robe, inv.ContainerStore::add("werewolfrobe", 1, actor), actor);
} }
else else
{ {
actor.getClass().getContainerStore(actor).remove("WerewolfRobe", 1, actor); actor.getClass().getContainerStore(actor).remove("werewolfrobe", 1, actor);
} }
if(actor.getRefData().getHandle() == "player") if(actor.getRefData().getHandle() == "player")