diff --git a/Sources/Engine/Ska/RMRender.cpp b/Sources/Engine/Ska/RMRender.cpp index d64c8a9..c23807c 100644 --- a/Sources/Engine/Ska/RMRender.cpp +++ b/Sources/Engine/Ska/RMRender.cpp @@ -195,7 +195,7 @@ inline void MatrixMultiply(Matrix12 &c,const Matrix12 &m, const Matrix12 &n) } // multiply two matrices into first one -inline void MatrixMultiplyCP(Matrix12 &c,const Matrix12 &m, const Matrix12 &n) +void MatrixMultiplyCP(Matrix12 &c,const Matrix12 &m, const Matrix12 &n) { Matrix12 mTemp; MatrixMultiply(mTemp,m,n); diff --git a/Sources/Engine/Templates/StaticArray.cpp b/Sources/Engine/Templates/StaticArray.cpp index d7792d8..45a7c42 100644 --- a/Sources/Engine/Templates/StaticArray.cpp +++ b/Sources/Engine/Templates/StaticArray.cpp @@ -84,8 +84,6 @@ inline const Type &CStaticArray::operator[](INDEX i) const { ASSERT(i>=0 && i::Count(void) const { ASSERT(this!=NULL); return sa_Count; } +#endif /* * Get index of a member from it's pointer diff --git a/Sources/Engine/Templates/StaticArray.h b/Sources/Engine/Templates/StaticArray.h index 719fc3b..9c2da8b 100644 --- a/Sources/Engine/Templates/StaticArray.h +++ b/Sources/Engine/Templates/StaticArray.h @@ -66,7 +66,8 @@ public: } /* Get number of objects in array. */ - INDEX Count(void) const; + inline INDEX Count(void) const { return sa_Count; } + /* Get index of a object from it's pointer. */ INDEX Index(Type *ptObject);