q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2025-02-16 23:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean out a bunch of compiler warnings.

Browse Source
This commit is contained in:
Ryan C. Gordon 2016-03-28 23:49:36 -04:00
parent bafa5fca05
commit a4000c69a8
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/Engine/Entities/Entity.h
View File

@ -681,19 +681,19 @@ inline CEntity& CEntityPointer::operator*(void) const { return *ep_pen; }
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
// Reference counting functions // Reference counting functions
inline void CEntity::AddReference(void) { inline void CEntity::AddReference(void) {
if (this!=NULL) { //if (this!=NULL) {
ASSERT(en_ctReferences>=0); ASSERT(en_ctReferences>=0);
en_ctReferences++; en_ctReferences++;
} //}
}; };
inline void CEntity::RemReference(void) { inline void CEntity::RemReference(void) {
if (this!=NULL) { //if (this!=NULL) {
ASSERT(en_ctReferences>0); ASSERT(en_ctReferences>0);
en_ctReferences--; en_ctReferences--;
if(en_ctReferences==0) { if(en_ctReferences==0) {
delete this; delete this;
} }
} //}
}; };
/* /*

2
Sources/Engine/Graphics/Gfx_wrapper.h
View File

@ -168,7 +168,7 @@ public:
GfxWrap tp_eWrapU, tp_eWrapV; // wrapping states GfxWrap tp_eWrapU, tp_eWrapV; // wrapping states
inline CTexParams(void) { Clear(); tp_bSingleMipmap = FALSE; }; inline CTexParams(void) { Clear(); tp_bSingleMipmap = FALSE; };
inline void Clear(void) { tp_iFilter = 00; tp_iAnisotropy = 0; tp_eWrapU = tp_eWrapV = (GfxWrap)NONE; }; inline void Clear(void) { tp_iFilter = 00; tp_iAnisotropy = 0; tp_eWrapU = tp_eWrapV = (GfxWrap)NONE; };
inline BOOL IsEqual( CTexParams tp) { return tp_iFilter==tp.tp_iFilter && tp_iAnisotropy==tp_iAnisotropy && inline BOOL IsEqual( CTexParams tp) { return tp_iFilter==tp.tp_iFilter && tp_iAnisotropy==tp.tp_iAnisotropy &&
tp_eWrapU==tp.tp_eWrapU && tp_eWrapV==tp.tp_eWrapV; }; tp_eWrapU==tp.tp_eWrapU && tp_eWrapV==tp.tp_eWrapV; };
}; };

2
Sources/Engine/Templates/StaticStackArray.cpp
View File

@ -67,7 +67,7 @@ template<class Type>
inline Type &CStaticStackArray<Type>::Push(void) { inline Type &CStaticStackArray<Type>::Push(void) {
sa_UsedCount++; sa_UsedCount++;
if (sa_UsedCount>CStaticArray<Type>::Count()) { if (sa_UsedCount>CStaticArray<Type>::Count()) {
Expand(CStaticArray<Type>::Count()+sa_ctAllocationStep); this->Expand(CStaticArray<Type>::Count()+sa_ctAllocationStep);
} }
ASSERT(sa_UsedCount <= CStaticArray<Type>::Count()); ASSERT(sa_UsedCount <= CStaticArray<Type>::Count());
return CStaticArray<Type>::operator[](sa_UsedCount-1); return CStaticArray<Type>::operator[](sa_UsedCount-1);

3
Sources/EntitiesMP/Camera.es
View File

@ -588,14 +588,13 @@ procedures:
PlayCamera() PlayCamera()
{ {
// eventually add to movers list // eventually add to movers list
CCameraMarker &cm = (CCameraMarker&)*m_penTarget;
// if auto rotating // if auto rotating
if( m_bAutoRotation) if( m_bAutoRotation)
{ {
jump PlayAutoRotatingCamera(); jump PlayAutoRotatingCamera();
} }
// if there is at least one marker // if there is at least one marker
else if( &cm!=NULL) else if( m_penTarget!=NULL)
{ {
// treat camera as movable // treat camera as movable
jump PlayMovingCamera(); jump PlayMovingCamera();