From 8561df0332d12b855c6220c34de3e9b94c9dc9cc Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Thu, 6 Oct 2016 21:10:29 +0000 Subject: [PATCH 1/3] revert login --- .../LoginServer/src/shared/LoginServer.cpp | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/engine/server/application/LoginServer/src/shared/LoginServer.cpp b/engine/server/application/LoginServer/src/shared/LoginServer.cpp index 17e7e760..eacfee13 100755 --- a/engine/server/application/LoginServer/src/shared/LoginServer.cpp +++ b/engine/server/application/LoginServer/src/shared/LoginServer.cpp @@ -1076,7 +1076,25 @@ void LoginServer::validateAccount(const StationId& stationId, uint32 clusterId, // Check cluster npe user limit if (cle->m_numTutorialPlayers > cle->m_onlineTutorialLimit) { - canLogin = false; + 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; + } } } From 6dd6163f86bf79747ea3e6245ebf23be947d46dc Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Fri, 7 Oct 2016 01:35:42 +0000 Subject: [PATCH 2/3] Revert "revert login" This reverts commit 8561df0332d12b855c6220c34de3e9b94c9dc9cc. --- .../LoginServer/src/shared/LoginServer.cpp | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/engine/server/application/LoginServer/src/shared/LoginServer.cpp b/engine/server/application/LoginServer/src/shared/LoginServer.cpp index eacfee13..17e7e760 100755 --- a/engine/server/application/LoginServer/src/shared/LoginServer.cpp +++ b/engine/server/application/LoginServer/src/shared/LoginServer.cpp @@ -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; } } From 34a391db304c57e693994a0e0d5b6ff55a140ab1 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Fri, 7 Oct 2016 01:42:13 +0000 Subject: [PATCH 3/3] remove deprecated c hooks --- .../src/linux/OsNewDel.cpp | 41 ------------------- 1 file changed, 41 deletions(-) diff --git a/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp b/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp index 29280ef8..9ab1fce2 100755 --- a/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp +++ b/engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp @@ -16,47 +16,6 @@ static MemoryManager memoryManager __attribute__ ((init_priority (101))); -#define USE_LIBC_MALLOC_HOOKS 0 - -#if USE_LIBC_MALLOC_HOOKS -extern "C" -{ - void memoryManagerFreeHook(__malloc_ptr_t __ptr, __const __malloc_ptr_t) - { - delete[] (char *)__ptr; - } - - __malloc_ptr_t memoryManagerMallocHook(size_t __size, const __malloc_ptr_t) - { - return new char[__size]; - } - - __malloc_ptr_t memoryManagerReallocHook(__malloc_ptr_t __ptr, size_t size, __const __malloc_ptr_t) - { - if(! __ptr) - return new char[size]; - - return MemoryManager::reallocate(__ptr, size); - } - - __malloc_ptr_t memoryManagerMemAlignHook(size_t alignment, size_t size, __const __malloc_ptr_t) - { - DEBUG_FATAL(true, ("memalign not implemented!")); - return new char[size]; - } - - static void memoryManagerMallocInitializeHook(void) - { - __free_hook = memoryManagerFreeHook; - __malloc_hook = memoryManagerMallocHook; - __realloc_hook = memoryManagerReallocHook; - __memalign_hook = memoryManagerMemAlignHook; - } - void (*__malloc_initialize_hook) (void) = memoryManagerMallocInitializeHook; -} - -#endif//USE_LIBC_MALLOC_HOOKS - // ====================================================================== void *operator new(size_t size, MemoryManagerNotALeak)