mirror of
https://github.com/nillerusr/source-engine.git
synced 2026-08-08 09:49:36 +00:00
WIP: fix compilation issues
This commit is contained in:
@@ -67,8 +67,8 @@
|
||||
#include "cbase.h"
|
||||
#include "env_wind_shared.h"
|
||||
#include "soundenvelope.h"
|
||||
#include "ieffects.h"
|
||||
#include "engine/ienginesound.h"
|
||||
#include "IEffects.h"
|
||||
#include "engine/IEngineSound.h"
|
||||
#include "sharedinterface.h"
|
||||
#include "renderparm.h"
|
||||
|
||||
|
||||
@@ -26,10 +26,10 @@ ISaveRestoreOps *GetPhysObjSaveRestoreOps( PhysInterfaceId_t );
|
||||
//-------------------------------------
|
||||
|
||||
#define DEFINE_PHYSPTR(name) \
|
||||
{ FIELD_CUSTOM, #name, offsetof(classNameTypedef,name), 1, FTYPEDESC_SAVE, NULL, GetPhysObjSaveRestoreOps( GetPhysIID( &(((classNameTypedef *)0)->name) ) ), NULL }
|
||||
{ FIELD_CUSTOM, #name, {offsetof(classNameTypedef,name), 0}, 1, FTYPEDESC_SAVE, NULL, GetPhysObjSaveRestoreOps( GetPhysIID( &(((classNameTypedef *)0)->name) ) ), NULL }
|
||||
|
||||
#define DEFINE_PHYSPTR_ARRAY(name) \
|
||||
{ FIELD_CUSTOM, #name, offsetof(classNameTypedef,name), ARRAYSIZE(((classNameTypedef *)0)->name), FTYPEDESC_SAVE, NULL, GetPhysObjSaveRestoreOps( GetPhysIID( &(((classNameTypedef *)0)->name[0]) ) ), NULL }
|
||||
{ FIELD_CUSTOM, #name, {offsetof(classNameTypedef,name), 0}, ARRAYSIZE(((classNameTypedef *)0)->name), FTYPEDESC_SAVE, NULL, GetPhysObjSaveRestoreOps( GetPhysIID( &(((classNameTypedef *)0)->name[0]) ) ), NULL }
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============//
|
||||
//========= Copyright Valve Corporation, All rights reserved. ============//
|
||||
//
|
||||
// Purpose:
|
||||
//
|
||||
@@ -34,7 +34,7 @@ public:
|
||||
{
|
||||
(fieldtype_t)FIELD_TYPE,
|
||||
"elems",
|
||||
0,
|
||||
{ 0, 0 },
|
||||
1,
|
||||
FTYPEDESC_SAVE,
|
||||
NULL,
|
||||
@@ -50,8 +50,9 @@ public:
|
||||
1,
|
||||
"uv",
|
||||
NULL,
|
||||
false,
|
||||
false,
|
||||
0,
|
||||
NULL,
|
||||
#ifdef _DEBUG
|
||||
true
|
||||
#endif
|
||||
@@ -86,7 +87,7 @@ public:
|
||||
{
|
||||
(fieldtype_t)FIELD_TYPE,
|
||||
"elems",
|
||||
0,
|
||||
{ 0, 0 },
|
||||
1,
|
||||
FTYPEDESC_SAVE,
|
||||
NULL,
|
||||
@@ -102,8 +103,9 @@ public:
|
||||
1,
|
||||
"uv",
|
||||
NULL,
|
||||
false,
|
||||
false,
|
||||
0,
|
||||
NULL,
|
||||
#ifdef _DEBUG
|
||||
true
|
||||
#endif
|
||||
@@ -171,10 +173,10 @@ public:
|
||||
//-------------------------------------
|
||||
|
||||
#define DEFINE_UTLVECTOR(name,fieldtype) \
|
||||
{ FIELD_CUSTOM, #name, offsetof(classNameTypedef,name), 1, FTYPEDESC_SAVE, NULL, CUtlVectorDataopsInstantiator<fieldtype>::GetDataOps(&(((classNameTypedef *)0)->name)), NULL }
|
||||
{ FIELD_CUSTOM, #name, { offsetof(classNameTypedef,name), 0 }, 1, FTYPEDESC_SAVE, NULL, CUtlVectorDataopsInstantiator<fieldtype>::GetDataOps(&(((classNameTypedef *)0)->name)), NULL }
|
||||
|
||||
#define DEFINE_GLOBAL_UTLVECTOR(name,fieldtype) \
|
||||
{ FIELD_CUSTOM, #name, offsetof(classNameTypedef,name), 1, FTYPEDESC_SAVE|FTYPEDESC_GLOBAL, NULL, CUtlVectorDataopsInstantiator<fieldtype>::GetDataOps(&(((classNameTypedef *)0)->name)), NULL }
|
||||
{ FIELD_CUSTOM, #name, { offsetof(classNameTypedef,name), 0 }, 1, FTYPEDESC_SAVE|FTYPEDESC_GLOBAL, NULL, CUtlVectorDataopsInstantiator<fieldtype>::GetDataOps(&(((classNameTypedef *)0)->name)), NULL }
|
||||
|
||||
|
||||
#endif // SAVERESTORE_UTLVECTOR_H
|
||||
|
||||
@@ -99,7 +99,7 @@ class ISaveRestoreOps;
|
||||
ISaveRestoreOps *GetSoundSaveRestoreOps( );
|
||||
|
||||
#define DEFINE_SOUNDPATCH(name) \
|
||||
{ FIELD_CUSTOM, #name, offsetof(classNameTypedef,name), 1, FTYPEDESC_SAVE, NULL, GetSoundSaveRestoreOps( ), NULL }
|
||||
{ FIELD_CUSTOM, #name, {offsetof(classNameTypedef,name), 0}, 1, FTYPEDESC_SAVE, NULL, GetSoundSaveRestoreOps( ), NULL }
|
||||
|
||||
|
||||
#endif // SOUNDENVELOPE_H
|
||||
|
||||
@@ -451,7 +451,7 @@ void UTIL_TraceEntity( CBaseEntity *pEntity, const Vector &vecAbsStart, const Ve
|
||||
|
||||
bool UTIL_EntityHasMatchingRootParent( CBaseEntity *pRootParent, CBaseEntity *pEntity );
|
||||
|
||||
inline int UTIL_PointContents( const Vector &vec, int contentsMask )
|
||||
inline int UTIL_PointContents( const Vector &vec, int contentsMask = 0 )
|
||||
{
|
||||
return enginetrace->GetPointContents( vec, contentsMask );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user