fix inventory initialization

Author: mastercoms

src/game/server/gameinterface.cpp

@@ -565,6 +565,8 @@ EXPOSE_SINGLE_INTERFACE_GLOBALVAR(CServerGameDLL, IServerGameDLL, INTERFACEVERSI
 // When bumping the version to this interface, check that our assumption is still valid and expose the older version in the same way
 COMPILE_TIME_ASSERT( INTERFACEVERSION_SERVERGAMEDLL_INT == 10 );
 
+static bool bParsedParticles = false;
+
 bool CServerGameDLL::DLLInit( CreateInterfaceFn appSystemFactory, 
 		CreateInterfaceFn physicsFactory, CreateInterfaceFn fileSystemFactory, 
 		CGlobalVars *pGlobals)
@@ -727,7 +729,11 @@ bool CServerGameDLL::DLLInit( CreateInterfaceFn appSystemFactory,
 	InvalidateQueryCache();
 
 	// Parse the particle manifest file & register the effects within it
-	ParseParticleEffects( false, false );
+	if ( engine->IsDedicatedServer() )
+	{
+		ParseParticleEffects( false, false );
+		bParsedParticles = true;
+	}
 
 	// try to get debug overlay, may be NULL if on HLDS
 	debugoverlay = (IVDebugOverlay *)appSystemFactory( VDEBUG_OVERLAY_INTERFACE_VERSION, NULL );
@@ -958,6 +964,11 @@ bool CServerGameDLL::LevelInit( const char *pMapName, char const *pMapEntities,
 	if ( pItemSchema )
 	{
 		pItemSchema->BInitFromDelayedBuffer();
+		// First valid class must be non-zero if we have a valid schema
+		if ( pItemSchema->GetFirstValidClass() == 0 )
+		{
+			InventoryManager()->InitializeInventory();
+		}
 	}
 #endif // USES_ECON_ITEMS
 
@@ -970,6 +981,12 @@ bool CServerGameDLL::LevelInit( const char *pMapName, char const *pMapEntities,
 		UpdateRichPresence();
 	}
 
+	if ( !bParsedParticles )
+	{
+		ParseParticleEffects( false, false );
+		bParsedParticles = true;
+	}
+
 	//Tony; parse custom manifest if exists!
 	ParseParticleEffectsMap( pMapName, false );
 

src/game/shared/econ/econ_item_inventory.cpp

@@ -296,13 +296,23 @@ void CInventoryManager::OnPersonaStateChanged( PersonaStateChange_t *info )
 //-----------------------------------------------------------------------------
 bool CInventoryManager::Init( void )
 {
+#ifdef GAME_DLL
+	if ( engine->IsDedicatedServer() )
+#endif
+	{
+		InitializeInventory();
+	}
 	return true;
 }
 
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
 void CInventoryManager::PostInit( void )
+{
+}
+
+void CInventoryManager::InitializeInventory()
 {
 	// Initialize the item system.
 	ItemSystem()->Init();
@@ -443,7 +453,6 @@ void CInventoryManager::LevelShutdownPostEntity( void )
 	ItemSystem()->ResetAttribStringCache();
 }
 
-
 //-----------------------------------------------------------------------------
 // Purpose: Lets the client know that we're now connected to the GC
 //-----------------------------------------------------------------------------

src/game/shared/econ/econ_item_inventory.h

@@ -216,6 +216,8 @@ class CInventoryManager : public CAutoGameSystemPerFrame
 	virtual void LevelInitPreEntity( void ) OVERRIDE;
 	virtual void LevelShutdownPostEntity( void ) OVERRIDE;
 
+	virtual void InitializeInventory( void );
+
 #ifdef CLIENT_DLL
 	// Gets called each frame
 	virtual void Update( float frametime ) OVERRIDE;

src/game/shared/tf/tf_item_inventory.cpp

@@ -220,6 +220,11 @@ CTFInventoryManager::~CTFInventoryManager( void )
 void CTFInventoryManager::PostInit( void )
 {
 	BaseClass::PostInit();
+}
+
+void CTFInventoryManager::InitializeInventory()
+{
+	BaseClass::InitializeInventory();
 	GenerateBaseItems();
 }
 

src/game/shared/tf/tf_item_inventory.h

@@ -150,6 +150,7 @@ class CTFInventoryManager : public CInventoryManager
 	~CTFInventoryManager();
 
 	virtual void		PostInit( void );
+	virtual void		InitializeInventory();
 
 #ifdef CLIENT_DLL
 	virtual CPlayerInventory *GeneratePlayerInventoryObject() const { return new CTFPlayerInventory; }