Skip to content

Type the game's 0x20 slot as D2ClientInfoStrc* #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devtejasx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Type the game's 0x20 slot as D2ClientInfoStrc* #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions source/D2Game/include/GAME/Game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,15 @@ using FnServerLogMessage = void(*)(int32_t nLogLevel, const char* szFormat, ...)
using FnEnterGame = void(__fastcall*)(WORD nGameId, const char* szCharName, int32_t nClassId, int32_t nLevel, uint32_t nFlags);
using FnFindPlayerToken = int32_t(__fastcall*)(const char* szCharName, int32_t nTokenId, WORD nGameId, char* pszOutAccountName, int32_t* pOutCharSaveTransactionToken, int32_t* a6, int32_t* a7); //TODO: Last 2 args
/*UNUSED*/ using FnSaveDatabaseGuild = int(__fastcall*)(const char*, char*, size_t);
using FnUnlockDatabaseCharacter = void(__fastcall*)(uint32_t* pGameData, const char* szCharName, const char* szAccountName);
using FnUnlockDatabaseCharacter = void(__fastcall*)(D2ClientInfoStrc** ppClientInfo, const char* szCharName, const char* szAccountName);
/*UNUSED*/ using FnUnk0x24 = int(__fastcall*)(int, int);
using FnUpdateCharacterLadder = void(__fastcall*)(const char* szCharName, int32_t nClassId, int32_t nLevel, uint32_t nExperience, int32_t nZero, uint32_t nFlags, FILETIME* pSaveCreationTimestamp);
using FnUpdateGameInformation = void(__fastcall*)(WORD nGameId, const char* szCharName, int32_t nClassId, int32_t nLevel);
using FnHandlePacket = void(__fastcall*)(void* pPacket, int32_t nPacketSize);
using FnSetGameData = uint32_t(__fastcall*)();
// The server hands back a D2ClientInfoStrc*, which is stored in D2GameStrc::pClientInfo
// and later passed to pfUnlockDatabaseCharacter the same way D2ClientStrc::pClientInfo is
// passed to the other database callbacks.
using FnCreateClientInfo = D2ClientInfoStrc*(__fastcall*)();
using FnRelockDatabaseCharacter = void(__fastcall*)(D2ClientInfoStrc** ppClientInfo, const char* szCharName, const char* szAccountName);
/*UNUSED*/ using FnLoadComplete = int32_t(__stdcall*)(int32_t);

Expand All @@ -95,7 +98,7 @@ struct D2ServerCallbackFunctions // sizeof 0x40
FnUpdateCharacterLadder pfUpdateCharacterLadder; //0x28
FnUpdateGameInformation pfUpdateGameInformation; //0x2C
FnHandlePacket pfHandlePacket; //0x30
FnSetGameData pfSetGameData; //0x34
FnCreateClientInfo pfCreateClientInfo; //0x34
FnRelockDatabaseCharacter pfRelockDatabaseCharacter; //0x38
FnLoadComplete pfLoadComplete; //0x3C
};
Expand Down Expand Up @@ -146,7 +149,7 @@ struct D2GameStrc : TSHashObject<D2GameStrc, HASHKEY_NONE> // called SGAMEDATA i
{
LPCRITICAL_SECTION lpCriticalSection; //0x18
void* pMemoryPool; //0x1C
uint32_t nGameData; //0x20
D2ClientInfoStrc* pClientInfo; //0x20
uint32_t unk0x24; //0x24
uint16_t nGameId; //0x28
char szGameName[16]; //0x2A
Expand Down
4 changes: 2 additions & 2 deletions source/D2Game/src/GAME/Clients.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,9 +528,9 @@ void __fastcall CLIENTS_SetGameData(D2GameStrc* pGame)
pGame->nClients = 0;
pGame->pClientList = nullptr;

if (gpD2EventCallbackTable_6FD45830 && gpD2EventCallbackTable_6FD45830->pfSetGameData)
if (gpD2EventCallbackTable_6FD45830 && gpD2EventCallbackTable_6FD45830->pfCreateClientInfo)
{
pGame->nGameData = gpD2EventCallbackTable_6FD45830->pfSetGameData();
pGame->pClientInfo = gpD2EventCallbackTable_6FD45830->pfCreateClientInfo();
}
}

Expand Down
2 changes: 1 addition & 1 deletion source/D2Game/src/GAME/Game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,7 @@ void __fastcall GAME_JoinGame(int32_t dwClientId, uint16_t nGameId, int32_t nCla
GAME_LogMessage(6, "[SERVER] SrvJoinGame: *** Unable to add client %d '%s' to game %d (unlocking character)", dwClientId, szClientName, nGameId);

D2_ASSERT(gpD2EventCallbackTable_6FD45830->pfUnlockDatabaseCharacter);
gpD2EventCallbackTable_6FD45830->pfUnlockDatabaseCharacter(&pGame->nGameData, szClientName, szAccountName);
gpD2EventCallbackTable_6FD45830->pfUnlockDatabaseCharacter(&pGame->pClientInfo, szClientName, szAccountName);
}

D2_UNLOCK(pGame->lpCriticalSection);
Expand Down
Loading