diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp index 9516a3c2..84692f43 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp @@ -370,10 +370,6 @@ static void DownloadCallback ( ) { s_numConnectFailures = 0; - ref(result); - ref(param); - ref(filename); - ManifestFile *mf = (ManifestFile *)param; if (IS_NET_ERROR(result) && s_running && !s_patchError) { if (result == kNetErrFileNotFound) { @@ -716,8 +712,6 @@ static void ThinManifestCallback ( ){ s_numConnectFailures = 0; - ref(group); - plLauncherInfo * info = (plLauncherInfo *) param; char text[256]; StrPrintf(text, arrsize(text), "Checking for updates..."); @@ -815,8 +809,6 @@ static void FileSrvIpAddressCallback ( void * param, const wchar addr[] ) { - ref(param); - NetCliGateKeeperDisconnect(); if (IS_NET_ERROR(result)) { @@ -944,7 +936,6 @@ void UruPrepProc (void * param) { void PlayerStopProc (void * param) { s_running = false; plLauncherInfo *info = (plLauncherInfo *) param; - ref(param); //TerminateProcess(s_pi.hProcess, kExitCodeTerminated); info->stopCallback(kStatusOk, nil); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/SelfPatcher.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/SelfPatcher.cpp index 8bcfbfd5..6cfb7135 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/SelfPatcher.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/SelfPatcher.cpp @@ -71,7 +71,6 @@ static wchar s_newPatcherFile[MAX_PATH]; //============================================================================ static void NetErrorHandler (ENetProtocol protocol, ENetError error) { - ref(protocol); LogMsg(kLogError, L"NetErr: %s", NetErrorToString(error)); if (IS_NET_SUCCESS(s_patchResult)) s_patchResult = error; @@ -93,9 +92,6 @@ static void DownloadCallback ( const wchar filename[], hsStream * writer ) { - ref(param); - ref(filename); - if(IS_NET_ERROR(result)) { switch (result) { case kNetErrTimeout: @@ -142,9 +138,6 @@ static void ManifestCallback ( const NetCliFileManifestEntry manifest[], unsigned entryCount ) { - ref(param); - ref(group); - if(IS_NET_ERROR(result)) { switch (result) { case kNetErrTimeout: @@ -192,8 +185,6 @@ static void FileSrvIpAddressCallback ( void * param, const wchar addr[] ) { - ref(param); - NetCliGateKeeperDisconnect(); if (IS_NET_ERROR(result)) { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h index da932d2d..2a1248a3 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLib/hsTypes.h @@ -292,16 +292,6 @@ typedef hsColor32 hsRGBAColor32; #endif -/**************************************************************************** -* -* ref -* References a variable to prevent compiler warnings -* -***/ - -#define ref(a) ((void *)&(a)) - - /**************************************************************************** * * UNIQUE_SYMBOL diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeError.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeError.cpp index c2865177..a12a6296 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeError.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeError.cpp @@ -63,9 +63,6 @@ AUTO_INIT_FUNC(hsExeErrorInit) { //============================================================================ static void DoAssert (int line, const char file[], const char msg[]) { - ref(line); - ref(file); - ErrorMinimizeAppWindow(); #ifdef HS_BUILD_FOR_WIN32 @@ -234,11 +231,6 @@ void DebugMsgV (const char fmt[], va_list args) { if (s_critsect) s_critsect->Leave(); -#else - - ref(fmt); - ref(args); - #endif } @@ -251,9 +243,5 @@ void __cdecl DebugMsg (const char fmt[], ...) { DebugMsgV(fmt, args); va_end(args); -#else - - ref(fmt); - #endif } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeMalloc.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeMalloc.cpp index 30beb1fd..e4bf4621 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeMalloc.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/CoreLibExe/hsExeMalloc.cpp @@ -279,8 +279,6 @@ static void __cdecl ReportMem (EMemFile file, bool showDialog, const char fmt[], //============================================================================ #ifdef MEM_DEBUG static void __cdecl MemDumpCallback (void * mem, void * param) { - ref(MemDumpCallback); - const _CrtMemBlockHeader * pHead = pHdr(mem); MemDumpParam * dumpParam = (MemDumpParam *) param; @@ -321,7 +319,6 @@ static void __cdecl OnExitMemDumpCallback (void * mem, size_t) { //=========================================================================== #ifdef MEM_DEBUG static void __cdecl CheckLeaksOnExit () { - ref(CheckLeaksOnExit); if (!ErrorGetOption(kErrOptDisableMemLeakChecking)) { MemDumpParam param; param.file = kMemLeaks; @@ -341,17 +338,8 @@ static int __cdecl CrtAllocHook ( const unsigned char * szFileName, int nLine ) { - ref(method); - ref(pUserData); - ref(nSize); - ref(nBlockUse); - ref(lRequest); - ref(szFileName); - ref(nLine); - if (nBlockUse == _NORMAL_BLOCK) { int xx = 0; - ref(xx); } return 1; @@ -418,8 +406,6 @@ void MemValidateNow () { //============================================================================ void MemSetValidation (unsigned on) { - ref(on); - #ifdef MEM_DEBUG #endif // MEM_DEBUG } @@ -443,8 +429,6 @@ void MemPopDisableTracking () { //============================================================================ void MemSetColor (unsigned short color) { - ref(color); - #ifdef MEM_DEBUG s_memColor = color & 0xFFFF; #endif // MEM_DEBUG @@ -453,9 +437,6 @@ void MemSetColor (unsigned short color) { //=========================================================================== void * MemAlloc (unsigned bytes, unsigned flags, const char file[], int line) { - ref(file); - ref(line); - #ifdef MEM_DEBUG unsigned block; if (flags & kMemIgnoreBlock || s_memCheckOff) @@ -504,8 +485,6 @@ void * MemAlloc (unsigned bytes, unsigned flags, const char file[], int line) { //============================================================================ void MemFree (void * ptr, unsigned flags) { - ref(flags); - if (!ptr) return; @@ -519,9 +498,6 @@ void MemFree (void * ptr, unsigned flags) { //=========================================================================== void * MemRealloc (void * ptr, unsigned bytes, unsigned flags, const char file[], int line) { - ref(file); - ref(line); - #ifdef HS_DEBUGGING unsigned oldBytes = ptr ? MemSize(ptr) : 0; #endif diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/BlueSpiral/pfGmBlueSpiral.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/BlueSpiral/pfGmBlueSpiral.cpp index ab06759f..b41bcf98 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/BlueSpiral/pfGmBlueSpiral.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/BlueSpiral/pfGmBlueSpiral.cpp @@ -134,8 +134,6 @@ void IBlueSpiral::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) { //============================================================================ void IBlueSpiral::RecvClothOrder (const Srv2Cli_BlueSpiral_ClothOrder & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -143,8 +141,6 @@ void IBlueSpiral::RecvClothOrder (const Srv2Cli_BlueSpiral_ClothOrder & msg, voi //============================================================================ void IBlueSpiral::RecvSuccessfulHit (const Srv2Cli_BlueSpiral_SuccessfulHit & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -152,8 +148,6 @@ void IBlueSpiral::RecvSuccessfulHit (const Srv2Cli_BlueSpiral_SuccessfulHit & ms //============================================================================ void IBlueSpiral::RecvGameWon (const Srv2Cli_BlueSpiral_GameWon & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -161,8 +155,6 @@ void IBlueSpiral::RecvGameWon (const Srv2Cli_BlueSpiral_GameWon & msg, void * pa //============================================================================ void IBlueSpiral::RecvGameOver (const Srv2Cli_BlueSpiral_GameOver & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -170,8 +162,6 @@ void IBlueSpiral::RecvGameOver (const Srv2Cli_BlueSpiral_GameOver & msg, void * //============================================================================ void IBlueSpiral::RecvGameStarted (const Srv2Cli_BlueSpiral_GameStarted & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/ClimbingWall/pfGmClimbingWall.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/ClimbingWall/pfGmClimbingWall.cpp index fa36a161..f47663d4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/ClimbingWall/pfGmClimbingWall.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/ClimbingWall/pfGmClimbingWall.cpp @@ -135,8 +135,6 @@ void IClimbingWall::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) { //============================================================================ void IClimbingWall::RecvNumBlockersChanged (const Srv2Cli_ClimbingWall_NumBlockersChanged & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -144,8 +142,6 @@ void IClimbingWall::RecvNumBlockersChanged (const Srv2Cli_ClimbingWall_NumBlocke //============================================================================ void IClimbingWall::RecvReady (const Srv2Cli_ClimbingWall_Ready & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -153,8 +149,6 @@ void IClimbingWall::RecvReady (const Srv2Cli_ClimbingWall_Ready & msg, void * pa //============================================================================ void IClimbingWall::RecvBlockersChanged (const Srv2Cli_ClimbingWall_BlockersChanged & msg, void * param) { - ref (param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -162,8 +156,6 @@ void IClimbingWall::RecvBlockersChanged (const Srv2Cli_ClimbingWall_BlockersChan //============================================================================ void IClimbingWall::RecvPlayerEntered (const Srv2Cli_ClimbingWall_PlayerEntered & msg, void * param) { - ref (param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -171,8 +163,6 @@ void IClimbingWall::RecvPlayerEntered (const Srv2Cli_ClimbingWall_PlayerEntered //============================================================================ void IClimbingWall::RecvSuitMachineLocked (const Srv2Cli_ClimbingWall_SuitMachineLocked & msg, void * param) { - ref (param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -180,8 +170,6 @@ void IClimbingWall::RecvSuitMachineLocked (const Srv2Cli_ClimbingWall_SuitMachin //============================================================================ void IClimbingWall::RecvGameOver (const Srv2Cli_ClimbingWall_GameOver & msg, void * param) { - ref (param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Heek/pfGmHeek.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Heek/pfGmHeek.cpp index dfaa8026..ebe1685a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Heek/pfGmHeek.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Heek/pfGmHeek.cpp @@ -135,7 +135,6 @@ void IHeek::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) { //============================================================================ void IHeek::RecvPlayGame (const Srv2Cli_Heek_PlayGame & msg, void * param) { - ref(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -143,7 +142,6 @@ void IHeek::RecvPlayGame (const Srv2Cli_Heek_PlayGame & msg, void * param) { //============================================================================ void IHeek::RecvGoodbye (const Srv2Cli_Heek_Goodbye & msg, void * param) { - ref(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -151,7 +149,6 @@ void IHeek::RecvGoodbye (const Srv2Cli_Heek_Goodbye & msg, void * param) { //============================================================================ void IHeek::RecvWelcome (const Srv2Cli_Heek_Welcome & msg, void * param) { - ref(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -159,7 +156,6 @@ void IHeek::RecvWelcome (const Srv2Cli_Heek_Welcome & msg, void * param) { //============================================================================ void IHeek::RecvDrop (const Srv2Cli_Heek_Drop & msg, void * param) { - ref(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -167,7 +163,6 @@ void IHeek::RecvDrop (const Srv2Cli_Heek_Drop & msg, void * param) { //============================================================================ void IHeek::RecvSetup (const Srv2Cli_Heek_Setup & msg, void * param) { - ref(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -175,7 +170,6 @@ void IHeek::RecvSetup (const Srv2Cli_Heek_Setup & msg, void * param) { //============================================================================ void IHeek::RecvLightState (const Srv2Cli_Heek_LightState & msg, void * param) { - ref(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -183,7 +177,6 @@ void IHeek::RecvLightState (const Srv2Cli_Heek_LightState & msg, void * param) { //============================================================================ void IHeek::RecvInterfaceState (const Srv2Cli_Heek_InterfaceState & msg, void * param) { - ref(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -191,7 +184,6 @@ void IHeek::RecvInterfaceState (const Srv2Cli_Heek_InterfaceState & msg, void * //============================================================================ void IHeek::RecvCountdownState (const Srv2Cli_Heek_CountdownState & msg, void * param) { - ref(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -199,7 +191,6 @@ void IHeek::RecvCountdownState (const Srv2Cli_Heek_CountdownState & msg, void * //============================================================================ void IHeek::RecvWinLose (const Srv2Cli_Heek_WinLose & msg, void * param) { - ref(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -207,7 +198,6 @@ void IHeek::RecvWinLose (const Srv2Cli_Heek_WinLose & msg, void * param) { //============================================================================ void IHeek::RecvGameWin (const Srv2Cli_Heek_GameWin & msg, void * param) { - ref(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -215,7 +205,6 @@ void IHeek::RecvGameWin (const Srv2Cli_Heek_GameWin & msg, void * param) { //============================================================================ void IHeek::RecvPointUpdate (const Srv2Cli_Heek_PointUpdate & msg, void * param) { - ref(param); pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Marker/pfGmMarker.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Marker/pfGmMarker.cpp index cd691bd5..d15553a1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Marker/pfGmMarker.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/Marker/pfGmMarker.cpp @@ -159,8 +159,6 @@ void IMarker::RecvTeamAssigned (const Srv2Cli_Marker_TeamAssigned & msg, void * //============================================================================ void IMarker::RecvGameType (const Srv2Cli_Marker_GameType & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -168,8 +166,6 @@ void IMarker::RecvGameType (const Srv2Cli_Marker_GameType & msg, void * param) { //============================================================================ void IMarker::RecvGameStarted (const Srv2Cli_Marker_GameStarted & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -177,8 +173,6 @@ void IMarker::RecvGameStarted (const Srv2Cli_Marker_GameStarted & msg, void * pa //============================================================================ void IMarker::RecvGamePaused (const Srv2Cli_Marker_GamePaused & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -186,8 +180,6 @@ void IMarker::RecvGamePaused (const Srv2Cli_Marker_GamePaused & msg, void * para //============================================================================ void IMarker::RecvGameReset (const Srv2Cli_Marker_GameReset & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -195,8 +187,6 @@ void IMarker::RecvGameReset (const Srv2Cli_Marker_GameReset & msg, void * param) //============================================================================ void IMarker::RecvGameOver (const Srv2Cli_Marker_GameOver & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -204,8 +194,6 @@ void IMarker::RecvGameOver (const Srv2Cli_Marker_GameOver & msg, void * param) { //============================================================================ void IMarker::RecvGameNameChanged (const Srv2Cli_Marker_GameNameChanged & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -213,8 +201,6 @@ void IMarker::RecvGameNameChanged (const Srv2Cli_Marker_GameNameChanged & msg, v //============================================================================ void IMarker::RecvTimeLimitChanged (const Srv2Cli_Marker_TimeLimitChanged & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -222,8 +208,6 @@ void IMarker::RecvTimeLimitChanged (const Srv2Cli_Marker_TimeLimitChanged & msg, //============================================================================ void IMarker::RecvGameDeleted (const Srv2Cli_Marker_GameDeleted & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -234,8 +218,6 @@ void IMarker::RecvGameDeleted (const Srv2Cli_Marker_GameDeleted & msg, void * pa //============================================================================ void IMarker::RecvMarkerAdded (const Srv2Cli_Marker_MarkerAdded & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -243,8 +225,6 @@ void IMarker::RecvMarkerAdded (const Srv2Cli_Marker_MarkerAdded & msg, void * pa //============================================================================ void IMarker::RecvMarkerDeleted (const Srv2Cli_Marker_MarkerDeleted & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -252,8 +232,6 @@ void IMarker::RecvMarkerDeleted (const Srv2Cli_Marker_MarkerDeleted & msg, void //============================================================================ void IMarker::RecvMarkerNameChanged (const Srv2Cli_Marker_MarkerNameChanged & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -261,8 +239,6 @@ void IMarker::RecvMarkerNameChanged (const Srv2Cli_Marker_MarkerNameChanged & ms //============================================================================ void IMarker::RecvMarkerCaptured (const Srv2Cli_Marker_MarkerCaptured & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/TicTacToe/pfGmTicTacToe.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/TicTacToe/pfGmTicTacToe.cpp index 83b14326..b08a5df6 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/TicTacToe/pfGmTicTacToe.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/TicTacToe/pfGmTicTacToe.cpp @@ -137,8 +137,6 @@ void ITicTacToe::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) { //============================================================================ void ITicTacToe::RecvGameStarted (const Srv2Cli_TTT_GameStarted & msg, void * param) { - ref(param); - // player that goes first is shown as X's. if (msg.yourTurn) { myself = 'X'; @@ -156,8 +154,6 @@ void ITicTacToe::RecvGameStarted (const Srv2Cli_TTT_GameStarted & msg, void * pa //============================================================================ void ITicTacToe::RecvGameOver (const Srv2Cli_TTT_GameOver & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -167,8 +163,6 @@ void ITicTacToe::RecvGameOver (const Srv2Cli_TTT_GameOver & msg, void * param) { //============================================================================ void ITicTacToe::RecvMoveMade (const Srv2Cli_TTT_MoveMade & msg, void * param) { - ref(param); - // Update the board with the appropriate piece if (msg.playerId == NetCommGetPlayer()->playerInt) board[msg.row][msg.col] = myself; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/VarSync/pfGmVarSync.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/VarSync/pfGmVarSync.cpp index 9d45499b..a73df42c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/VarSync/pfGmVarSync.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/VarSync/pfGmVarSync.cpp @@ -134,8 +134,6 @@ void IVarSync::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) { //============================================================================ void IVarSync::RecvStringVarChanged (const Srv2Cli_VarSync_StringVarChanged & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -143,8 +141,6 @@ void IVarSync::RecvStringVarChanged (const Srv2Cli_VarSync_StringVarChanged & ms //============================================================================ void IVarSync::RecvNumericVarChanged (const Srv2Cli_VarSync_NumericVarChanged & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -152,8 +148,6 @@ void IVarSync::RecvNumericVarChanged (const Srv2Cli_VarSync_NumericVarChanged & //============================================================================ void IVarSync::RecvAllVarsSent (const Srv2Cli_VarSync_AllVarsSent & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -161,8 +155,6 @@ void IVarSync::RecvAllVarsSent (const Srv2Cli_VarSync_AllVarsSent & msg, void * //============================================================================ void IVarSync::RecvStringVarCreated (const Srv2Cli_VarSync_StringVarCreated & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); @@ -170,8 +162,6 @@ void IVarSync::RecvStringVarCreated (const Srv2Cli_VarSync_StringVarCreated & ms //============================================================================ void IVarSync::RecvNumericVarCreated (const Srv2Cli_VarSync_NumericVarCreated & msg, void * param) { - ref(param); - pfGameCliMsg * gameCliMsg = NEWZERO(pfGameCliMsg); gameCliMsg->Set(gameCli, msg); gameCliMsg->Send(gameCli->GetReceiver()); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp index 0cc6101c..2cef3081 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp @@ -189,8 +189,6 @@ void IGameMgr::RecvGameInstance (const Srv2Cli_GameMgr_GameInstance & msg, void //============================================================================ void IGameMgr::RecvInviteReceived (const Srv2Cli_GameMgr_InviteReceived & msg, void * param) { - ref(param); - pfGameMgrMsg * gameMgrMsg = NEWZERO(pfGameMgrMsg); gameMgrMsg->Set(msg); for (unsigned i = 0; i < s_receivers.Count(); ++i) @@ -200,8 +198,6 @@ void IGameMgr::RecvInviteReceived (const Srv2Cli_GameMgr_InviteReceived & msg, v //============================================================================ void IGameMgr::RecvInviteRevoked (const Srv2Cli_GameMgr_InviteRevoked & msg, void * param) { - ref(param); - pfGameMgrMsg * gameMgrMsg = NEWZERO(pfGameMgrMsg); gameMgrMsg->Set(msg); for (unsigned i = 0; i < s_receivers.Count(); ++i) @@ -571,31 +567,23 @@ void IGameCli::Recv (GameMsgHeader * msg, void * param) { //============================================================================ void IGameCli::RecvPlayerJoined (const Srv2Cli_Game_PlayerJoined & msg, void * param) { - ref(param); - ++playerCount; gameCli->OnPlayerJoined(msg); } //============================================================================ void IGameCli::RecvPlayerLeft (const Srv2Cli_Game_PlayerLeft & msg, void * param) { - ref(param); - --playerCount; gameCli->OnPlayerLeft(msg); } //============================================================================ void IGameCli::RecvInviteFailed (const Srv2Cli_Game_InviteFailed & msg, void * param) { - ref(param); - gameCli->OnInviteFailed(msg); } //============================================================================ void IGameCli::RecvOwnerChange (const Srv2Cli_Game_OwnerChange & msg, void * param) { - ref(param); - gameCli->OnOwnerChange(msg); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp index d5ef06db..5ab68328 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp @@ -107,18 +107,7 @@ const char * pyAgeInfoStruct::GetAgeInstanceGuid() const void pyAgeInfoStruct::SetAgeInstanceGuid( const char * guid ) { - if ( guid[0] == '@' ) - { - // if it starts with an @ then do a meta kind of GUID - std::string curInst = fAgeInfo.GetAgeInstanceName(); - std::string y = curInst + guid; - - plUUID instanceGuid; - CryptDigest(kCryptMd5, instanceGuid.fData , y.length(), y.c_str()); - fAgeInfo.SetAgeInstanceGuid(&instanceGuid); - } - else - fAgeInfo.SetAgeInstanceGuid( &plUUID( guid ) ); + fAgeInfo.SetAgeInstanceGuid( &plUUID( guid ) ); } Int32 pyAgeInfoStruct::GetAgeSequenceNumber() const diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp index 145f9a5b..8a72286a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp @@ -228,8 +228,6 @@ static void INtOpDispatch ( //=========================================================================== static unsigned THREADCALL NtWorkerThreadProc (AsyncThread * thread) { - ref(thread); - ThreadDenyBlock(); unsigned sleepMs = INFINITE; @@ -324,7 +322,6 @@ void INtConnCompleteOperation (NtObject * ntObj) { return; DWORD err = GetLastError(); - ref(err); switch (ntObj->ioType) { case kNtFile: INtFileDelete((NtFile *) ntObj); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp index 6fa44fc1..f76492b4 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp @@ -790,11 +790,6 @@ static void __cdecl DumpInvalidData ( const char fmt[], ... ) { - ref(filename); - ref(bytes); - ref(data); - ref(fmt); - wchar path[MAX_PATH]; PathGetProgramDirectory(path, arrsize(path)); PathAddFilename(path, path, L"Log", arrsize(path)); @@ -931,7 +926,6 @@ void INtSockDelete ( sock->notifyProc = nil; notifyProc((AsyncSocket) sock, kNotifySocketDisconnect, nil, &sock->userState); DWORD err = GetLastError(); - ref(err); } else { // Since the no application notification procedure was @@ -1000,7 +994,6 @@ void INtSocketOpCompleteSocketRead ( if (sock->connType == kConnTypeCliToAuth) { int x = 0; - ref(x); } if (!SocketDispatchRead(sock)) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xSocket.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xSocket.cpp index 4f5811fd..dde551ed 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xSocket.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xSocket.cpp @@ -991,10 +991,6 @@ void W9xSocketConnect ( unsigned connectMs, unsigned localPort ) { - // Not supported for W9X - ref(connectMs); - ref(localPort); - // If necessary, startup the window and message queue HWND window = StartupWindow(); @@ -1139,8 +1135,6 @@ unsigned W9xSocketStartListening ( const NetAddress & listenAddr, FAsyncNotifySocketProc notifyProc ) { - ref(listenAddr); - ref(notifyProc); return 0; } @@ -1150,8 +1144,6 @@ void W9xSocketStopListening ( const NetAddress & listenAddr, FAsyncNotifySocketProc notifyProc ) { - ref(listenAddr); - ref(notifyProc); } //=========================================================================== @@ -1174,9 +1166,6 @@ void W9xSocketSetNotifyProc ( AsyncSocket sock, FAsyncNotifySocketProc notifyProc ) { - ref(sock); - ref(notifyProc); - // This provider does not allow changing the notification procedure FATAL("SocketSetNotifyProc"); } @@ -1188,8 +1177,6 @@ void W9xSocketSetBacklogAlloc ( ) { // This provider does not limit the maximum backlog allocation - ref(sock); - ref(bufferSize); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp index 4bde22e4..b2c76b9d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp @@ -376,8 +376,6 @@ bool W9xThreadWaitId ( AsyncId asyncId, unsigned timeoutMs ) { - ref(file); - // Find a pending I/O operation with the given id s_critSect.Enter(); CThreadDispRec * disp; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Thread.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Thread.cpp index 9dd3c585..18f0d2c6 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Thread.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Thread.cpp @@ -88,8 +88,6 @@ AsyncThreadTaskList::~AsyncThreadTaskList () { //=========================================================================== static unsigned THREADCALL ThreadTaskProc (AsyncThread * thread) { - ref(thread); - PerfAddCounter(kAsyncPerfThreadTaskThreadsActive, 1); for (;;) { @@ -250,7 +248,6 @@ void AsyncThreadTaskAdd ( ASSERT(taskList); ASSERT(callback); ASSERT(priority == kThreadTaskPriorityNormal); - ref(priority); // Allocate a new task record ThreadTask * task = NEW(ThreadTask); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceCore.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceCore.cpp index 9cbc53c0..c92af276 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceCore.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceCore.cpp @@ -75,7 +75,6 @@ static void DoTransgamingCheck () { //=========================================================================== static void IAsyncInitUseW9x () { - ref(IAsyncInitUseW9x); #ifdef HS_BUILD_FOR_WIN32 W9xGetApi(&g_api); #else @@ -85,7 +84,6 @@ static void IAsyncInitUseW9x () { //=========================================================================== static void IAsyncInitUseNt () { - ref(IAsyncInitUseNt); #ifdef HS_BUILD_FOR_WIN32 NtGetApi(&g_api); #else @@ -95,7 +93,6 @@ static void IAsyncInitUseNt () { //=========================================================================== static void IAsyncInitUseUnix () { - ref(IAsyncInitUseUnix); #ifdef HS_BUILD_FOR_UNIX #error Unix I/O not implemented yet UxGetApi(&g_api); @@ -106,7 +103,6 @@ static void IAsyncInitUseUnix () { //=========================================================================== static void IAsyncInitForClient () { - ref(IAsyncInitForClient); #ifdef HS_BUILD_FOR_WIN32 DoTransgamingCheck(); if (s_transgaming) { @@ -124,7 +120,6 @@ static void IAsyncInitForClient () { //=========================================================================== static void IAsyncInitForServer () { - ref(IAsyncInitForServer); #ifdef HS_BUILD_FOR_WIN32 IAsyncInitUseNt(); #elif HS_BUILD_FOR_UNIX diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceLog.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceLog.cpp index 64d589c8..f74d8b0e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceLog.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceLog.cpp @@ -127,9 +127,6 @@ static void LogFileNotifyProc ( AsyncNotifyFile * notify, void ** userState ) { - ref(file); - ref(userState); - switch (code) { case kNotifyFileWrite: FREE(notify->param); @@ -147,8 +144,6 @@ static void LogFileNotifyProc ( //============================================================================ static void AllocLogBuffer_CS (unsigned index) { - ref(AllocLogBuffer_CS); - ASSERT(!s_logBuf[index]); s_logBuf[index] = (char *)ALLOC(s_logSize[index]); s_logPos[index] = 0; @@ -159,8 +154,6 @@ static void AllocLogBuffer_CS (unsigned index) { //============================================================================ static void FreeLogBuffer_CS (unsigned index) { - ref(FreeLogBuffer_CS); - if (s_logBuf[index]) { FREE(s_logBuf[index]); s_logBuf[index] = nil; @@ -306,8 +299,6 @@ static void FlushLogFile_CS ( unsigned index, TimeDesc timeDesc ) { - ref(FlushLogFile_CS); - bool close = !s_running || (s_logTime[index].day != timeDesc.day); WriteLogFile_CS(index, close); if (close) @@ -316,8 +307,6 @@ static void FlushLogFile_CS ( //============================================================================ static unsigned FlushLogsTimerCallback (void *) { - ref(FlushLogsTimerCallback); - AsyncLogFlush(); return kAsyncTimeInfinite; } @@ -411,10 +400,6 @@ void AsyncLogWriteMsg ( ELogSeverity severity, const wchar msg[] ) { - ref(facility); - ref(severity); - ref(msg); - if (!s_running) return; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIni/Private/pnIniCore.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIni/Private/pnIniCore.cpp index 48a27d2f..efce5757 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIni/Private/pnIniCore.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIni/Private/pnIniCore.cpp @@ -725,9 +725,6 @@ unsigned IniGetBoundedValue ( unsigned maxVal, unsigned defVal ) { - ref(key); - ref(section); - if (!value) return defVal; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIniExe/Private/Win32/pnW32IniChange.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIniExe/Private/Win32/pnW32IniChange.cpp index a80b3244..9929690e 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIniExe/Private/Win32/pnW32IniChange.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnIniExe/Private/Win32/pnW32IniChange.cpp @@ -110,8 +110,6 @@ static void ChangeDispatch_WL (IniChangeReg * marker) { //=========================================================================== static unsigned THREADCALL IniSrvThreadProc (AsyncThread * thread) { - ref(thread); - IniChangeReg marker; marker.fNotify = nil; s_lock.EnterWrite(); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp index ebfe3579..602c46f0 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp @@ -127,7 +127,6 @@ namespace pnNetCli { static void PutBufferOnWire (NetCli * cli, void * data, unsigned bytes) { byte * temp, * heap = NULL; - ref(temp); if (cli->mode == kNetCliModeEncrypted) { // Encrypt data... @@ -224,7 +223,6 @@ static void BufferedSendData ( return; unsigned_ptr const * const msgEnd = msg + fieldCount; - ref(msgEnd); const NetMsgInitSend * sendMsg = NetMsgChannelFindSendMessage(cli->channel, msg[0]); ASSERT(msg[0] == sendMsg->msg.messageId); @@ -990,7 +988,6 @@ bool NetCliDispatch ( if (cli->mode == kNetCliModeEncrypted) { // Decrypt data... byte * temp, * heap = NULL; - ref(temp); #ifndef NO_ENCRYPTION if (bytes <= 2048) @@ -1008,7 +1005,6 @@ bool NetCliDispatch ( // Add data to accumulator and dispatch cli->input.Add(bytes, data); bool result = DispatchData(cli, param); - ref(result); #ifdef SERVER cli->recvDispatch = result; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetDiag/pnNdDns.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetDiag/pnNdDns.cpp index 0b4379a3..eafca21b 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetDiag/pnNdDns.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetDiag/pnNdDns.cpp @@ -62,8 +62,6 @@ static void LookupCallback ( unsigned addrCount, const NetAddress addrs[] ) { - ref(name); - DNSParam * p = (DNSParam *)param; if (addrCount) { unsigned node = NetAddressGetNode(addrs[0]); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetDiag/pnNdTcp.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetDiag/pnNdTcp.cpp index fd6ee57a..bf9662fc 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetDiag/pnNdTcp.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetDiag/pnNdTcp.cpp @@ -138,8 +138,6 @@ static bool Recv_PingReply ( unsigned bytes, void * ) { - ref(bytes); - const Auth2Cli_PingReply & reply = *(const Auth2Cli_PingReply *)msg; AuthTrans * trans; @@ -399,8 +397,6 @@ static bool AuthSocketNotifyCallback ( //============================================================================ static bool Recv_File2Cli_ManifestReply (FileConn * conn, const File2Cli_ManifestReply & msg) { - ref(conn); - FileTrans * trans; s_critsect.Enter(); { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp index 660632f6..edc55551 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp @@ -140,8 +140,6 @@ static inline bool ICompareStringI (const T lhs[], const T rhs[]) { //============================================================================ static inline bool ICompareArray (const byte lhs[], const byte rhs[]) { - ref(lhs); - ref(rhs); return false; } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp index d4a4332e..cb08e303 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnProduct/Private/pnPrBuildId.cpp @@ -41,7 +41,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // This line must NEVER be modified manually; it is automatically updated // by the build server. -#define BUILD_ID 902 +#define BUILD_ID 897 COMPILER_ASSERT(BUILD_ID != 0); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp index 1fe800e5..892bf2b6 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp @@ -396,8 +396,6 @@ static void AsyncLookupCallback ( unsigned addrCount, const NetAddress addrs[] ) { - ref(name); - ConnectParam * cp = (ConnectParam *)param; if (!addrCount) { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp index ecf3e8fb..be89bdc1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp @@ -85,7 +85,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com // 127.0.0.0 - 127.0.0.255 // (lowest) static int NetAddressNodeSortValueNetOrder (NetAddressNode addr) { - ref(NetAddressNodeSortValueNetOrder); // Loopback addresses if ((addr & kNetClassALoopbackMask) == (kNetClassALoopbackAddr & kNetClassALoopbackMask)) return 4; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp index 521072e8..01e01538 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp @@ -77,7 +77,6 @@ unsigned CBaseArray::CalcAllocGrowth (unsigned newAlloc, unsigned oldAlloc, unsi //=========================================================================== void * CBaseArray::ReallocPtr (void * ptr, unsigned bytes) { - ref(ptr); void * newPtr = nil; if (bytes) { newPtr = ALLOCFLAGS(bytes, ARR_MEMORY_FLAGS); diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h index 02891106..af9628d7 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h @@ -275,12 +275,12 @@ template class TArrayCopyBits { public: inline static void Assign (T * dest, const T source[], unsigned count); - inline static void Construct (T * dest) { ref(dest); } - inline static void Construct (T * dest, unsigned count) { ref(dest); ref(count); } + inline static void Construct (T * dest) { } + inline static void Construct (T * dest, unsigned count) { } inline static void CopyConstruct (T * dest, const T & source); inline static void CopyConstruct (T * dest, const T source[], unsigned count); - inline static void Destruct (T * dest) { ref(dest); } - inline static void Destruct (T * dest, unsigned count) { ref(dest); ref(count); } + inline static void Destruct (T * dest) { } + inline static void Destruct (T * dest, unsigned count) { } }; //=========================================================================== @@ -362,14 +362,12 @@ void TArrayCopyObject::CopyConstruct (T * dest, const T source[], unsigned co //=========================================================================== template void TArrayCopyObject::Destruct (T * dest) { - ref(dest); dest->~T(); } //=========================================================================== template void TArrayCopyObject::Destruct (T * dest, unsigned count) { - ref(dest); for (unsigned loop = count; loop--; ) dest[loop].~T(); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp index 687f9f15..fed360d2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp @@ -91,8 +91,6 @@ unsigned Base64Encode ( ASSERT(dstChars >= Base64EncodeSize(srcChars)); ASSERT(dstData); - ref(dstChars); - const char * dstBase = dstData; const byte * srcTerm = srcData + srcChars; for (;;) switch (srcTerm - srcData) { @@ -136,7 +134,6 @@ unsigned Base64Decode ( ASSERT(srcData); ASSERT(dstChars >= Base64DecodeSize(srcChars)); ASSERT(dstData); - ref(dstChars); const byte * dstBase = dstData; const char * srcTerm = srcData + srcChars; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp index 606f9bc7..5b3c714d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp @@ -597,15 +597,10 @@ bool CCmdParser::IsSpecified (const wchar name[]) const { //=========================================================================== void CCmdParser::OnError (const wchar str[], ECmdError errorCode, const wchar arg[], const wchar value[]) { - ref(str); - ref(errorCode); - ref(arg); - ref(value); } //=========================================================================== bool CCmdParser::OnExtra (const wchar str[]) { - ref(str); return false; } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp index 8422d681..aa189b77 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp @@ -143,7 +143,7 @@ static void Rc4Codec ( unsigned sourceBytes, const void * sourceData ) { - ref(encrypt); // RC4 uses the same algorithm to both encrypt and decrypt + // RC4 uses the same algorithm to both encrypt and decrypt dest->SetCount(sourceBytes); RC4((RC4_KEY *)key->handle, sourceBytes, (const unsigned char *)sourceData, dest->Ptr()); } @@ -155,7 +155,7 @@ static void Rc4Codec ( unsigned bytes, void * data ) { - ref(encrypt); // RC4 uses the same algorithm to both encrypt and decrypt + // RC4 uses the same algorithm to both encrypt and decrypt byte * temp = ALLOCA(byte, bytes); RC4((RC4_KEY *)key->handle, bytes, (const unsigned char *)data, temp); MemCopy(data, temp, bytes); @@ -165,7 +165,7 @@ static void Rc4Codec ( //=========================================================================== void KeyRc4::Codec (bool encrypt, ARRAY(byte) * dest, unsigned sourceBytes, const void * sourceData) { - ref(encrypt); // RC4 uses the same algorithm to both encrypt and decrypt + // RC4 uses the same algorithm to both encrypt and decrypt dest->SetCount(sourceBytes); byte * destDataPtr = (byte *)dest->Ptr(); @@ -365,8 +365,6 @@ void CryptKeyGenerate ( break; case kCryptRsa: - ref(keyBits); - ref(publicData); #if 0 KeyRsa::KeyGen( keyBits, diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtEndian.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtEndian.h index 4e104188..5b9daf92 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtEndian.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtEndian.h @@ -74,8 +74,6 @@ inline void EndianConvert ( word * array, unsigned count ) { - ref(array); - ref(count); return; } @@ -84,8 +82,6 @@ inline void EndianConvert ( dword * array, unsigned count ) { - ref(array); - ref(count); return; } @@ -94,8 +90,6 @@ inline void EndianConvert ( qword * array, unsigned count ) { - ref(array); - ref(count); return; } @@ -105,9 +99,6 @@ inline void EndianConvert ( unsigned elemCount, unsigned elemBytes ) { - ref(data); - ref(elemCount); - ref(elemBytes); return; } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h index d39fd3cc..bf3e07dd 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h @@ -203,7 +203,6 @@ TBaseHashTable::TBaseHashTable () { //=========================================================================== template TBaseHashTable::TBaseHashTable (const TBaseHashTable & source) { - ref(source); #ifdef HS_DEBUGGING FATAL("No copy constructor"); #endif @@ -213,7 +212,6 @@ TBaseHashTable::TBaseHashTable (const TBaseHashTable & source) { //=========================================================================== template TBaseHashTable & TBaseHashTable::operator= (const TBaseHashTable & source) { - ref(source); #ifdef HS_DEBUGGING FATAL("No assignment operator"); #endif @@ -329,7 +327,6 @@ const T * TBaseHashTable::Next (const T * object) const { template void TBaseHashTable::Order (T * linkedObject, ELinkType linkType, T * existingObject) { THashLink & link = GetLink(linkedObject); - ref(link); ASSERT(link.m_linkToFull.IsLinked()); m_fullList.Link(linkedObject, linkType, existingObject); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h index f37674a0..3a3c5ffc 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h @@ -122,7 +122,6 @@ CBaseLink::CBaseLink () { //=========================================================================== CBaseLink::CBaseLink (const CBaseLink & source) { - ref(source); #ifdef HS_DEBUGGING if (source.IsLinked()) FATAL("No copy constructor"); @@ -137,7 +136,6 @@ CBaseLink::~CBaseLink () { //=========================================================================== CBaseLink & CBaseLink::operator= (const CBaseLink & source) { - ref(source); #ifdef HS_DEBUGGING FATAL("No assignment operator"); #endif @@ -348,7 +346,6 @@ CBaseList::CBaseList () { //=========================================================================== CBaseList::CBaseList (const CBaseList & source) { m_linkOffset = LINK_OFFSET_UNINIT; - ref(source); } //=========================================================================== @@ -359,7 +356,6 @@ CBaseList::~CBaseList () { //=========================================================================== CBaseList & CBaseList::operator= (const CBaseList & source) { - ref(source); return *this; } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h index 2ff3ef29..8643a3f0 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h @@ -86,7 +86,6 @@ public: ASSERT(!zeroed); #endif long prev = AtomicAdd(&m_ref, 1); - ref(tag); REFTRACE("Inc %p %s: %u", this, tag, prev+1); return prev+1; } @@ -103,7 +102,6 @@ public: ASSERT(!zeroed); #endif long prev = AtomicAdd(&m_ref, n); - ref(tag); REFTRACE("Inc %p %s: %u", this, tag, prev+n); return prev+n; } @@ -133,7 +131,6 @@ public: #endif OnZeroRef(); } - ref(tag); REFTRACE("Dec %p %s: %u", this, tag, prev-1); return prev-1; } @@ -145,8 +142,6 @@ public: #ifdef HS_DEBUGGING ASSERT(!zeroed); #endif - ref(oldTag); - ref(newTag); REFTRACE("Inc %p %s: (xfer)", this, newTag); REFTRACE("Dec %p %s: (xfer)", this, oldTag); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp index 611ecc23..7e3028e5 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp @@ -76,8 +76,6 @@ void CBaseSpareList::Free (void * object, unsigned objectSize) { // initialize memory to a freaky value in debug mode #ifdef HS_DEBUGGING MemSet(object, (byte) ((unsigned) object >> 4), objectSize); - #else - ref(objectSize); #endif // link memory block onto head of spare list @@ -140,8 +138,6 @@ void CBaseSpareList::CleanUp (const char typeName[]) { } #endif } - #else - ref(typeName); #endif // walk chain of AllocNodes and free each of them diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h index 821ee7fc..4b306d0c 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h @@ -94,9 +94,9 @@ struct Uuid { inline bool operator ! () const { return GuidIsNil(*this); } inline bool operator < (const Uuid & rhs) const { return GuidCompare(*this, rhs) < 0; } inline bool operator == (const Uuid & rhs) const { return GuidsAreEqual(*this, rhs); } - inline bool operator == (int rhs) const { ref(rhs); ASSERT(!rhs); return GuidsAreEqual(*this, kNilGuid); } + inline bool operator == (int rhs) const { ASSERT(!rhs); return GuidsAreEqual(*this, kNilGuid); } inline bool operator != (const Uuid & rhs) const { return !GuidsAreEqual(*this, rhs); } - inline bool operator != (int rhs) const { ref(rhs); ASSERT(!rhs); return !GuidsAreEqual(*this, kNilGuid); } + inline bool operator != (int rhs) const { ASSERT(!rhs); return !GuidsAreEqual(*this, kNilGuid); } }; #include diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h index 42c24a4d..dd3aaa1a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h @@ -41,8 +41,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define kNeighborhoodAgeFilename "Neighborhood" #define kNeighborhoodAgeFilenameW L"Neighborhood" -#define kNeighborhoodAgeInstanceName "Hood" -#define kNeighborhoodAgeInstanceNameW L"Hood" +#define kNeighborhoodAgeInstanceName "Bevin" +#define kNeighborhoodAgeInstanceNameW L"Bevin" #define kStartupNeighborhoodUserDefinedName "DRC" #define kStartupNeighborhoodUserDefinedNameW L"DRC" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp index 93e90c41..5ff36b3a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp @@ -1533,8 +1533,6 @@ static void AsyncLookupCallback ( unsigned addrCount, const NetAddress addrs[] ) { - ref(param); - if (!addrCount) { ReportNetError(kNetProtocolCli2Auth, kNetErrNameLookupFailed); return; @@ -1988,9 +1986,6 @@ static bool Recv_KickedOff ( unsigned bytes, void * param ) { - ref(bytes); - ref(param); - const Auth2Cli_KickedOff & msg = *(const Auth2Cli_KickedOff *)buffer; ReportNetError(kNetProtocolCli2Auth, msg.reason); @@ -2521,8 +2516,6 @@ bool PingRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - const Auth2Cli_PingReply & reply = *(const Auth2Cli_PingReply *)msg; m_payload.Set(reply.payload, reply.payloadBytes); @@ -2584,8 +2577,6 @@ bool AccountExistsRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - const Auth2Cli_AccountExistsReply & reply = *(const Auth2Cli_AccountExistsReply *)msg; m_exists = reply.exists; @@ -2693,8 +2684,6 @@ bool LoginRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - dword msgId = (dword)*msg; switch (msgId) { case kAuth2Cli_AcctPlayerInfo: { @@ -2782,7 +2771,6 @@ bool AgeRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_AgeReply & reply = *(const Auth2Cli_AgeReply *) msg; m_gameSrvNode = reply.gameSrvNode; m_ageMcpId = reply.ageMcpId; @@ -2855,7 +2843,6 @@ bool AccountCreateRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_AcctCreateReply & reply = *(const Auth2Cli_AcctCreateReply *) msg; m_result = reply.result; @@ -2927,7 +2914,6 @@ bool AccountCreateFromKeyRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_AcctCreateFromKeyReply & reply = *(const Auth2Cli_AcctCreateFromKeyReply *) msg; m_result = reply.result; @@ -2995,7 +2981,6 @@ bool PlayerCreateRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_PlayerCreateReply & reply = *(const Auth2Cli_PlayerCreateReply *) msg; if (!IS_NET_ERROR(reply.result)) { m_playerInfo.playerInt = reply.playerInt; @@ -3162,7 +3147,6 @@ bool SetPlayerRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_AcctSetPlayerReply & reply = *(const Auth2Cli_AcctSetPlayerReply *) msg; m_result = reply.result; m_state = kTransStateComplete; @@ -3224,7 +3208,6 @@ bool AccountChangePasswordRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_AcctChangePasswordReply & reply = *(const Auth2Cli_AcctChangePasswordReply *) msg; m_result = reply.result; @@ -3280,7 +3263,6 @@ bool GetPublicAgeListTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_PublicAgeList & reply = *(const Auth2Cli_PublicAgeList *) msg; if (IS_NET_SUCCESS(reply.result)) @@ -3342,7 +3324,6 @@ bool AccountSetRolesRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_AcctSetRolesReply & reply = *(const Auth2Cli_AcctSetRolesReply *) msg; m_result = reply.result; @@ -3400,7 +3381,6 @@ bool AccountSetBillingTypeRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_AcctSetBillingTypeReply & reply = *(const Auth2Cli_AcctSetBillingTypeReply *) msg; m_result = reply.result; @@ -3455,7 +3435,6 @@ bool AccountActivateRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_AcctActivateReply & reply = *(const Auth2Cli_AcctActivateReply *) msg; m_result = reply.result; @@ -3510,7 +3489,6 @@ bool FileListRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_FileListReply & reply = *(const Auth2Cli_FileListReply *) msg; dword wcharCount = reply.wcharCount; @@ -3626,7 +3604,6 @@ bool FileDownloadRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_FileDownloadChunk & reply = *(const Auth2Cli_FileDownloadChunk *) msg; if (IS_NET_ERROR(reply.result)) { @@ -3961,8 +3938,6 @@ bool VaultFetchNodeTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - const Auth2Cli_VaultNodeFetched & reply = *(const Auth2Cli_VaultNodeFetched *) msg; if (IS_NET_SUCCESS(reply.result)) { @@ -4039,8 +4014,6 @@ bool VaultFindNodeTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - const Auth2Cli_VaultNodeFindReply & reply = *(const Auth2Cli_VaultNodeFindReply *) msg; if (IS_NET_SUCCESS(reply.result)) { @@ -4109,8 +4082,6 @@ bool VaultCreateNodeTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - const Auth2Cli_VaultNodeCreated & reply = *(const Auth2Cli_VaultNodeCreated *) msg; if (IS_NET_SUCCESS(reply.result)) @@ -4179,8 +4150,6 @@ bool VaultSaveNodeTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - const Auth2Cli_VaultSaveNodeReply & reply = *(const Auth2Cli_VaultSaveNodeReply *) msg; m_result = reply.result; @@ -4244,8 +4213,6 @@ bool VaultAddNodeTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - const Auth2Cli_VaultAddNodeReply & reply = *(const Auth2Cli_VaultAddNodeReply *) msg; m_result = reply.result; @@ -4306,8 +4273,6 @@ bool VaultRemoveNodeTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - const Auth2Cli_VaultRemoveNodeReply & reply = *(const Auth2Cli_VaultRemoveNodeReply *) msg; m_result = reply.result; @@ -4379,7 +4344,6 @@ bool SetPlayerBanStatusRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_SetPlayerBanStatusReply & reply = *(const Auth2Cli_SetPlayerBanStatusReply *) msg; m_result = reply.result; @@ -4437,7 +4401,6 @@ bool ChangePlayerNameRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_ChangePlayerNameReply & reply = *(const Auth2Cli_ChangePlayerNameReply *) msg; m_result = reply.result; @@ -4499,7 +4462,6 @@ bool SendFriendInviteTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_SendFriendInviteReply & reply = *(const Auth2Cli_SendFriendInviteReply *) msg; m_result = reply.result; @@ -4590,7 +4552,6 @@ bool ScoreCreateTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_ScoreCreateReply & reply = *(const Auth2Cli_ScoreCreateReply *) msg; m_scoreId = reply.scoreId; @@ -4650,7 +4611,6 @@ bool ScoreDeleteTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_ScoreDeleteReply & reply = *(const Auth2Cli_ScoreDeleteReply *) msg; m_result = reply.result; @@ -4717,7 +4677,6 @@ bool ScoreGetScoresTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_ScoreGetScoresReply & reply = *(const Auth2Cli_ScoreGetScoresReply *) msg; if (reply.scoreCount > 0) { @@ -4793,7 +4752,6 @@ bool ScoreAddPointsTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_ScoreAddPointsReply & reply = *(const Auth2Cli_ScoreAddPointsReply *) msg; m_result = reply.result; @@ -4856,7 +4814,6 @@ bool ScoreTransferPointsTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_ScoreTransferPointsReply & reply = *(const Auth2Cli_ScoreTransferPointsReply *) msg; m_result = reply.result; @@ -4916,7 +4873,6 @@ bool ScoreSetPointsTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_ScoreSetPointsReply & reply = *(const Auth2Cli_ScoreSetPointsReply *) msg; m_result = reply.result; @@ -4997,7 +4953,6 @@ bool ScoreGetRanksTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const Auth2Cli_ScoreGetRanksReply & reply = *(const Auth2Cli_ScoreGetRanksReply *) msg; if (reply.rankCount > 0) { @@ -5693,7 +5648,6 @@ unsigned NetCliAuthVaultNodeSave ( void NetCliAuthVaultNodeDelete ( unsigned nodeId ) { - ref(nodeId); hsAssert(false, "eric, implement me"); } @@ -5826,7 +5780,6 @@ void NetCliAuthSetRecvBufferHandler ( void NetCliAuthSendCCRPetition ( const wchar * petitionText ) { - ref(petitionText); hsAssert(false, "eric, implement me."); } diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp index 14d8c8e7..f9afd7e1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp @@ -547,8 +547,6 @@ static void AsyncLookupCallback ( unsigned addrCount, const NetAddress addrs[] ) { - ref(param); - if (!addrCount) { ReportNetError(kNetProtocolCli2File, kNetErrNameLookupFailed); return; @@ -777,7 +775,6 @@ void CliFileConn::Dispatch (const Cli2File_MsgHeader * msg) { bool CliFileConn::Recv_PingReply ( const File2Cli_PingReply * msg ) { - ref(msg); return true; } @@ -858,7 +855,6 @@ bool BuildIdRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); const File2Cli_BuildIdReply & reply = *(const File2Cli_BuildIdReply *) msg; if (IS_NET_ERROR(reply.result)) { @@ -944,7 +940,6 @@ bool ManifestRequestTrans::Recv ( ) { m_timeoutAtMs = TimeGetMs() + NetTransGetTimeoutMs(); // Reset the timeout counter - ref(bytes); const File2Cli_ManifestReply & reply = *(const File2Cli_ManifestReply *) msg; dword numFiles = reply.numFiles; @@ -1157,7 +1152,6 @@ bool DownloadRequestTrans::Recv ( ) { m_timeoutAtMs = TimeGetMs() + NetTransGetTimeoutMs(); // Reset the timeout counter - ref(bytes); const File2Cli_FileDownloadReply & reply = *(const File2Cli_FileDownloadReply *) msg; dword byteCount = reply.byteCount; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp index 9e9b0c01..bb9bc012 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp @@ -414,9 +414,6 @@ static bool Recv_PingReply ( unsigned bytes, void * param ) { - ref(msg); - ref(bytes); - ref(param); return true; } @@ -426,9 +423,6 @@ static bool Recv_JoinAgeReply ( unsigned bytes, void * param ) { - ref(bytes); - ref(param); - const Game2Cli_JoinAgeReply & reply = *(const Game2Cli_JoinAgeReply *)msg; if (sizeof(reply) != bytes) return false; @@ -444,9 +438,6 @@ static bool Recv_PropagateBuffer ( unsigned bytes, void * param ) { - ref(bytes); - ref(param); - const Game2Cli_PropagateBuffer & reply = *(const Game2Cli_PropagateBuffer *)msg; RcvdPropagatedBufferTrans * trans = NEW(RcvdPropagatedBufferTrans); @@ -465,9 +456,6 @@ static bool Recv_GameMgrMsg ( unsigned bytes, void * param ) { - ref(bytes); - ref(param); - const Game2Cli_GameMgrMsg & reply = *(const Game2Cli_GameMgrMsg *)msg; RcvdGameMgrMsgTrans * trans = NEW(RcvdGameMgrMsgTrans); @@ -555,8 +543,6 @@ bool JoinAgeRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - const Game2Cli_JoinAgeReply & reply = *(const Game2Cli_JoinAgeReply *) msg; m_result = reply.result; m_state = kTransStateComplete; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp index 32ef18c5..92875afa 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp @@ -472,8 +472,6 @@ static void AsyncLookupCallback ( unsigned addrCount, const NetAddress addrs[] ) { - ref(param); - if (!addrCount) { ReportNetError(kNetProtocolCli2GateKeeper, kNetErrNameLookupFailed); return; @@ -802,8 +800,6 @@ bool PingRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - const GateKeeper2Cli_PingReply & reply = *(const GateKeeper2Cli_PingReply *)msg; m_payload.Set(reply.payload, reply.payloadBytes); @@ -866,8 +862,6 @@ bool FileSrvIpAddressRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - const GateKeeper2Cli_FileSrvIpAddressReply & reply = *(const GateKeeper2Cli_FileSrvIpAddressReply *)msg; @@ -926,8 +920,6 @@ bool AuthSrvIpAddressRequestTrans::Recv ( const byte msg[], unsigned bytes ) { - ref(bytes); - const GateKeeper2Cli_AuthSrvIpAddressReply & reply = *(const GateKeeper2Cli_AuthSrvIpAddressReply *)msg; m_result = kNetSuccess;