mirror of
https://github.com/nillerusr/source-engine.git
synced 2026-08-07 17:29:36 +00:00
amd64: fix multithread, fix vgui, fix physmodels
This commit is contained in:
@@ -41,6 +41,7 @@
|
||||
#include "filesystem.h"
|
||||
#include "tier0/icommandline.h"
|
||||
#include "const.h"
|
||||
#include "vprof.h"
|
||||
|
||||
#if defined( _X360 )
|
||||
#include "xbox/xbox_win32stubs.h"
|
||||
@@ -869,18 +870,6 @@ void BuildGroup::PanelAdded(Panel *panel)
|
||||
_panelDar.AddToTail(temp);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: Add panel the list of panels that are in the build group
|
||||
//-----------------------------------------------------------------------------
|
||||
void BuildGroup::PanelRemoved(Panel *panel)
|
||||
{
|
||||
Assert(panel);
|
||||
|
||||
PHandle temp;
|
||||
temp = panel;
|
||||
_panelDar.FindAndRemove(temp);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: loads the control settings from file
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -1553,4 +1542,4 @@ void BuildGroup::ClearResFileCache()
|
||||
nIndex = m_dictCachedResFiles.Next( nIndex );
|
||||
}
|
||||
m_dictCachedResFiles.Purge();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3800,17 +3800,11 @@ void Panel::SetTall(int tall)
|
||||
|
||||
void Panel::SetBuildGroup(BuildGroup* buildGroup)
|
||||
{
|
||||
if ( _buildGroup == buildGroup )
|
||||
return;
|
||||
if ( _buildGroup.Get() )
|
||||
{
|
||||
_buildGroup->PanelRemoved( this );
|
||||
}
|
||||
_buildGroup = buildGroup;
|
||||
if ( _buildGroup.Get() )
|
||||
{
|
||||
//TODO: remove from old group
|
||||
|
||||
Assert(buildGroup != NULL);
|
||||
_buildGroup = buildGroup;
|
||||
_buildGroup->PanelAdded(this);
|
||||
}
|
||||
}
|
||||
|
||||
bool Panel::IsBuildGroupEnabled()
|
||||
@@ -5142,7 +5136,7 @@ void Panel::OnMessage(const KeyValues *params, VPANEL ifromPanel)
|
||||
{
|
||||
typedef void (Panel::*MessageFunc_HandleConstCharPtr_t)(VPANEL, VPANEL);
|
||||
VPANEL vp1 = ivgui()->HandleToPanel( param1->GetInt() );
|
||||
VPANEL vp2 = ivgui()->HandleToPanel( param1->GetInt() );
|
||||
VPANEL vp2 = ivgui()->HandleToPanel( param2->GetInt() );
|
||||
(this->*((MessageFunc_HandleConstCharPtr_t)pMap->func))( vp1, vp2 );
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user