mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-11 06:40:34 +00:00
Code Issues Projects Releases Wiki Activity

Trader Gold Reset Delay

Browse Source 
Trade Time initialized to 0
Gold pot set correctly for npc’s and creatures
This commit is contained in:
Jeffrey Haines 2014-03-27 07:30:24 -04:00
parent 2a8bf46607
commit 6896142db1
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwclass/creature.cpp
View File

@ -124,7 +124,7 @@ namespace MWClass
data->mContainerStore = new MWWorld::ContainerStore(); data->mContainerStore = new MWWorld::ContainerStore();
// Relates to NPC gold reset delay // Relates to NPC gold reset delay
data->mCreatureStats.setTradeTime (MWBase::Environment::get().getWorld()->getTimeStamp()); data->mCreatureStats.setTradeTime(MWWorld::TimeStamp(0.0, 0));
data->mCreatureStats.setGoldPool(ref->mBase->mData.mGold); data->mCreatureStats.setGoldPool(ref->mBase->mData.mGold);

2
apps/openmw/mwclass/npc.cpp
View File

@ -358,7 +358,7 @@ namespace MWClass
MWBase::Environment::get().getWorld()->getStore()); MWBase::Environment::get().getWorld()->getStore());
// Relates to NPC gold reset delay // Relates to NPC gold reset delay
data->mNpcStats.setTradeTime(MWBase::Environment::get().getWorld()->getTimeStamp()); data->mNpcStats.setTradeTime(MWWorld::TimeStamp(0.0, 0));
data->mNpcStats.setGoldPool(gold); data->mNpcStats.setGoldPool(gold);

3
apps/openmw/mwgui/tradewindow.cpp
View File

@ -484,7 +484,6 @@ namespace MWGui
void TradeWindow::checkTradeTime() void TradeWindow::checkTradeTime()
{ {
MWWorld::ContainerStore store = mPtr.getClass().getContainerStore(mPtr); MWWorld::ContainerStore store = mPtr.getClass().getContainerStore(mPtr);
MWWorld::LiveCellRef<ESM::NPC> *ref = mPtr.get<ESM::NPC>();
const MWMechanics::CreatureStats &sellerStats = mPtr.getClass().getCreatureStats(mPtr); const MWMechanics::CreatureStats &sellerStats = mPtr.getClass().getCreatureStats(mPtr);
double delay = boost::lexical_cast<double>(MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fBarterGoldResetDelay")->getInt()); double delay = boost::lexical_cast<double>(MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fBarterGoldResetDelay")->getInt());
@ -492,7 +491,7 @@ namespace MWGui
if (MWBase::Environment::get().getWorld()->getTimeStamp() >= sellerStats.getTradeTime() + delay) if (MWBase::Environment::get().getWorld()->getTimeStamp() >= sellerStats.getTradeTime() + delay)
{ {
addOrRemoveGold(-store.count(MWWorld::ContainerStore::sGoldId), mPtr); addOrRemoveGold(-store.count(MWWorld::ContainerStore::sGoldId), mPtr);
addOrRemoveGold(+ref->mBase->mNpdt52.mGold, mPtr); addOrRemoveGold(+sellerStats.getGoldPool(), mPtr);
} }
} }