Skip to content

Commit a709667

Browse files
authored
Merge pull request #301 from tyabus/vguidrawtree
engine: Fixed vgui_drawtree on 64 bit engine
2 parents c444095 + 1f3f05d commit a709667

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

engine/vgui_drawtreepanel.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ class CDrawTreeFrame : public vgui::Frame
268268

269269
if ( data )
270270
{
271-
g_DrawTreeSelectedPanel = (data) ? (vgui::VPANEL)data->GetInt( "PanelPtr", 0 ) : 0;
271+
g_DrawTreeSelectedPanel = (data) ? (vgui::VPANEL)data->GetPtr( "PanelPtr", 0 ) : 0;
272272
}
273273
else
274274
{
@@ -388,7 +388,7 @@ void VGui_RecursivePrintTree(
388388
Q_snprintf( str, sizeof( str ), "%s", name );
389389

390390
pVal->SetString( "Text", str );
391-
pVal->SetInt( "PanelPtr", current );
391+
pVal->SetPtr( "PanelPtr", (void*)current );
392392

393393
pNewParent = pVal;
394394

@@ -417,23 +417,23 @@ bool UpdateItemState(
417417
vgui::IPanel *ipanel = vgui::ipanel();
418418

419419
KeyValues *pItemData = pTree->GetItemData( iChildItemId );
420-
if ( pItemData->GetInt( "PanelPtr" ) != pSub->GetInt( "PanelPtr" ) ||
420+
if ( pItemData->GetPtr( "PanelPtr" ) != pSub->GetPtr( "PanelPtr" ) ||
421421
Q_stricmp( pItemData->GetString( "Text" ), pSub->GetString( "Text" ) ) != 0 )
422422
{
423423
pTree->ModifyItem( iChildItemId, pSub );
424424
bRet = true;
425425
}
426426

427427
// Ok, this is a new panel.
428-
vgui::VPANEL vPanel = pSub->GetInt( "PanelPtr" );
428+
vgui::VPANEL vPanel = (vgui::VPANEL)pSub->GetPtr( "PanelPtr" );
429429

430430
int iBaseColor[3] = { 255, 255, 255 };
431431
if ( ipanel->IsPopup( vPanel ) )
432432
{
433433
iBaseColor[0] = 255; iBaseColor[1] = 255; iBaseColor[2] = 0;
434434
}
435435

436-
if ( g_FocusPanelList.Find( vPanel ) != -1 )
436+
if ( g_FocusPanelList.Find( vPanel ) != vgui::INVALID_PANEL )
437437
{
438438
iBaseColor[0] = 0; iBaseColor[1] = 255; iBaseColor[2] = 0;
439439
pTree->ExpandItem( iChildItemId, true );

0 commit comments

Comments
 (0)