swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-10-17 07:03:02 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'testing' into clang-profile-build

Browse Source
This commit is contained in:
DarthArgus
2016-12-09 04:09:01 +00:00
parent ec3f191db7 6418f430f9
commit cf386b1a59
20 changed files with 93 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/CommoditiesServer/src/CMakeLists.txt
+1 -3
View File
@@ -35,10 +35,8 @@ else()
)
endif()
add_compile_options(-fprofile-instr-use=${PROJECT_SOURCE_DIR}/src/linux/CommoditiesServer.profdata)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/shared
${CMAKE_CURRENT_SOURCE_DIR}/shared
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedCompression/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedDebug/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFile/include/public
engine/server/application/ConnectionServer/src/CMakeLists.txt
+5 -7
View File
@@ -36,15 +36,13 @@ else()
)
endif()
add_compile_options(-fprofile-instr-use=${PROJECT_SOURCE_DIR}/src/linux/ConnectionServer.profdata)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/shared
${CMAKE_CURRENT_SOURCE_DIR}/shared
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedCompression/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedDebug/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedDebug/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFile/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundation/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedFoundationTypes/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedGame/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedLog/include/public
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedMath/include/public
@@ -60,7 +58,7 @@ include_directories(
${SWG_ENGINE_SOURCE_DIR}/server/library/serverMetrics/include/public
${SWG_ENGINE_SOURCE_DIR}/server/library/serverNetworkMessages/include/public
${SWG_ENGINE_SOURCE_DIR}/server/library/serverUtility/include/public
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localization/include
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localizationArchive/include/public
${SWG_EXTERNALS_SOURCE_DIR}/ours/library/singleton/include
engine/server/application/ConnectionServer/src/shared/ConfigConnectionServer.cpp
+1 -1
View File
@@ -88,7 +88,7 @@ void ConfigConnectionServer::install(void)
KEY_INT (lagReportThreshold, 10000);
KEY_INT (defaultGameFeatures, 0xFFFFFFFF);
KEY_INT (defaultSubscriptionFeatures, 0xFFFFFFFF);
KEY_INT (maxConnectionsPerIP, 0);
KEY_INT (maxConnectionsPerIP, 6);
KEY_BOOL (validateStationKey, false);
KEY_STRING (sessionServers, "");
engine/server/application/LoginServer/src/CMakeLists.txt
-2
View File
@@ -78,8 +78,6 @@ else()
)
endif()
add_compile_options(-fprofile-instr-use=${PROJECT_SOURCE_DIR}/src/linux/LoginServer.profdata)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/shared
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedCommandParser/include/public
engine/server/application/LoginServer/src/shared/ConfigLoginServer.cpp
+1 -1
View File
@@ -116,7 +116,7 @@ void ConfigLoginServer::install(void)
KEY_BOOL(requireSecureLoginForCsTool, true);
KEY_BOOL(useExternalAuth, false);
KEY_STRING(externalAuthURL, "");
KEY_INT(maxConnectionsPerIP, 0); // assuming 2 people playing in the same household
KEY_INT(maxConnectionsPerIP, 4); // assuming 2 people playing in the same household
int index = 0;
char const * result = 0;
engine/server/application/LoginServer/src/shared/LoginServer.cpp
+1 -19
View File
@@ -1076,25 +1076,7 @@ void LoginServer::validateAccount(const StationId& stationId, uint32 clusterId,
// Check cluster npe user limit
if (cle->m_numTutorialPlayers > cle->m_onlineTutorialLimit)
{
canCreateRegular = false;
canCreateJedi = false;
}
// limit login/character creation based on subscription feature bits
if (((subscriptionBits & ClientSubscriptionFeature::FreeTrial) != 0)
&& ((subscriptionBits & ClientSubscriptionFeature::Base) == 0))
{
// Check cluster free trial user limit
if (cle->m_numFreeTrialPlayers > cle->m_onlineFreeTrialLimit)
{
canLogin = false;
}
// Check cluster free trial character creation
if (!cle->m_freeTrialCanCreateChar)
{
canCreateRegular = false;
canCreateJedi = false;
}
canLogin = false;
}
}
engine/server/application/PlanetServer/src/CMakeLists.txt
-2
View File
@@ -42,8 +42,6 @@ else()
)
endif()
add_compile_options(-fprofile-instr-use=${PROJECT_SOURCE_DIR}/src/linux/PlanetServer.profdata)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/shared
${SWG_ENGINE_SOURCE_DIR}/shared/library/sharedCommandParser/include/public