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

Fix several errors and warnings from GCC compilation

Browse Source
This commit is contained in:
Michael Hansen
2012-02-09 00:56:03 -08:00
parent e6ebf7ffaf
commit ad66286a17
78 changed files with 318 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/PubUtilLib/plDrawable/plCluster.h
View File

@ -102,7 +102,7 @@ public:
const hsBitVector& GetVisSet() const { return fGroup->GetVisSet(); }
const hsBitVector& GetVisNot() const { return fGroup->GetVisNot(); }
const hsTArray<plLightInfo*>& GetLights() const { fGroup->GetLights(); }
const hsTArray<plLightInfo*>& GetLights() const { return fGroup->GetLights(); }
const plLODDist& GetLOD() const { return fGroup->GetLOD(); }
};

4
Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpans.h
View File

@ -280,7 +280,7 @@ class plDrawableSpans : public plDrawable
virtual const plSpan *GetSpan( uint32_t index ) const { return fSpans[ index ]; }
virtual const plSpan *GetSpan( uint32_t diIndex, uint32_t index ) const { return fSpans[ (*fDIIndices[ diIndex ])[ index ] ]; }
virtual const uint32_t GetNumSpans( void ) const { return fSpans.GetCount(); }
virtual uint32_t GetNumSpans( void ) const { return fSpans.GetCount(); }
virtual const hsTArray<plSpan *> &GetSpanArray( void ) const { return fSpans; }
hsMatrix44* GetMatrixPalette(int baseMatrix) const { return &fLocalToWorlds[baseMatrix]; }
@ -294,7 +294,7 @@ class plDrawableSpans : public plDrawable
// BufferGroups accessed only by Pipeline and it's close personal acquaintances.
plGBufferGroup* GetBufferGroup(uint32_t i) const { return fGroups[i]; }
uint32_t GetNumBufferGroups() const { return fGroups.GetCount(); }
uint32_t GetNumBufferGroups() const { return fGroups.GetCount(); }
const hsTArray<plGeometrySpan*>& GetSourceSpans() const { return fSourceSpans; }
void DirtyVertexBuffer(uint32_t group, uint32_t idx);

2
Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp
View File

@ -737,7 +737,7 @@ void plDynaDecalMgr::IAllocAuxSpan(plAuxSpan* aux, uint32_t maxNumVerts, uint32_
uint16_t* dataPtr = nil;
grp->ReserveIndexStorage(maxNumIdx, &aux->fIBufferIdx, &aux->fIStartIdx, &dataPtr);
aux->fIStartIdx;
aux->fIStartIdx /* should be assigning something? */;
aux->fILength = 0;

2
Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp
View File

@ -1806,7 +1806,7 @@ hsGMaterial* plWaveSet7::ICreateBumpLayersPS()
// Create a blank material
hsGMaterial* bumpMat = new hsGMaterial;
plString buff = plString::Format("%s_BumpMatPS", GetKey()->GetName());
plString buff = plString::Format("%s_BumpMatPS", GetKey()->GetName().c_str());
hsgResMgr::ResMgr()->NewKey(buff, bumpMat, GetKey()->GetUoid().GetLocation());
plMipmap* mipMap = ICreateBumpMipmapPS();