diff --git a/code/cgame/cg_public.h b/code/cgame/cg_public.h index 716ae28c..9e95bf06 100644 --- a/code/cgame/cg_public.h +++ b/code/cgame/cg_public.h @@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifndef __CG_PUBLIC_H__ #define __CG_PUBLIC_H__ +#include + #define CMD_BACKUP 128 #define CMD_MASK (CMD_BACKUP - 1) // allow a lot of command backups for very fast systems diff --git a/code/game/actor.cpp b/code/game/actor.cpp index 7c15c8bf..64023a15 100644 --- a/code/game/actor.cpp +++ b/code/game/actor.cpp @@ -37,10 +37,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "characterstate.h" #include "weaputils.h" #include "player.h" -#include #include "bg_local.h" #include "weapturret.h" #include "sentient.h" +#include +#include + #include Vector MINS(-15.0,-15.0,0.0); diff --git a/code/game/animate.cpp b/code/game/animate.cpp index 47db1bc0..e72ec871 100644 --- a/code/game/animate.cpp +++ b/code/game/animate.cpp @@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "animate.h" #include "../game/player.h" #include "../qcommon/qfiles.h" +#include // Leg Animation events Event EV_SetAnim diff --git a/code/game/entity.cpp b/code/game/entity.cpp index 72bb694c..74a0e079 100644 --- a/code/game/entity.cpp +++ b/code/game/entity.cpp @@ -54,6 +54,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "soundman.h" #include "../qcommon/qfiles.h" #include "g_spawn.h" +#include // Generic entity events Event EV_SoundDone diff --git a/code/game/g_main.cpp b/code/game/g_main.cpp index c5215faf..08489d0b 100644 --- a/code/game/g_main.cpp +++ b/code/game/g_main.cpp @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "lodthing.h" #include "viewthing.h" #include "playerbot.h" +#include #ifdef WIN32 #include @@ -109,32 +110,6 @@ void QDECL G_Error( int type, const char *fmt, ... ) assert( !text ); } -void* G_Malloc( int size ) -{ - return SV_Malloc( size ); -} - -void G_Free( void *ptr ) -{ - int zoneId = *( int * )( ( byte * )ptr - 4 ); - int size = ( int )( ( byte * )ptr - 16 ); - - assert( ptr ); - - if( zoneId == 0xC057 ) - return; - - assert( zoneId == 0x2015 ); - if( zoneId != 0x2015 ) - return; - - assert( *( unsigned int * )( *( unsigned int * )size + size - 4 ) == 0x2015 ); - if( *( unsigned int * )( *( unsigned int * )size + size - 4 ) != 0x2015 ) - return; - - SV_Free( ptr ); -} - /* =============== G_ExitWithError @@ -255,9 +230,6 @@ void G_InitGame( int levelTime, int randomSeed ) G_Printf( "gamename: %s\n", GAMEVERSION ); G_Printf( "gamedate: %s\n", __DATE__ ); - SV_Error = gi.Error; - gi.Error = G_Error; - srand( randomSeed ); CVAR_Init(); @@ -1470,14 +1442,6 @@ gameExport_t * GetGameAPI(gameImport_t * import) { gi = *import; -#ifdef _DEBUG - //SV_Malloc = gi.Malloc; - ///gi.Malloc = G_Malloc; - - //SV_Free = gi.Free; - //gi.Free = G_Free; -#endif - globals.apiversion = GAME_API_VERSION; globals.AllowPaused = G_AllowPaused; diff --git a/code/game/g_spawn.cpp b/code/game/g_spawn.cpp index 63f13ec9..f564089f 100644 --- a/code/game/g_spawn.cpp +++ b/code/game/g_spawn.cpp @@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "g_spawn.h" #include #include +#include #ifdef GAME_DLL #include "../game/entity.h" diff --git a/code/game/g_utils.cpp b/code/game/g_utils.cpp index dbd3252a..02e1f6fc 100644 --- a/code/game/g_utils.cpp +++ b/code/game/g_utils.cpp @@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "actor.h" #include "player.h" #include "playerbot.h" +#include typedef struct { char oldShader[MAX_QPATH]; diff --git a/code/game/navigate.cpp b/code/game/navigate.cpp index 58e26d30..d8324263 100644 --- a/code/game/navigate.cpp +++ b/code/game/navigate.cpp @@ -3260,7 +3260,8 @@ PathNode *PathSearch::FindCornerNodeForExactPath if (!PathSearch::FindPath(enemy->origin, pSelf->origin, pSelf, fMaxPath, 0, 0.0, 100)) return NULL; - int iDepth; + + size_t iDepth = 0; for (PathNode* pParentNode = Node->Parent; pParentNode; pParentNode = pParentNode->Parent, iDepth++) { pPathNode[iDepth] = pParentNode; @@ -3291,7 +3292,7 @@ PathNode *PathSearch::FindCornerNodeForExactPath } } - int index = i - 1; + size_t index = i - 1; if (index < iDepth) { if (index) diff --git a/code/game/scriptthread.cpp b/code/game/scriptthread.cpp index 1302c682..e9532113 100644 --- a/code/game/scriptthread.cpp +++ b/code/game/scriptthread.cpp @@ -2319,7 +2319,7 @@ ScriptThread::~ScriptThread() ScriptVM* vm = m_ScriptVM; if( !vm ) { - ScriptError( "Attempting to delete a dead thread." ); + throw ScriptException( "Attempting to delete a dead thread." ); } m_ScriptVM = NULL; @@ -2436,7 +2436,7 @@ void ScriptThread::FileOpen } else { - ev->AddInteger( (int)f ); + ev->AddInteger((int)(size_t)f); sprintf( buf, "%i", scriptfiles->integer + 1 ); glbs.Cvar_Set( "sv_scriptfiles", buf ); return; diff --git a/code/game/scriptvm.cpp b/code/game/scriptvm.cpp index 39d4330e..74d78f53 100644 --- a/code/game/scriptvm.cpp +++ b/code/game/scriptvm.cpp @@ -112,7 +112,7 @@ ScriptClass::ScriptClass() ScriptClass::~ScriptClass() { if (m_Script == NULL) { - ScriptError("Attempting to delete dead class."); + throw ScriptException("Attempting to delete dead class."); } KillThreads(); diff --git a/code/game/simpleactor.cpp b/code/game/simpleactor.cpp index 23a7e049..afd979a1 100644 --- a/code/game/simpleactor.cpp +++ b/code/game/simpleactor.cpp @@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "actor.h" #include "bg_local.h" +#include CLASS_DECLARATION( Sentient, SimpleActor, NULL ) { diff --git a/code/qcommon/alias.h b/code/qcommon/alias.h index e3ec8c30..30f155b2 100644 --- a/code/qcommon/alias.h +++ b/code/qcommon/alias.h @@ -34,10 +34,10 @@ extern "C" { const char * Alias_Find( const char * alias ); qboolean Alias_Add( const char * alias, const char * name, const char * parameters ); qboolean Alias_Delete( const char * alias ); -const char * Alias_FindRandom( const char * alias, AliasListNode_t **ret ); +const char * Alias_FindRandom( const char * alias, struct AliasListNode_s **ret ); void Alias_Dump( void ); void Alias_Clear( void ); -AliasList_t *Alias_GetGlobalList(); +struct AliasList_s *Alias_GetGlobalList(); int S_ChannelNameToNum( const char *pszName ); const char *S_ChannelNumToName( int iChannel ); diff --git a/code/qcommon/class.cpp b/code/qcommon/class.cpp index 4ea26e64..520756a6 100644 --- a/code/qcommon/class.cpp +++ b/code/qcommon/class.cpp @@ -237,10 +237,10 @@ void *Class::operator new( size_t s ) p = ( size_t * )gi.Malloc( s ); #elif defined ( CGAME_DLL ) p = ( size_t * )cgi.Malloc( s ); +#else + p = (size_t*)Z_Malloc(s); #endif - *p = s; - totalmemallocated += s; numclassesallocated++; @@ -260,6 +260,8 @@ void Class::operator delete( void *ptr ) gi.Free( p ); #elif defined ( CGAME_DLL ) cgi.Free( p ); +#else + Z_Free(p); #endif } diff --git a/code/qcommon/cm_polylib.c b/code/qcommon/cm_polylib.c index f4d6ce85..569b0299 100644 --- a/code/qcommon/cm_polylib.c +++ b/code/qcommon/cm_polylib.c @@ -272,11 +272,11 @@ CopyWinding */ winding_t *CopyWinding (winding_t *w) { - unsigned long size; + size_t size; winding_t *c; c = AllocWinding (w->numpoints); - size = (long)((winding_t *)0)->p[w->numpoints]; + size = (size_t)((winding_t *)0)->p[w->numpoints]; Com_Memcpy (c, w, size); return c; } diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp index b7b6b422..9b5d94d6 100644 --- a/code/qcommon/common.cpp +++ b/code/qcommon/common.cpp @@ -31,6 +31,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif +#include + extern "C" { cvar_t *sv_scriptfiles; diff --git a/code/qcommon/localization.cpp b/code/qcommon/localization.cpp index 3f1a47bb..7e55a13d 100644 --- a/code/qcommon/localization.cpp +++ b/code/qcommon/localization.cpp @@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // localization.cpp : Localization for different languages #include +#include cLocalization *g_localization; static char buf[ 1024 ]; diff --git a/code/qcommon/localization.h b/code/qcommon/localization.h index 203043e6..fc8a7153 100644 --- a/code/qcommon/localization.h +++ b/code/qcommon/localization.h @@ -30,7 +30,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "qcommon.h" #ifdef __cplusplus -#include +#include "str.h" +#include "container.h" typedef struct { str m_refName; diff --git a/code/qcommon/md5.c b/code/qcommon/md5.c index 61b5f160..424bd363 100644 --- a/code/qcommon/md5.c +++ b/code/qcommon/md5.c @@ -164,7 +164,7 @@ static void MD5Transform(uint32_t buf[4], * of bytes. */ static void MD5Update(struct MD5Context *ctx, unsigned char const *buf, - unsigned len) + size_t len) { uint32_t t; @@ -257,7 +257,7 @@ static void MD5Final(struct MD5Context *ctx, unsigned char *digest) } -char *Com_MD5File( const char *fn, int length, const char *prefix, int prefix_len ) +char *Com_MD5File( const char *fn, size_t length, const char *prefix, int prefix_len ) { static char final[33] = {""}; unsigned char digest[16] = {""}; @@ -265,9 +265,9 @@ char *Com_MD5File( const char *fn, int length, const char *prefix, int prefix_le MD5_CTX md5; byte buffer[2048]; int i; - int filelen = 0; - int r = 0; - int total = 0; + size_t filelen = 0; + size_t r = 0; + size_t total = 0; Q_strncpyz( final, "", sizeof( final ) ); diff --git a/code/qcommon/net_ip.c b/code/qcommon/net_ip.c index 6baedb8c..a665a242 100644 --- a/code/qcommon/net_ip.c +++ b/code/qcommon/net_ip.c @@ -27,10 +27,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include typedef int socklen_t; +#ifndef EAGAIN #define EAGAIN WSAEWOULDBLOCK #define EADDRNOTAVAIL WSAEADDRNOTAVAIL #define EAFNOSUPPORT WSAEAFNOSUPPORT #define ECONNRESET WSAECONNRESET +#endif #define socketError WSAGetLastError( ) static WSADATA winsockdata; diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h index 7a8fae94..ae8bf6f4 100644 --- a/code/qcommon/q_shared.h +++ b/code/qcommon/q_shared.h @@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ // -#ifndef __Q_SHARED_H -#define __Q_SHARED_H +#pragma once // q_shared.h -- included first by ALL program modules. // A user mod should never modify this file @@ -35,27 +34,28 @@ extern "C" { #if TARGET_GAME_TYPE == 1 -#define BASEGAME "mainta" -#define PRODUCT_EXTENSION "Spearhead target" -// The version string must be equal or above, otherwise it's not possible to connect to these servers -#define TARGET_GAME_VERSION "2.41" -#define TARGET_GAME_PROTOCOL 17 + #define BASEGAME "mainta" + #define PRODUCT_EXTENSION "Spearhead target" + // The version string must be equal or above 2.0 to be able to connect to spearhead servers + #define TARGET_GAME_VERSION "2.41" + #define TARGET_GAME_PROTOCOL 17 #elif TARGET_GAME_TYPE == 2 -#define BASEGAME "maintt" -#define PRODUCT_EXTENSION "Breakthrough target" -#define TARGET_GAME_VERSION "2.41" -#define TARGET_GAME_PROTOCOL 17 + #define BASEGAME "maintt" + #define PRODUCT_EXTENSION "Breakthrough target" + // The version string must be equal or above 2.0 to be able to connect to breakthrough servers + #define TARGET_GAME_VERSION "2.41" + #define TARGET_GAME_PROTOCOL 17 #else -// The default: the base game (no expansion) -#define BASEGAME "main" -#define PRODUCT_EXTENSION "Base" -// The version string must be below 1.12, otherwise it's not possible to connect -#define TARGET_GAME_VERSION "1.12" -#define TARGET_GAME_PROTOCOL 8 + // The default: the base game (no expansion) + #define BASEGAME "main" + #define PRODUCT_EXTENSION "Base" + // The version string must be below 1.12, otherwise it's not possible to connect + #define TARGET_GAME_VERSION "1.12" + #define TARGET_GAME_PROTOCOL 8 #endif @@ -2193,5 +2193,3 @@ typedef enum _flag_status { #if defined(__cplusplus) } #endif - -#endif // __Q_SHARED_H diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h index 336ea371..1f7c93f3 100644 --- a/code/qcommon/qcommon.h +++ b/code/qcommon/qcommon.h @@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define _QCOMMON_H_ #include "cm_public.h" -#include "tiki.h" #include "alias.h" //Ignore __attribute__ on non-gcc platforms @@ -256,7 +255,7 @@ PROTOCOL ============================================================== */ -#define PROTOCOL_VERSION 8 +#define PROTOCOL_VERSION TARGET_GAME_PROTOCOL // su44: MoHAA v 1.00 uses protocol version 6 // maintain a list of compatible protocols for demo playing @@ -859,7 +858,7 @@ typedef struct { struct tikiFrame_s *of; struct tikiFrame_s *nf; - dtiki_t *tiki; + struct dtiki_s *tiki; int bonestart; int morphstart; qboolean hasMorph; @@ -1036,7 +1035,7 @@ void Com_Quit_f( void ); int Com_Milliseconds( void ); // will be journaled properly unsigned Com_BlockChecksum( const void *buffer, int length ); -char *Com_MD5File(const char *filename, int length, const char *prefix, int prefix_len); +char *Com_MD5File(const char *filename, size_t length, const char *prefix, int prefix_len); int Com_HashKey(char *string, int maxlen); int Com_Filter(const char *filter, const char *name, int casesensitive); int Com_FilterPath(char *filter, char *name, int casesensitive); diff --git a/code/qcommon/tiki_main.cpp b/code/qcommon/tiki_main.cpp index 560e206c..dcbc5ef3 100644 --- a/code/qcommon/tiki_main.cpp +++ b/code/qcommon/tiki_main.cpp @@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "q_shared.h" #include "qcommon.h" +#include #include "../tiki/tiki_shared.h" int cache_numskel = 0; diff --git a/code/server/sv_world.c b/code/server/sv_world.c index dd67dd9d..c231cd9d 100644 --- a/code/server/sv_world.c +++ b/code/server/sv_world.c @@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // world.c -- world query functions #include "server.h" +#include /* ================ diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp index 2df3065e..d5c79bb9 100644 --- a/code/skeletor/skeletor.cpp +++ b/code/skeletor/skeletor.cpp @@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "q_shared.h" #include "qcommon.h" #include "skeletor.h" +#include #define EPSILON 0.000000000001f @@ -1001,7 +1002,7 @@ void skeletor_c::GetFrame( skelAnimFrame_t *newFrame ) } -SkelMat4 skeletor_c::GetBoneFrame( int boneIndex ) +SkelMat4 &skeletor_c::GetBoneFrame( int boneIndex ) { return m_bone[ boneIndex ]->GetTransform( &m_frameList ); } @@ -1011,7 +1012,6 @@ bool skeletor_c::IsBoneOnGround( int boneIndex, float threshold ) return GetBoneFrame( boneIndex ).val[ 3 ][ 2 ] < threshold; } - float skeletor_c::GetRadius() { return m_frameRadius; @@ -1111,33 +1111,25 @@ int skeletor_c::GetMorphWeightFrame( int *data ) if( m_headBoneIndex >= 0 && !VectorCompareEpsilon( m_eyeTargetPos, vec3_origin, EPSILON ) ) { - SkelVec3 lookPos; - SkelVec3 temp; - SkelMat4 headOrient; + SkelVec3 lookPos = m_eyeTargetPos; + const SkelMat4& headOrient = GetBoneFrame(m_headBoneIndex); SkelMat4 invHeadOrient; - float lookUpAmount; - float lookLeftAmount; - float l; - float s; - - lookPos = m_eyeTargetPos; - headOrient = GetBoneFrame( m_headBoneIndex ); invHeadOrient.TransposeRotOf( headOrient ); - temp = lookPos; + SkelVec3 temp = lookPos; lookPos[ 0 ] = temp[ 0 ] * invHeadOrient[ 0 ][ 0 ] * temp[ 1 ] * invHeadOrient[ 1 ][ 0 ] + temp[ 2 ] * invHeadOrient[ 2 ][ 0 ]; lookPos[ 1 ] = temp[ 0 ] * invHeadOrient[ 0 ][ 1 ] * temp[ 1 ] * invHeadOrient[ 1 ][ 1 ] + temp[ 2 ] * invHeadOrient[ 2 ][ 1 ]; lookPos[ 2 ] = temp[ 0 ] * invHeadOrient[ 0 ][ 2 ] * temp[ 1 ] * invHeadOrient[ 1 ][ 2 ] + temp[ 2 ] * invHeadOrient[ 2 ][ 2 ]; - lookLeftAmount = lookPos[ 2 ] * 100 + data[ m_targetLookLeft ] - data[ m_targetLookRight ]; - lookUpAmount = lookPos[ 0 ] * 100 + data[ m_targetLookUp ] - data[ m_targetLookDown ]; + float lookLeftAmount = lookPos[2] * 100 + data[m_targetLookLeft] - data[m_targetLookRight]; + float lookUpAmount = lookPos[0] * 100 + data[m_targetLookUp] - data[m_targetLookDown]; - s = VectorLengthSquared( lookPos ); + const float s = VectorLengthSquared( lookPos ); if( s == 0.0 ) { - lookPos[0 ] = 1.0; + lookPos[0] = 1.0; } else if( s != 1.0 ) { - l = 1.0 / sqrt( s ); + float l = 1.0 / sqrt( s ); VectorScale( lookPos, l, lookPos ); } diff --git a/code/skeletor/skeletor.h b/code/skeletor/skeletor.h index 3ed822be..b30a207b 100644 --- a/code/skeletor/skeletor.h +++ b/code/skeletor/skeletor.h @@ -115,7 +115,7 @@ public: void LoadMorphTargetNames( skelHeaderGame_t *modelHeader ); void GetFrame( skelAnimFrame_t *newFrame ); int GetMorphWeightFrame( int *data ); - SkelMat4 GetBoneFrame( int boneIndex ); + SkelMat4 &GetBoneFrame( int boneIndex ); void GetFrameBounds( SkelVec3 *, SkelVec3 * ); float GetModelLODRadius(); bool IsBoneOnGround( int boneIndex, float threshold ); diff --git a/code/skeletor/skeletor_imports.cpp b/code/skeletor/skeletor_imports.cpp index 21fb61e1..c40cc758 100644 --- a/code/skeletor/skeletor_imports.cpp +++ b/code/skeletor/skeletor_imports.cpp @@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "q_shared.h" #include "qcommon.h" +#include "skeletor.h" void Skel_DPrintf( const char *fmt, ... ) { diff --git a/code/skeletor/skeletor_internal.h b/code/skeletor/skeletor_internal.h index abc5270b..2c04a859 100644 --- a/code/skeletor/skeletor_internal.h +++ b/code/skeletor/skeletor_internal.h @@ -43,8 +43,8 @@ public: public: skelBone_Base(); - SkelMat4 GetTransform( const skelAnimStoreFrameList_c *frames ); - virtual SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frames ); + SkelMat4 &GetTransform( const skelAnimStoreFrameList_c *frames ); + virtual SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) = 0; void SetParent( skelBone_Base *parent ); virtual void SetBaseValue( boneData_t *boneData ); virtual int GetChannelIndex( int num ); @@ -60,7 +60,7 @@ public: skelBone_World(); private: - SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frames ); + SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override; void SetBaseValue( boneData_t *boneData ); int GetChannelIndex( int num ); skelBone_Base *GetBoneRef( int num ); @@ -68,7 +68,7 @@ private: class skelBone_Zero : public skelBone_Base { private: - SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frames ); + SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override; void SetBaseValue( boneData_t *boneData ); int GetChannelIndex( int num ); skelBone_Base *GetBoneRef( int num ); @@ -80,7 +80,7 @@ protected: int m_quatChannel; protected: - SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frames ); + SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override; public: void SetChannels( int num ); @@ -96,7 +96,7 @@ protected: public: protected: - SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frames ); + SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override; public: void SetChannels( int quatChannel, int offsetChannel ); void SetBaseValue( boneData_t *boneData ); @@ -106,7 +106,7 @@ public: class skelBone_Root : public skelBone_PosRot { public: - SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frames ); + SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override; }; class skelBone_IKshoulder : public skelBone_Base { @@ -121,7 +121,7 @@ public: skelBone_IKshoulder(); - SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frames ); + SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override; void SetBaseValue( boneData_t *boneData ); int GetChannelIndex( int num ); skelBone_Base *GetBoneRef( int num ); @@ -137,7 +137,7 @@ public: skelBone_IKshoulder *m_shoulder; public: - SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frames ); + SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override; void SetBoneRefs( skelBone_IKshoulder *shoulder ); void SetBaseValue( boneData_t *boneData ); int GetChannelIndex( int num ); @@ -151,7 +151,7 @@ public: int m_offsetChannel; public: - SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frame ); + SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frame ) override; void SetChannels( int quatChannel, int offsetChannel ); void SetBoneRefs( skelBone_IKshoulder *shoulder ); void SetBaseValue( boneData_t *boneData ); @@ -170,7 +170,7 @@ public: public: skelBone_AvRot(); - SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frames ); + SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override; void SetBoneRefs( skelBone_Base *ref1, skelBone_Base *ref2 ); void SetBaseValue( boneData_t *boneData ); int GetChannelIndex( int num ); @@ -187,8 +187,8 @@ public: float m_spinRatio; public: - SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frames ); - SkelMat4 GetDirtyTransform( SkelMat4& myParentTM, SkelMat4& targetTM ); + SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override; + SkelMat4 &GetDirtyTransform( SkelMat4& myParentTM, SkelMat4& targetTM ); void SetBoneRefs( skelBone_Base *ref ); void SetBaseValue( boneData_t *boneData ); int GetChannelIndex( int num ); @@ -197,13 +197,13 @@ public: class skelBone_HoseRotBoth : public skelBone_HoseRot { public: - SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frames ); + SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override; void SetBaseValue( boneData_t *boneData ); }; class skelBone_HoseRotParent : public skelBone_HoseRot { public: - SkelMat4 GetDirtyTransform( const skelAnimStoreFrameList_c *frames ); + SkelMat4 &GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override; void SetBaseValue( boneData_t *boneData ); }; diff --git a/code/skeletor/skeletorbones.cpp b/code/skeletor/skeletorbones.cpp index 5f1368c9..62369d8c 100644 --- a/code/skeletor/skeletorbones.cpp +++ b/code/skeletor/skeletorbones.cpp @@ -488,7 +488,7 @@ int skelBone_Base::GetNumBoneRefs( boneType_t boneType ) } } -SkelMat4 skelBone_Base::GetTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_Base::GetTransform( const skelAnimStoreFrameList_c *frames ) { if( m_isDirty ) { @@ -500,11 +500,6 @@ SkelMat4 skelBone_Base::GetTransform( const skelAnimStoreFrameList_c *frames ) } } -SkelMat4 skelBone_Base::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) -{ - return 0; -} - void skelBone_Base::SetParent( skelBone_Base *parent ) { m_parent = parent; @@ -529,7 +524,7 @@ skelBone_Base *skelBone_Base::Parent() const return m_parent; } -SkelMat4 skelBone_Zero::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_Zero::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) { if( m_parent ) { @@ -554,7 +549,7 @@ skelBone_Base *skelBone_Zero::GetBoneRef( int num ) return NULL; } -SkelMat4 skelBone_Rotation::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_Rotation::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) { SkelMat4 incomingValue; SkelQuat incomingQuat; @@ -607,7 +602,7 @@ skelBone_Base *skelBone_Rotation::GetBoneRef( int bone ) return 0; } -SkelMat4 skelBone_PosRot::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_PosRot::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) { SkelVec3 incomingOffset; SkelMat4 incomingValue; @@ -668,7 +663,7 @@ skelBone_Base *skelBone_PosRot::GetBoneRef( int num ) return NULL; } -SkelMat4 skelBone_Root::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_Root::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) { SkelVec3 incomingOffset; SkelMat4 incomingValue; @@ -707,7 +702,7 @@ skelBone_IKshoulder::skelBone_IKshoulder() m_wrist = NULL; } -SkelMat4 skelBone_IKshoulder::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_IKshoulder::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) { SkelMat4 baseMatrix, targetMatrix; float desiredLength; @@ -857,7 +852,7 @@ float skelBone_IKshoulder::GetLowerLength() return m_lowerLength; } -SkelMat4 skelBone_IKwrist::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_IKwrist::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) { if( m_shoulder->m_isDirty ) { m_shoulder->GetDirtyTransform( frames ); @@ -896,7 +891,7 @@ skelBone_Base *skelBone_IKwrist::GetBoneRef( int num ) return m_shoulder; } -SkelMat4 skelBone_IKelbow::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_IKelbow::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) { float fLength; float cosA, sinA; @@ -955,7 +950,7 @@ skelBone_AvRot::skelBone_AvRot() m_reference2 = NULL; } -SkelMat4 skelBone_AvRot::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_AvRot::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) { SkelQuat temp1, temp2; SkelMat4 temp; @@ -1010,7 +1005,7 @@ skelBone_Base *skelBone_AvRot::GetBoneRef( int num ) } } -SkelMat4 skelBone_HoseRot::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_HoseRot::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) { SkelMat4 mat; @@ -1022,7 +1017,7 @@ SkelMat4 skelBone_HoseRot::GetDirtyTransform( const skelAnimStoreFrameList_c *fr return GetDirtyTransform( mat, m_target->GetTransform( frames ) ); } -SkelMat4 skelBone_HoseRot::GetDirtyTransform( SkelMat4& myParentTM, SkelMat4& targetTM ) +SkelMat4 &skelBone_HoseRot::GetDirtyTransform( SkelMat4& myParentTM, SkelMat4& targetTM ) { SkelMat4 m; SkelMat4 invParentTM; @@ -1139,7 +1134,7 @@ skelBone_Base *skelBone_HoseRot::GetBoneRef( int num ) return m_target; } -SkelMat4 skelBone_HoseRotBoth::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_HoseRotBoth::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) { SkelMat4 myParentTM; SkelMat4 targetTM; @@ -1165,7 +1160,7 @@ void skelBone_HoseRotBoth::SetBaseValue( boneData_t *boneData ) m_basePos.z = -m_basePos.z; } -SkelMat4 skelBone_HoseRotParent::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_HoseRotParent::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) { SkelMat4 myParentTM; SkelMat4 targetTM; @@ -1189,7 +1184,7 @@ void skelBone_HoseRotParent::SetBaseValue( boneData_t *boneData ) m_basePos.z = -m_basePos.z; } -SkelMat4 skelBone_World::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) +SkelMat4 &skelBone_World::GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) { m_cachedValue.MakeIdentity(); m_isDirty = false; diff --git a/code/tiki/tiki_files.h b/code/tiki/tiki_files.h index a92ccd8f..0ab8b3ec 100644 --- a/code/tiki/tiki_files.h +++ b/code/tiki/tiki_files.h @@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifndef __TIKI_FILES_H__ #define __TIKI_FILES_H__ +#include + #ifdef __cplusplus extern "C" { #endif diff --git a/code/tiki/tiki_imports.cpp b/code/tiki/tiki_imports.cpp index 6a142243..837f6762 100644 --- a/code/tiki/tiki_imports.cpp +++ b/code/tiki/tiki_imports.cpp @@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "q_shared.h" #include "qcommon.h" +#include "tiki_imports.h" void TIKI_DPrintf( const char *fmt, ... ) { diff --git a/code/tiki/tiki_imports.h b/code/tiki/tiki_imports.h index 9903d6d2..50f5208c 100644 --- a/code/tiki/tiki_imports.h +++ b/code/tiki/tiki_imports.h @@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // tiki_imports.h : TIKI Imports -#ifndef __TIKI_IMPORTS_H__ -#define __TIKI_IMPORTS_H__ +#pragma once #ifdef __cplusplus extern "C" { @@ -45,5 +44,3 @@ int TIKI_ReadFileEx( const char *qpath, void **buffer, qboolean quiet ); #ifdef __cplusplus } #endif - -#endif // __TIKI_IMPORTS_H__ diff --git a/code/tiki/tiki_surface.cpp b/code/tiki/tiki_surface.cpp index a0d84352..ce5a4de3 100644 --- a/code/tiki/tiki_surface.cpp +++ b/code/tiki/tiki_surface.cpp @@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "q_shared.h" #include "qcommon.h" +#include /* =============== diff --git a/code/tiki/tiki_utility.cpp b/code/tiki/tiki_utility.cpp index c868bdd7..eb828d68 100644 --- a/code/tiki/tiki_utility.cpp +++ b/code/tiki/tiki_utility.cpp @@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "q_shared.h" #include "qcommon.h" #include "tiki_shared.h" +#include "tiki_utility.h" /* ===============