backup/sb2-decomp
1
0
Fork 0
mirror of https://github.com/jummy0/sb2-decomp synced 2025-03-15 04:24:48 +01:00
Code Issues Projects Releases Activity

fix network init

Browse Source
This commit is contained in:
jummy 2024-10-29 19:09:34 -05:00
parent 6e939d8a8a
commit 05c5c24f33
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/blupi.cpp
View File

@ -779,6 +779,11 @@ static BOOL DoInit(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow)
g_pSound->SetState(TRUE); g_pSound->SetState(TRUE);
g_pSound->SetCDAudio(g_bCDAudio); g_pSound->SetCDAudio(g_bCDAudio);
g_pNetwork = new CNetwork;
if (g_pNetwork == NULL) return InitFail("New network", TRUE);
g_pNetwork->CreateProvider(0);
g_pMovie = new CMovie; g_pMovie = new CMovie;
if (g_pMovie == NULL) return InitFail("New movie", FALSE); if (g_pMovie == NULL) return InitFail("New movie", FALSE);
@ -796,10 +801,6 @@ static BOOL DoInit(HINSTANCE hInstance, LPSTR lpCmdLine, int nCmdShow)
g_pEvent->SetFullScreen(g_bFullScreen); g_pEvent->SetFullScreen(g_bFullScreen);
g_pEvent->SetMouseType(g_mouseType); g_pEvent->SetMouseType(g_mouseType);
g_pNetwork = new CNetwork;
if (g_pNetwork == NULL) return InitFail("New network", TRUE);
g_pNetwork->CreateProvider(0);
#if _INTRO #if _INTRO
g_pEvent->ChangePhase(WM_PHASE_INTRO1); g_pEvent->ChangePhase(WM_PHASE_INTRO1);
#else #else

1
src/def.h
View File

@ -26,6 +26,7 @@
#define MAXNETPLAYER 4 #define MAXNETPLAYER 4
#define MAXTEAM 4 #define MAXTEAM 4
#define MAXNETMESSAGE 20 #define MAXNETMESSAGE 20
#define MAXSESSION 100
#define MAXMOVEOBJECT 200 #define MAXMOVEOBJECT 200
#define MAXNOTIF 5 #define MAXNOTIF 5
#define MAXFIFOPOS 10 #define MAXFIFOPOS 10

14
src/network.cpp
View File

@ -35,10 +35,12 @@ CNetwork::~CNetwork()
static BOOL EnumProvidersCallback(LPGUID lpguidSP, LPSTR lpSPName, static BOOL EnumProvidersCallback(LPGUID lpguidSP, LPSTR lpSPName,
DWORD dwMajorVersion, DWORD dwMinorVersion, NamedGUIDList* lpContext) DWORD dwMajorVersion, DWORD dwMinorVersion, NamedGUIDList* lpContext)
{ {
NamedGUID* lpGuid;
if (lpContext->nb < MAXSESSION) if (lpContext->nb < MAXSESSION)
{ {
lpContext->pList[lpContext->nb]->guid = *lpguidSP; lpGuid = lpContext->pList[lpContext->nb];
strcpy(lpContext->pList[lpContext->nb]->name, lpSPName); lpGuid->guid = *lpguidSP;
strcpy(lpGuid->name, lpSPName);
lpContext->nb++; lpContext->nb++;
} }
return TRUE; return TRUE;
@ -95,7 +97,7 @@ BOOL CNetwork::CreateProvider(int index)
void CNetwork::FreeProviderList() void CNetwork::FreeProviderList()
{ {
if (m_providers.pList) free(m_providers.pList); // wrong if (m_providers.pList) free(m_providers.pList);
m_providers.nb = 0; m_providers.nb = 0;
m_providers.pList = NULL; m_providers.pList = NULL;
@ -105,12 +107,14 @@ void CNetwork::FreeProviderList()
static BOOL EnumSessionsCallback(LPDPSESSIONDESC2 lpThisSD, static BOOL EnumSessionsCallback(LPDPSESSIONDESC2 lpThisSD,
LPDWORD lpdwTimeOut, DWORD dwFlags, NamedGUIDList* lpContext) LPDWORD lpdwTimeOut, DWORD dwFlags, NamedGUIDList* lpContext)
{ {
NamedGUID* lpGuid;
if (dwFlags & DPESC_TIMEDOUT) return FALSE; if (dwFlags & DPESC_TIMEDOUT) return FALSE;
if (lpContext->nb < MAXSESSION) if (lpContext->nb < MAXSESSION)
{ {
lpContext->pList[lpContext->nb]->guid = lpThisSD->guidInstance; lpGuid = lpContext->pList[lpContext->nb];
strcpy(lpContext->pList[lpContext->nb]->name, lpThisSD->lpszSessionNameA); lpGuid->guid = lpThisSD->guidInstance;
strcpy(lpGuid->name, lpThisSD->lpszSessionNameA);
lpContext->nb++; lpContext->nb++;
} }
return TRUE; return TRUE;

7
src/network.h
View File

@ -4,11 +4,10 @@
#define NETWORK_H #define NETWORK_H
#include "dplay.h" #include "dplay.h"
#include "def.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#define MAXSESSION 100
typedef struct typedef struct
{ {
char bIsPresent; char bIsPresent;
@ -57,7 +56,7 @@ public:
void FreeUnknownList(); void FreeUnknownList();
BOOL IsHost(); BOOL IsHost();
NetPlayer m_players[4]; NetPlayer m_players[MAXNETPLAYER];
DPID m_dpid; DPID m_dpid;
protected: protected:
@ -66,8 +65,6 @@ protected:
NamedGUIDList m_sessions; NamedGUIDList m_sessions;
NamedGUIDList m_unknown; NamedGUIDList m_unknown;
BOOL m_bHost; BOOL m_bHost;
// NetPlayer m_players[4];
}; };
static BOOL EnumProvidersCallback(LPGUID lpguidSP, LPSTR lpSTName, static BOOL EnumProvidersCallback(LPGUID lpguidSP, LPSTR lpSTName,