Browse Source

windows: fix 64bit build( #149 )

win64
nillerusr 2 years ago
parent
commit
eff77f0a0a
  1. 4
      game/client/client_thinklist.cpp
  2. 2
      game/client/client_thinklist.h
  3. 2
      game/client/clientleafsystem.cpp
  4. 2
      ivp
  5. 2
      public/tier1/memhelpers.h

4
game/client/client_thinklist.cpp

@ -158,7 +158,7 @@ void CClientThinkList::RemoveThinkable( ClientThinkHandle_t hThink ) @@ -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() @@ -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

2
game/client/client_thinklist.h

@ -121,7 +121,7 @@ inline ClientThinkHandle_t CClientThinkList::GetInvalidThinkHandle() @@ -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 ];
}

2
game/client/clientleafsystem.cpp

@ -1337,7 +1337,7 @@ void CClientLeafSystem::ComputeTranslucentRenderLeaf( int count, const LeafIndex @@ -1337,7 +1337,7 @@ void CClientLeafSystem::ComputeTranslucentRenderLeaf( int count, const LeafIndex
static CUtlVector<RenderableInfo_t *> orderedList; // @MULTICORE (toml 8/30/2006): will need to make non-static if thread this function
static CUtlVector<IClientRenderable *> renderablesToUpdate;
int leaf = 0;
intp leaf = 0;
for ( i = 0; i < count; ++i )
{
leaf = pLeafList[i];

2
ivp

@ -1 +1 @@ @@ -1 +1 @@
Subproject commit dfa42eb575618661a9c41c2ed635c1b9a0a51858
Subproject commit 960c7228f8e8d710625891991e88b1ec3aa92e45

2
public/tier1/memhelpers.h

@ -19,7 +19,7 @@ namespace memutils @@ -19,7 +19,7 @@ namespace memutils
}
template<typename T>
inline void set( T *dest, T value, size_t n )
inline void set( T *dest, const T &value, size_t n )
{
do
{

Loading…
Cancel
Save