celisej567/cool-source-archive
1
0
Fork 0
mirror of https://github.com/celisej567/cool-source-archive.git synced 2026-01-04 14:11:16 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bsp 20 compatibility

Browse Source
This commit is contained in:
Fisual
2021-12-06 19:06:10 +07:00
parent d18a4d4b1c
commit af90a10c49
5 changed files with 677 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
engine/modelloader.cpp
View File

@@ -418,6 +418,8 @@ int CMapLoadHelper::GetRefCount()
return s_nMapLoadRecursion;
}
int bspver;
//-----------------------------------------------------------------------------
// Setup a BSP loading context, maintains a ref count.
//-----------------------------------------------------------------------------
@@ -481,6 +483,8 @@ void CMapLoadHelper::Init( model_t *pMapModel, const char *loadname )
InitDLightGlobals( s_MapHeader.version );
#endif
bspver = s_MapHeader.version;
s_pMap = &g_ModelLoader.m_worldBrushData;
// lump_t fix for l4d2 maps
@@ -549,6 +553,11 @@ void CMapLoadHelper::Init( model_t *pMapModel, const char *loadname )
#endif
}
int GetBSPVersion()
{
return bspver;
}
//-----------------------------------------------------------------------------
// Setup a BSP loading context from a supplied buffer
//-----------------------------------------------------------------------------
@@ -1225,7 +1234,7 @@ void Mod_LoadWorldlights( CMapLoadHelper &lh, bool bIsHDR )
break;
}
}
}
#if !defined( SWDS )
if ( r_lightcache_zbuffercache.GetInt() )
{

20
engine/staticpropmgr.cpp
View File

@@ -1392,6 +1392,8 @@ void UnserializeLump<StaticPropLump_t>(StaticPropLump_t* _output, CUtlBuffer& bu
buf.Get(_output, sizeof(StaticPropLump_t));
}
extern int GetBSPVersion();
void CStaticPropMgr::UnserializeModels( CUtlBuffer& buf )
{
// Version check
@@ -1419,16 +1421,28 @@ void CStaticPropMgr::UnserializeModels( CUtlBuffer& buf )
case 7: UnserializeLump<StaticPropLumpV7_t>(&lump, buf); break;
case 8: UnserializeLump<StaticPropLumpV8_t>(&lump, buf); break;
case 9: UnserializeLump<StaticPropLumpV9_t>(&lump, buf); break;
case 10: UnserializeLump<StaticPropLumpV10_t>(&lump, buf); break;
case 10:
{
if (GetBSPVersion() == 20)
{
UnserializeLump<StaticPropLumpV7_TF2_t>(&lump, buf);
break;
}
else
{
UnserializeLump<StaticPropLumpV7_t>(&lump, buf);
break;
}
}
case 11: UnserializeLump<StaticPropLumpV11_t>(&lump, buf); break;
case 12: UnserializeLump<StaticPropLump_t>(&lump, buf); break;
break;
default:
Assert("Unexpected version while deserializing lumps.");
Error("Unexpected version while deserializing lumps.");
}
m_StaticProps[i].Init( i, lump, m_StaticPropDict[lump.m_PropType].m_pModel );
m_StaticProps[i].Init(i, lump, m_StaticPropDict[lump.m_PropType].m_pModel);
// For distance-based fading, keep a list of the things that need
// to be faded out. Not sure if this is the optimal way of doing it