Skip to content

Commit 0e70032

Browse files
committed
networkingreplacement: small changes
1 parent 523abca commit 0e70032

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

source/modules/networkingreplacement.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,11 +1235,6 @@ static Symbols::SV_EnsureInstanceBaseline func_SV_EnsureInstanceBaseline = nullp
12351235
static Symbols::CFrameSnapshotManager_CreatePackedEntity func_CFrameSnapshotManager_CreatePackedEntity = nullptr;
12361236
static Symbols::CFrameSnapshotManager_GetPreviouslySentPacket func_CFrameSnapshotManager_GetPreviouslySentPacket = nullptr;
12371237
static Symbols::CFrameSnapshotManager_UsePreviouslySentPacket func_CFrameSnapshotManager_UsePreviouslySentPacket = nullptr;
1238-
PackedEntity* DoPacked(CFrameSnapshotManager* PManager, CFrameSnapshot* pSnap, int ent)
1239-
{
1240-
return func_CFrameSnapshotManager_CreatePackedEntity(PManager, pSnap, ent);
1241-
}
1242-
12431238
void NWR_SV_PackEntity(int edictIdx, edict_t* edict, ServerClass* pServerClass, CFrameSnapshot *pSnapshot)
12441239
{
12451240
Assert( edictIdx < pSnapshot->m_nNumEntities );
@@ -1283,6 +1278,7 @@ void NWR_SV_PackEntity(int edictIdx, edict_t* edict, ServerClass* pServerClass,
12831278
func_SV_EnsureInstanceBaseline( pServerClass, edictIdx, writeBuffer, writeBuf.GetNumBytesWritten() );
12841279
}
12851280

1281+
#if 0
12861282
g_pFullFileSystem->CreateDirHierarchy("holylib/dump/newdt/", "MOD");
12871283
std::string fileName = "holylib/dump/newdt/";
12881284
fileName.append(pServerClass->GetName());
@@ -1294,6 +1290,7 @@ void NWR_SV_PackEntity(int edictIdx, edict_t* edict, ServerClass* pServerClass,
12941290
g_pFullFileSystem->Write(packedData, sizeof(packedData), pPackDump);
12951291
g_pFullFileSystem->Close(pPackDump);
12961292
}
1293+
#endif
12971294

12981295
int nFlatProps = pSendTablePrecalc->GetNumProps();
12991296
IChangeFrameList *pChangeFrame = nullptr;
@@ -1403,7 +1400,7 @@ void NWR_SV_PackEntity(int edictIdx, edict_t* edict, ServerClass* pServerClass,
14031400
}
14041401

14051402
// Now make a PackedEntity and store the new packed data in there.
1406-
PackedEntity *pPackedEntity = DoPacked( framesnapshotmanager, pSnapshot, edictIdx );
1403+
PackedEntity *pPackedEntity = func_CFrameSnapshotManager_CreatePackedEntity( framesnapshotmanager, pSnapshot, edictIdx );
14071404
pPackedEntity->SetChangeFrameList( pChangeFrame );
14081405
pPackedEntity->SetServerAndClientClass( pServerClass, nullptr );
14091406
pPackedEntity->AllocAndCopyPadded( packedData, nWrittenBytes );

source/symbols.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ struct ThreadPoolStartParams_t;
9393
#if defined SYSTEM_WINDOWS
9494
#if defined ARCHITECTURE_X86_64
9595
#define GMCOMMON_CALLING_CONVENTION __fastcall
96-
#else
96+
#else // x86
9797
#define GMCOMMON_CALLING_CONVENTION __thiscall
9898
#endif
9999
#define CALLING_CONVENTION_FASTCALL __fastcall
100-
#else
100+
#else // LInux
101101
#define CALLING_CONVENTION_FASTCALL __attribute__((fastcall))
102102
#define GMCOMMON_CALLING_CONVENTION
103103
#endif
@@ -783,7 +783,7 @@ namespace Symbols
783783
using CFrameSnapshotManager_UsePreviouslySentPacket = bool (*)(void* framesnapshotmanager, CFrameSnapshot* pSnapshot, int entity, int entSerialNumber);
784784
extern const std::vector<Symbol> CFrameSnapshotManager_UsePreviouslySentPacketSym;
785785

786-
using CFrameSnapshotManager_CreatePackedEntity = PackedEntity* (*)(void* framesnapshotmanager, CFrameSnapshot* pSnapshot, int entity);
786+
using CFrameSnapshotManager_CreatePackedEntity = PackedEntity* (CALLING_CONVENTION_FASTCALL*)(void* framesnapshotmanager, CFrameSnapshot* pSnapshot, int entity);
787787
extern const std::vector<Symbol> CFrameSnapshotManager_CreatePackedEntitySym;
788788

789789
//---------------------------------------------------------------------------------

0 commit comments

Comments
 (0)