OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 10:52:46 +00:00
Code Releases Activity

Merge pull request #231 from dpogue/fixes

Browse Source 
Linux fixes
This commit is contained in:
Adam Johnson
2012-12-19 16:38:23 -08:00
parent 43a26190b1 64214e1a7b
commit 66038d4fc2
17 changed files with 96 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Plasma/PubUtilLib/plAudible/plWinAudible.cpp
View File

@ -510,11 +510,11 @@ void plWinAudible::DeActivate()
bool plWinAudible::MsgReceive(plMessage* msg)
{
plGenRefMsg *refMsg;
if (refMsg = plGenRefMsg::ConvertNoRef(msg))
plGenRefMsg *refMsg = plGenRefMsg::ConvertNoRef(msg);
if (refMsg)
{
plSound *snd;
if (snd = plSound::ConvertNoRef(refMsg->GetRef()))
plSound *snd = plSound::ConvertNoRef(refMsg->GetRef());
if (snd)
{
int index = refMsg->fWhich;
if( refMsg->GetContext() & (plRefMsg::kOnCreate | plRefMsg::kOnRequest) )

1
Sources/Plasma/PubUtilLib/plDrawable/plDynaDecal.h
View File

@ -94,6 +94,7 @@ protected:
friend class plDynaDecalMgr;
public:
virtual ~plDynaDecal() { }
virtual bool Age(double t, float ramp, float decay, float life) = 0;
};

6
Sources/Plasma/PubUtilLib/plDrawable/plSpaceTree.cpp
View File

@ -291,7 +291,8 @@ void plSpaceTree::HarvestEnabledLeaves(plVolumeIsect* cull, const hsBitVector& c
if( IsEmpty() )
return;
if( fCullFunc = cull )
fCullFunc = cull;
if (fCullFunc)
IHarvestAndCullEnabledLeaves(fRoot, cache, list);
else
IHarvestEnabledLeaves(fRoot, cache, list);
@ -372,7 +373,8 @@ void plSpaceTree::HarvestLeaves(plVolumeIsect* cull, hsBitVector& list) const
{
if( !IsEmpty() )
{
if( fCullFunc = cull )
fCullFunc = cull;
if (fCullFunc)
IHarvestAndCullLeaves(fTree[fRoot], scratchTotVec, list);
else
IHarvestLeaves(fTree[fRoot], scratchTotVec, list);

2
Sources/Plasma/PubUtilLib/plGImage/plPNG.cpp
View File

@ -191,7 +191,7 @@ plMipmap* plPNG::ReadFromFile(const wchar_t* fileName)
hsUNIXStream in;
if (!in.Open(fileName, L"rb")) {
return false;
return nil;
}
plMipmap* ret = IRead(&in);

2
Sources/Plasma/PubUtilLib/plGLight/plShadowSlave.h
View File

@ -99,6 +99,8 @@ public:
kPositional = 0x80
};
virtual ~plShadowSlave() { }
void SetFlag(SlaveFlag f, bool on) { if(on) fFlags |= f; else fFlags &= ~f; }
bool HasFlag(SlaveFlag f) const { return 0 != (fFlags & f); }

2
Sources/Plasma/PubUtilLib/plJPEG/plJPEG.cpp
View File

@ -246,7 +246,7 @@ plMipmap* plJPEG::ReadFromFile( const wchar_t *fileName )
hsRAMStream tempstream;
hsUNIXStream in;
if (!in.Open(fileName, L"rb"))
return false;
return nil;
// The stream reader for JPEGs expects a 32-bit size at the start,
// so insert that into the stream before passing it on

2
Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp
View File

@ -551,7 +551,7 @@ void plGraphPlate::SetDataColors( const std::vector<uint32_t> & hexColors )
//// SetLabelText ////////////////////////////////////////////////////////////
void plGraphPlate::SetLabelText( char *text1, char *text2, char *text3, char *text4 )
void plGraphPlate::SetLabelText(const char *text1, const char *text2, const char *text3, const char *text4 )
{
std::vector<std::string> strings;
if( text1 != nil )

2
Sources/Plasma/PubUtilLib/plPipeline/plPlates.h
View File

@ -170,7 +170,7 @@ class plGraphPlate : public plPlate
void SetDataRange( uint32_t min, uint32_t max, uint32_t width );
void SetDataLabels( uint32_t min, uint32_t max );
void SetLabelText( char *text1, char *text2 = nil, char *text3 = nil, char *text4 = nil );
void SetLabelText(const char *text1, const char *text2 = nil, const char *text3 = nil, const char *text4 = nil );
void SetLabelText( const std::vector<std::string> & text );
void ClearData( void );

14
Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp
View File

@ -244,7 +244,7 @@ plRegistryPageNode* plResManager::FindSinglePage(const char* path) const
PageMap::const_iterator it;
for (it = fAllPages.begin(); it != fAllPages.end(); it++)
{
if (strcmpi((it->second)->GetPagePath(), path) == 0)
if (stricmp((it->second)->GetPagePath(), path) == 0)
return it->second;
}
@ -423,12 +423,18 @@ bool plResManager::IReadObject(plKeyImp* pKey, hsStream *stream)
ko = hsKeyedObject::ConvertNoRef(cre);
if (ko != nil)
{
kResMgrLog(4, ILog(4, " ...Creatable read and valid"));
}
else
{
kResMgrLog(3, ILog(3, " ...Creatable read from stream not keyed object!"));
}
if (fProgressProc != nil)
{
fProgressProc(plKey::Make(pKey));
}
}
else
{
@ -1651,8 +1657,8 @@ plRegistryPageNode* plResManager::FindPage(const char* age, const char* page) co
for (it = fAllPages.begin(); it != fAllPages.end(); ++it)
{
const plPageInfo& info = (it->second)->GetPageInfo();
if (strcmpi(info.GetAge(), age) == 0 &&
strcmpi(info.GetPage(), page) == 0)
if (stricmp(info.GetAge(), age) == 0 &&
stricmp(info.GetPage(), page) == 0)
return it->second;
}
@ -1766,7 +1772,7 @@ bool plResManager::IteratePages(plRegistryPageIterator* iterator, const char* ag
if (page->GetPageInfo().GetLocation() == plLocation::kGlobalFixedLoc)
continue;
if (!ageToRestrictTo || strcmpi(page->GetPageInfo().GetAge(), ageToRestrictTo) == 0)
if (!ageToRestrictTo || stricmp(page->GetPageInfo().GetAge(), ageToRestrictTo) == 0)
{
if (!iterator->EatPage(page))
{