mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-16 15:20:11 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2371 from HarbourMasters/develop-bradley

Browse Source 
brad -> dev
This commit is contained in:
briaguya 2023-01-19 04:31:34 -05:00 committed by GitHub
commit 52b182d4dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -7,8 +7,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE) set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
project(Ship LANGUAGES C CXX project(Ship LANGUAGES C CXX
VERSION 5.1.3) VERSION 5.1.4)
set(PROJECT_BUILD_NAME "BRADLEY DELTA" CACHE STRING "") set(PROJECT_BUILD_NAME "BRADLEY ECHO" CACHE STRING "")
set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "") set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")
set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh) set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)

8
soh/soh/Enhancements/crowd-control/CrowdControl.cpp
View File

@ -101,7 +101,7 @@ void CrowdControl::Disable() {
void CrowdControl::ListenToServer() { void CrowdControl::ListenToServer() {
while (isEnabled) { while (isEnabled) {
while (!connected) { while (!connected && isEnabled) {
SPDLOG_TRACE("[CrowdControl] Attempting to make connection to server..."); SPDLOG_TRACE("[CrowdControl] Attempting to make connection to server...");
tcpsock = SDLNet_TCP_Open(&ip); tcpsock = SDLNet_TCP_Open(&ip);
@ -112,8 +112,10 @@ void CrowdControl::ListenToServer() {
} }
} }
auto socketSet = SDLNet_AllocSocketSet(1); SDLNet_SocketSet socketSet = SDLNet_AllocSocketSet(1);
SDLNet_TCP_AddSocket(socketSet, tcpsock); if (tcpsock) {
SDLNet_TCP_AddSocket(socketSet, tcpsock);
}
// Listen to socket messages // Listen to socket messages
while (connected && tcpsock && isEnabled) { while (connected && tcpsock && isEnabled) {

5
soh/soh/OTRGlobals.cpp
View File

@ -498,6 +498,11 @@ extern "C" void InitOTR() {
#ifdef ENABLE_CROWD_CONTROL #ifdef ENABLE_CROWD_CONTROL
CrowdControl::Instance = new CrowdControl(); CrowdControl::Instance = new CrowdControl();
CrowdControl::Instance->Init(); CrowdControl::Instance->Init();
if (CVar_GetS32("gCrowdControl", 0)) {
CrowdControl::Instance->Enable();
} else {
CrowdControl::Instance->Disable();
}
#endif #endif
} }