From eff77f0a0abbe39be5c85b018ece9195ad95f7b5 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Fri, 16 Dec 2022 19:20:56 +0300 Subject: [PATCH] windows: fix 64bit build( #149 ) --- game/client/client_thinklist.cpp | 4 ++-- game/client/client_thinklist.h | 2 +- game/client/clientleafsystem.cpp | 2 +- ivp | 2 +- public/tier1/memhelpers.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/game/client/client_thinklist.cpp b/game/client/client_thinklist.cpp index eae2d880..bbb70a7b 100644 --- a/game/client/client_thinklist.cpp +++ b/game/client/client_thinklist.cpp @@ -158,7 +158,7 @@ void CClientThinkList::RemoveThinkable( ClientThinkHandle_t hThink ) { pThink->SetThinkHandle( INVALID_THINK_HANDLE ); } - m_ThinkEntries.Remove( (unsigned long)hThink ); + m_ThinkEntries.Remove( (uintp)hThink ); } @@ -304,7 +304,7 @@ void CClientThinkList::PerformThinkFunctions() if ( hThink != INVALID_THINK_HANDLE ) { // This can happen if the same think handle was removed twice - if ( !m_ThinkEntries.IsInList( (unsigned long)hThink ) ) + if ( !m_ThinkEntries.IsInList( (uintp)hThink ) ) continue; // NOTE: This is necessary for the case where the client entity handle diff --git a/game/client/client_thinklist.h b/game/client/client_thinklist.h index 3d3e1744..9d3b3b54 100644 --- a/game/client/client_thinklist.h +++ b/game/client/client_thinklist.h @@ -121,7 +121,7 @@ inline ClientThinkHandle_t CClientThinkList::GetInvalidThinkHandle() inline CClientThinkList::ThinkEntry_t* CClientThinkList::GetThinkEntry( ClientThinkHandle_t hThink ) { - return &m_ThinkEntries[ (unsigned long)hThink ]; + return &m_ThinkEntries[ (uintp)hThink ]; } diff --git a/game/client/clientleafsystem.cpp b/game/client/clientleafsystem.cpp index f8e46d88..c00481fd 100644 --- a/game/client/clientleafsystem.cpp +++ b/game/client/clientleafsystem.cpp @@ -1337,7 +1337,7 @@ void CClientLeafSystem::ComputeTranslucentRenderLeaf( int count, const LeafIndex static CUtlVector orderedList; // @MULTICORE (toml 8/30/2006): will need to make non-static if thread this function static CUtlVector renderablesToUpdate; - int leaf = 0; + intp leaf = 0; for ( i = 0; i < count; ++i ) { leaf = pLeafList[i]; diff --git a/ivp b/ivp index dfa42eb5..960c7228 160000 --- a/ivp +++ b/ivp @@ -1 +1 @@ -Subproject commit dfa42eb575618661a9c41c2ed635c1b9a0a51858 +Subproject commit 960c7228f8e8d710625891991e88b1ec3aa92e45 diff --git a/public/tier1/memhelpers.h b/public/tier1/memhelpers.h index 898cafb2..296a566b 100644 --- a/public/tier1/memhelpers.h +++ b/public/tier1/memhelpers.h @@ -19,7 +19,7 @@ namespace memutils } template - inline void set( T *dest, T value, size_t n ) + inline void set( T *dest, const T &value, size_t n ) { do {