Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Core/GameEngine/Include/GameNetwork/GameInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ class SkirmishGameInfo : public GameInfo, public Snapshot
for (Int i = 0; i< MAX_SLOTS; ++i)
setSlotPointer(i, &m_skirmishSlot[i]);
}
virtual ~SkirmishGameInfo() override {}
};

extern SkirmishGameInfo *TheSkirmishGameInfo;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class GameSpyStagingRoom : public GameInfo

public:
GameSpyStagingRoom();
virtual ~GameSpyStagingRoom() override {}
virtual void reset() override;

void cleanUpSlotPointers();
Expand Down
1 change: 1 addition & 0 deletions Core/GameEngine/Include/GameNetwork/LANGameInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ class LANGameInfo : public GameInfo

public:
LANGameInfo();
virtual ~LANGameInfo() override {}
void setSlot( Int slotNum, LANGameSlot slotInfo ); ///< Set the slot state (human, open, AI, etc)
LANGameSlot* getLANSlot( Int slotNum ); ///< Get the slot
const LANGameSlot* getConstLANSlot( Int slotNum ) const; ///< Get the slot
Expand Down
2 changes: 2 additions & 0 deletions Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2509,6 +2509,8 @@ void ConnectionManager::sendDisconnectChat(UnicodeString text) {

sendLocalCommandDirect(msg, 0xff ^ (1 << m_localSlot));
processDisconnectChat(msg);

msg->detach();
}

UnsignedShort ConnectionManager::sendFileAnnounce(AsciiString path, UnsignedByte playerMask)
Expand Down
2 changes: 2 additions & 0 deletions Core/GameEngine/Source/GameNetwork/FirewallHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1529,6 +1529,8 @@ Bool FirewallHelperClass::openSpareSocket(UnsignedShort port) {

if (m_spareSockets[i].udp->Bind((UnsignedInt)0, port) != 0) {
DEBUG_CRASH(("FirewallHelperClass::openSpareSocket - Failed to init spare socket"));
delete m_spareSockets[i].udp;
m_spareSockets[i].udp = nullptr;
return FALSE;
}

Expand Down
1 change: 1 addition & 0 deletions Core/GameEngine/Source/GameNetwork/LANAPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,7 @@ void LANAPI::RequestGameLeave()
// Exit out immediately if we're hosting
OnPlayerLeave(m_name);
removeGame(m_currentGame);
delete m_currentGame;
m_currentGame = nullptr;
m_inLobby = true;
}
Expand Down
1 change: 1 addition & 0 deletions Core/GameEngine/Source/GameNetwork/LANAPICallbacks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ void LANAPI::OnGameStart()
DEBUG_LOG(("After transfer, we didn't really have the map. Bailing..."));
OnPlayerLeave(m_name);
removeGame(m_currentGame);
delete m_currentGame;
m_currentGame = nullptr;
m_inLobby = TRUE;

Expand Down
1 change: 1 addition & 0 deletions Core/GameEngine/Source/GameNetwork/LANAPIhandlers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ void LANAPI::handleRequestLobbyLeave( LANMessage *msg, UnsignedInt senderIP )
if (player->getIP() == senderIP)
{
removePlayer(player);
delete player;
OnPlayerList(m_lobbyPlayers);
break;
}
Expand Down
2 changes: 2 additions & 0 deletions Core/GameEngine/Source/GameNetwork/udp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ Int UDP::Bind(UnsignedInt IP,UnsignedShort Port)
{
status=GetStatus();
//CERR("Bind failure (" << status << ") IP " << IP << " PORT " << Port )
closesocket(fd);
fd=0;
return(status);
}

Expand Down
1 change: 1 addition & 0 deletions Generals/Code/GameEngine/Include/Common/Recorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class ReplayGameInfo : public GameInfo
for (Int i = 0; i< MAX_SLOTS; ++i)
setSlotPointer(i, &m_ReplaySlot[i]);
}
virtual ~ReplayGameInfo() override {}
};

enum RecorderModeType CPP_11(: Int) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class GameSpyGameInfo : public GameInfo

public:
GameSpyGameInfo();
virtual ~GameSpyGameInfo() override {}

inline void setServer(SBServer server) { m_server = server; }
inline SBServer getServer() { return m_server; }
Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Include/Common/Recorder.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class ReplayGameInfo : public GameInfo
for (Int i = 0; i< MAX_SLOTS; ++i)
setSlotPointer(i, &m_ReplaySlot[i]);
}
virtual ~ReplayGameInfo() override {}
};

enum RecorderModeType CPP_11(: Int) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class GameSpyGameInfo : public GameInfo

public:
GameSpyGameInfo();
virtual ~GameSpyGameInfo() override {}

inline void setServer(SBServer server) { m_server = server; }
inline SBServer getServer() { return m_server; }
Expand Down
Loading