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

reverted mShouldRepeat back to unsigned char.

Browse Source 
As recommended by Scrawl.
This commit is contained in:
dteviot 2015-03-07 11:04:54 +13:00
parent 45b6538820
commit f2ac939e61
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/esmtool/record.cpp
View File

@ -15,8 +15,8 @@ void printAIPackage(ESM::AIPackage p)
std::cout << " Distance: " << p.mWander.mDistance << std::endl; std::cout << " Distance: " << p.mWander.mDistance << std::endl;
std::cout << " Duration: " << p.mWander.mDuration << std::endl; std::cout << " Duration: " << p.mWander.mDuration << std::endl;
std::cout << " Time of Day: " << (int)p.mWander.mTimeOfDay << std::endl; std::cout << " Time of Day: " << (int)p.mWander.mTimeOfDay << std::endl;
if (!p.mWander.mShouldRepeat) if (p.mWander.mShouldRepeat != 1)
std::cout << " Should repeat: " << p.mWander.mShouldRepeat << std::endl; std::cout << " Should repeat: " << (bool)(p.mWander.mShouldRepeat != 0) << std::endl;
std::cout << " Idle: "; std::cout << " Idle: ";
for (int i = 0; i != 8; i++) for (int i = 0; i != 8; i++)

2
apps/openmw/mwgui/windowmanagerimp.cpp
View File

@ -565,7 +565,7 @@ namespace MWGui
int eff = mShown & mAllowed & ~mForceHidden; int eff = mShown & mAllowed & ~mForceHidden;
// Show the windows we want // Show the windows we want
mMap ->setVisible(eff & GW_Map); mMap ->setVisible((eff & GW_Map) != 0);
mStatsWindow ->setVisible((eff & GW_Stats) != 0); mStatsWindow ->setVisible((eff & GW_Stats) != 0);
mInventoryWindow->setVisible((eff & GW_Inventory) != 0); mInventoryWindow->setVisible((eff & GW_Inventory) != 0);
mInventoryWindow->setGuiMode(mode); mInventoryWindow->setGuiMode(mode);

2
apps/openmw/mwmechanics/aisequence.cpp
View File

@ -294,7 +294,7 @@ void AiSequence::fill(const ESM::AIPackageList &list)
idles.reserve(8); idles.reserve(8);
for (int i=0; i<8; ++i) for (int i=0; i<8; ++i)
idles.push_back(data.mIdle[i]); idles.push_back(data.mIdle[i]);
package = new MWMechanics::AiWander(data.mDistance, data.mDuration, data.mTimeOfDay, idles, data.mShouldRepeat); package = new MWMechanics::AiWander(data.mDistance, data.mDuration, data.mTimeOfDay, idles, data.mShouldRepeat != 0);
} }
else if (it->mType == ESM::AI_Escort) else if (it->mType == ESM::AI_Escort)
{ {

2
apps/openmw/mwmechanics/aiwander.cpp
View File

@ -785,7 +785,7 @@ namespace MWMechanics
, mDuration(wander->mData.mDuration) , mDuration(wander->mData.mDuration)
, mStartTime(MWWorld::TimeStamp(wander->mStartTime)) , mStartTime(MWWorld::TimeStamp(wander->mStartTime))
, mTimeOfDay(wander->mData.mTimeOfDay) , mTimeOfDay(wander->mData.mTimeOfDay)
, mRepeat(wander->mData.mShouldRepeat) , mRepeat(wander->mData.mShouldRepeat != 0)
, mStoredInitialActorPosition(wander->mStoredInitialActorPosition) , mStoredInitialActorPosition(wander->mStoredInitialActorPosition)
{ {
if (mStoredInitialActorPosition) if (mStoredInitialActorPosition)

2
components/esm/aipackage.hpp
View File

@ -32,7 +32,7 @@ namespace ESM
short mDuration; short mDuration;
unsigned char mTimeOfDay; unsigned char mTimeOfDay;
unsigned char mIdle[8]; unsigned char mIdle[8];
bool mShouldRepeat; unsigned char mShouldRepeat;
}; };
struct AITravel struct AITravel

2
components/esm/aisequence.hpp
View File

@ -44,7 +44,7 @@ namespace ESM
short mDuration; short mDuration;
unsigned char mTimeOfDay; unsigned char mTimeOfDay;
unsigned char mIdle[8]; unsigned char mIdle[8];
bool mShouldRepeat; unsigned char mShouldRepeat;
}; };
struct AiTravelData struct AiTravelData
{ {