Initial Mapbase commit (squashed from mapbase-beta)

This commit is contained in:
Blixibon
2019-08-31 19:28:20 +00:00
parent 0d8dceea43
commit 3d464bc051
816 changed files with 105527 additions and 957 deletions

View File

@@ -59,6 +59,10 @@ BEGIN_SEND_TABLE_NOBASE( CPlayerLocalData, DT_Local )
// 3d skybox data
SendPropInt(SENDINFO_STRUCTELEM(m_skybox3d.scale), 12),
SendPropVector (SENDINFO_STRUCTELEM(m_skybox3d.origin), -1, SPROP_COORD),
#ifdef MAPBASE
SendPropVector (SENDINFO_STRUCTELEM(m_skybox3d.angles), -1, SPROP_COORD),
SendPropInt (SENDINFO_STRUCTELEM(m_skybox3d.skycolor), 32, (SPROP_COORD|SPROP_UNSIGNED), SendProxy_Color32ToInt),
#endif
SendPropInt (SENDINFO_STRUCTELEM(m_skybox3d.area), 8, SPROP_UNSIGNED ),
SendPropInt( SENDINFO_STRUCTELEM( m_skybox3d.fog.enable ), 1, SPROP_UNSIGNED ),
SendPropInt( SENDINFO_STRUCTELEM( m_skybox3d.fog.blend ), 1, SPROP_UNSIGNED ),
@@ -68,6 +72,9 @@ BEGIN_SEND_TABLE_NOBASE( CPlayerLocalData, DT_Local )
SendPropFloat( SENDINFO_STRUCTELEM( m_skybox3d.fog.start ), 0, SPROP_NOSCALE ),
SendPropFloat( SENDINFO_STRUCTELEM( m_skybox3d.fog.end ), 0, SPROP_NOSCALE ),
SendPropFloat( SENDINFO_STRUCTELEM( m_skybox3d.fog.maxdensity ), 0, SPROP_NOSCALE ),
#ifdef MAPBASE
SendPropFloat( SENDINFO_STRUCTELEM( m_skybox3d.fog.farz ), 0, SPROP_NOSCALE ),
#endif
SendPropEHandle( SENDINFO_STRUCTELEM( m_PlayerFog.m_hCtrl ) ),
@@ -119,6 +126,10 @@ BEGIN_SIMPLE_DATADESC( sky3dparams_t )
DEFINE_FIELD( scale, FIELD_INTEGER ),
DEFINE_FIELD( origin, FIELD_VECTOR ),
#ifdef MAPBASE
DEFINE_FIELD( angles, FIELD_VECTOR ),
DEFINE_FIELD( skycolor, FIELD_COLOR32 ),
#endif
DEFINE_FIELD( area, FIELD_INTEGER ),
DEFINE_EMBEDDED( fog ),
@@ -223,6 +234,18 @@ void ClientData_Update( CBasePlayer *pl )
// HACKHACK: for 3d skybox
// UNDONE: Support multiple sky cameras?
CSkyCamera *pSkyCamera = GetCurrentSkyCamera();
#ifdef MAPBASE
// Needs null protection now that the sky can go from valid to null
if ( !pSkyCamera )
{
pl->m_Local.m_skybox3d.area = 255;
}
else if ( pSkyCamera != pl->m_Local.m_pOldSkyCamera )
{
pl->m_Local.m_pOldSkyCamera = pSkyCamera;
pl->m_Local.m_skybox3d.CopyFrom(pSkyCamera->m_skyboxData);
}
#else
if ( pSkyCamera != pl->m_Local.m_pOldSkyCamera )
{
pl->m_Local.m_pOldSkyCamera = pSkyCamera;
@@ -232,6 +255,7 @@ void ClientData_Update( CBasePlayer *pl )
{
pl->m_Local.m_skybox3d.area = 255;
}
#endif
}