OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

Remove useless ref macro, since it conflicts with VS2010's libraries.

Browse Source 
The compiler warnings will have to be cleaned up later (without the use of a silly macro)

(cherry picked from commit 4218993bf5)
This commit is contained in:
Zrax
2011-04-06 20:39:14 -06:00
committed by rarified
parent 951011d903
commit 8b7a955d9b
44 changed files with 15 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp
View File

@ -386,10 +386,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) {
@ -732,8 +728,6 @@ static void ThinManifestCallback (
){
s_numConnectFailures = 0;
REF(group);
plLauncherInfo * info = (plLauncherInfo *) param;
char text[256];
StrPrintf(text, arrsize(text), "Checking for updates...");
@ -831,8 +825,6 @@ static void FileSrvIpAddressCallback (
void * param,
const wchar addr[]
) {
REF(param);
NetCliGateKeeperDisconnect();
if (IS_NET_ERROR(result)) {
@ -960,7 +952,6 @@ void UruPrepProc (void * param) {
void PlayerStopProc (void * param) {
s_running = false;
plLauncherInfo *info = (plLauncherInfo *) param;
//TerminateProcess(s_pi.hProcess, kExitCodeTerminated);
info->stopCallback(kStatusOk, nil);
}
@ -1036,4 +1027,4 @@ void UruStartProc (void * param) {
{
info->startCallback(kStatusError, nil);
}
}
}

5
Sources/Plasma/Apps/plUruLauncher/SelfPatcher.cpp
View File

@ -821,10 +821,7 @@ void plSelfPatcher::Stop()
}
//============================================================================
void plSelfPatcher::NetErrorHandler(ENetProtocol protocol, ENetError error)
{
REF(protocol);
void plSelfPatcher::NetErrorHandler (ENetProtocol protocol, ENetError error) {
LogMsg(kLogError, L"plSelfPatcher::NetErrorHandler: %s", NetErrorToString(error));
if (IS_NET_SUCCESS(s_selfPatcher.fResult))
s_selfPatcher.fResult = error;

14
Sources/Plasma/CoreLib/hsTypes.h
View File

@ -308,20 +308,6 @@ typedef hsColor32 hsRGBAColor32;
#endif
/****************************************************************************
*
* REF
* References a variable to prevent compiler warnings
*
***/
#define REF(a) ((void *)&(a))
#if _MSC_VER < 1400
// For compatibility only, deprecated - use REF instead
#define ref(a) REF(a)
#endif
/****************************************************************************
*
* UNIQUE_SYMBOL

12
Sources/Plasma/CoreLibExe/hsExeError.cpp
View File

@ -79,9 +79,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
@ -249,11 +246,6 @@ void DebugMsgV (const char fmt[], va_list args) {
if (s_critsect)
s_critsect->Leave();
#else
REF(fmt);
REF(args);
#endif
}
@ -266,9 +258,5 @@ void __cdecl DebugMsg (const char fmt[], ...) {
DebugMsgV(fmt, args);
va_end(args);
#else
REF(fmt);
#endif
}

24
Sources/Plasma/CoreLibExe/hsExeMalloc.cpp
View File

@ -295,8 +295,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;
@ -337,7 +335,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;
@ -357,17 +354,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;
@ -434,8 +422,6 @@ void MemValidateNow () {
//============================================================================
void MemSetValidation (unsigned on) {
REF(on);
#ifdef MEM_DEBUG
#endif // MEM_DEBUG
}
@ -459,8 +445,6 @@ void MemPopDisableTracking () {
//============================================================================
void MemSetColor (unsigned short color) {
REF(color);
#ifdef MEM_DEBUG
s_memColor = color & 0xFFFF;
#endif // MEM_DEBUG
@ -469,9 +453,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)
@ -520,8 +501,6 @@ void * MemAlloc (unsigned bytes, unsigned flags, const char file[], int line) {
//============================================================================
void MemFree (void * ptr, unsigned flags) {
REF(flags);
if (!ptr)
return;
@ -535,9 +514,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

10
Sources/Plasma/FeatureLib/pfGameMgr/BlueSpiral/pfGmBlueSpiral.cpp
View File

@ -150,8 +150,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());
@ -159,8 +157,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());
@ -168,8 +164,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());
@ -177,8 +171,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());
@ -186,8 +178,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());

8
Sources/Plasma/FeatureLib/pfGameMgr/ClimbingWall/pfGmClimbingWall.cpp
View File

@ -151,7 +151,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);
@ -160,7 +159,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);
@ -169,7 +167,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);
@ -178,7 +175,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);
@ -187,7 +183,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);
@ -196,7 +191,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);
@ -359,4 +353,4 @@ void pfGmClimbingWall::Panic () {
msg.transId = 0;
GameMgrSend(&msg);
}
}

11
Sources/Plasma/FeatureLib/pfGameMgr/Heek/pfGmHeek.cpp
View File

@ -151,7 +151,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());
@ -159,7 +158,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());
@ -167,7 +165,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());
@ -175,7 +172,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());
@ -183,7 +179,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());
@ -191,7 +186,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());
@ -199,7 +193,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());
@ -207,7 +200,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());
@ -215,7 +207,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());
@ -223,7 +214,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());
@ -231,7 +221,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());

24
Sources/Plasma/FeatureLib/pfGameMgr/Marker/pfGmMarker.cpp
View File

@ -175,8 +175,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());
@ -184,8 +182,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());
@ -193,8 +189,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());
@ -202,8 +196,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());
@ -211,8 +203,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());
@ -220,8 +210,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());
@ -229,8 +217,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());
@ -238,8 +224,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());
@ -250,8 +234,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());
@ -259,8 +241,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());
@ -268,8 +248,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());
@ -277,8 +255,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());

6
Sources/Plasma/FeatureLib/pfGameMgr/TicTacToe/pfGmTicTacToe.cpp
View File

@ -153,8 +153,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';
@ -172,8 +170,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());
@ -183,8 +179,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;

10
Sources/Plasma/FeatureLib/pfGameMgr/VarSync/pfGmVarSync.cpp
View File

@ -150,8 +150,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());
@ -159,8 +157,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());
@ -168,8 +164,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());
@ -177,8 +171,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());
@ -186,8 +178,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());

12
Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp
View File

@ -205,8 +205,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)
@ -216,8 +214,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)
@ -587,31 +583,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);
}

13
Sources/Plasma/FeatureLib/pfPython/pyAgeInfoStruct.cpp
View File

@ -123,18 +123,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

3
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNt.cpp
View File

@ -244,8 +244,6 @@ static void INtOpDispatch (
//===========================================================================
static unsigned THREADCALL NtWorkerThreadProc (AsyncThread * thread) {
REF(thread);
ThreadDenyBlock();
unsigned sleepMs = INFINITE;
@ -340,7 +338,6 @@ void INtConnCompleteOperation (NtObject * ntObj) {
return;
DWORD err = GetLastError();
REF(err);
switch (ntObj->ioType) {
case kNtFile:
INtFileDelete((NtFile *) ntObj);

7
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Nt/pnAceNtSocket.cpp
View File

@ -806,11 +806,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));
@ -947,7 +942,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
@ -1016,7 +1010,6 @@ void INtSocketOpCompleteSocketRead (
if (sock->connType == kConnTypeCliToAuth) {
int x = 0;
REF(x);
}
if (!SocketDispatchRead(sock))

13
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xSocket.cpp
View File

@ -1007,10 +1007,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();
@ -1155,8 +1151,6 @@ unsigned W9xSocketStartListening (
const NetAddress & listenAddr,
FAsyncNotifySocketProc notifyProc
) {
REF(listenAddr);
REF(notifyProc);
return 0;
}
@ -1166,8 +1160,6 @@ void W9xSocketStopListening (
const NetAddress & listenAddr,
FAsyncNotifySocketProc notifyProc
) {
REF(listenAddr);
REF(notifyProc);
}
//===========================================================================
@ -1190,9 +1182,6 @@ void W9xSocketSetNotifyProc (
AsyncSocket sock,
FAsyncNotifySocketProc notifyProc
) {
REF(sock);
REF(notifyProc);
// This provider does not allow changing the notification procedure
FATAL("SocketSetNotifyProc");
}
@ -1204,8 +1193,6 @@ void W9xSocketSetBacklogAlloc (
) {
// This provider does not limit the maximum backlog allocation
REF(sock);
REF(bufferSize);
}

2
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/W9x/pnAceW9xThread.cpp
View File

@ -392,8 +392,6 @@ bool W9xThreadWaitId (
AsyncId asyncId,
unsigned timeoutMs
) {
REF(file);
// Find a pending I/O operation with the given id
s_critSect.Enter();
CThreadDispRec * disp;

3
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Private/Win32/pnAceW32Thread.cpp
View File

@ -104,8 +104,6 @@ AsyncThreadTaskList::~AsyncThreadTaskList () {
//===========================================================================
static unsigned THREADCALL ThreadTaskProc (AsyncThread * thread) {
REF(thread);
PerfAddCounter(kAsyncPerfThreadTaskThreadsActive, 1);
for (;;) {
@ -266,7 +264,6 @@ void AsyncThreadTaskAdd (
ASSERT(taskList);
ASSERT(callback);
ASSERT(priority == kThreadTaskPriorityNormal);
REF(priority);
// Allocate a new task record
ThreadTask * task = NEW(ThreadTask);

5
Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceCore.cpp
View File

@ -91,7 +91,6 @@ static void DoTransgamingCheck () {
//===========================================================================
static void IAsyncInitUseW9x () {
REF(IAsyncInitUseW9x);
#ifdef HS_BUILD_FOR_WIN32
W9xGetApi(&g_api);
#else
@ -101,7 +100,6 @@ static void IAsyncInitUseW9x () {
//===========================================================================
static void IAsyncInitUseNt () {
REF(IAsyncInitUseNt);
#ifdef HS_BUILD_FOR_WIN32
NtGetApi(&g_api);
#else
@ -111,7 +109,6 @@ static void IAsyncInitUseNt () {
//===========================================================================
static void IAsyncInitUseUnix () {
REF(IAsyncInitUseUnix);
#ifdef HS_BUILD_FOR_UNIX
#error Unix I/O not implemented yet
UxGetApi(&g_api);
@ -122,7 +119,6 @@ static void IAsyncInitUseUnix () {
//===========================================================================
static void IAsyncInitForClient () {
REF(IAsyncInitForClient);
#ifdef HS_BUILD_FOR_WIN32
DoTransgamingCheck();
if (s_transgaming) {
@ -140,7 +136,6 @@ static void IAsyncInitForClient () {
//===========================================================================
static void IAsyncInitForServer () {
REF(IAsyncInitForServer);
#ifdef HS_BUILD_FOR_WIN32
IAsyncInitUseNt();
#elif HS_BUILD_FOR_UNIX

15
Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceLog.cpp
View File

@ -143,9 +143,6 @@ static void LogFileNotifyProc (
AsyncNotifyFile * notify,
void ** userState
) {
REF(file);
REF(userState);
switch (code) {
case kNotifyFileWrite:
FREE(notify->param);
@ -163,8 +160,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;
@ -175,8 +170,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;
@ -322,8 +315,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)
@ -332,8 +323,6 @@ static void FlushLogFile_CS (
//============================================================================
static unsigned FlushLogsTimerCallback (void *) {
REF(FlushLogsTimerCallback);
AsyncLogFlush();
return kAsyncTimeInfinite;
}
@ -427,10 +416,6 @@ void AsyncLogWriteMsg (
ELogSeverity severity,
const wchar msg[]
) {
REF(facility);
REF(severity);
REF(msg);
if (!s_running)
return;

3
Sources/Plasma/NucleusLib/pnIni/Private/pnIniCore.cpp
View File

@ -741,9 +741,6 @@ unsigned IniGetBoundedValue (
unsigned maxVal,
unsigned defVal
) {
REF(key);
REF(section);
if (!value)
return defVal;

2
Sources/Plasma/NucleusLib/pnIniExe/Private/Win32/pnW32IniChange.cpp
View File

@ -126,8 +126,6 @@ static void ChangeDispatch_WL (IniChangeReg * marker) {
//===========================================================================
static unsigned THREADCALL IniSrvThreadProc (AsyncThread * thread) {
REF(thread);
IniChangeReg marker;
marker.fNotify = nil;
s_lock.EnterWrite();

4
Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp
View File

@ -143,7 +143,6 @@ namespace pnNetCli {
static void PutBufferOnWire (NetCli * cli, void * data, unsigned bytes) {
byte * temp, * heap = NULL;
REF(temp);
if (cli->mode == kNetCliModeEncrypted) {
// Encrypt data...
@ -240,7 +239,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);
@ -1006,7 +1004,6 @@ bool NetCliDispatch (
if (cli->mode == kNetCliModeEncrypted) {
// Decrypt data...
byte * temp, * heap = NULL;
REF(temp);
#ifndef NO_ENCRYPTION
if (bytes <= 2048)
@ -1024,7 +1021,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;

2
Sources/Plasma/NucleusLib/pnNetDiag/pnNdDns.cpp
View File

@ -78,8 +78,6 @@ static void LookupCallback (
unsigned addrCount,
const NetAddress addrs[]
) {
REF(name);
DNSParam * p = (DNSParam *)param;
if (addrCount) {
unsigned node = NetAddressGetNode(addrs[0]);

4
Sources/Plasma/NucleusLib/pnNetDiag/pnNdTcp.cpp
View File

@ -154,8 +154,6 @@ static bool Recv_PingReply (
unsigned bytes,
void *
) {
REF(bytes);
const Auth2Cli_PingReply & reply = *(const Auth2Cli_PingReply *)msg;
AuthTrans * trans;
@ -415,8 +413,6 @@ static bool AuthSocketNotifyCallback (
//============================================================================
static bool Recv_File2Cli_ManifestReply (FileConn * conn, const File2Cli_ManifestReply & msg) {
REF(conn);
FileTrans * trans;
s_critsect.Enter();
{

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp
View File

@ -156,8 +156,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;
}

2
Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.cpp
View File

@ -412,8 +412,6 @@ static void AsyncLookupCallback (
unsigned addrCount,
const NetAddress addrs[]
) {
REF(name);
ConnectParam * cp = (ConnectParam *)param;
if (!addrCount) {

1
Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp
View File

@ -101,7 +101,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;

1
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp
View File

@ -93,7 +93,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);

10
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h
View File

@ -291,12 +291,12 @@ template<class T>
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) { }
};
//===========================================================================
@ -378,14 +378,12 @@ void TArrayCopyObject<T>::CopyConstruct (T * dest, const T source[], unsigned co
//===========================================================================
template<class T>
void TArrayCopyObject<T>::Destruct (T * dest) {
REF(dest);
dest->~T();
}
//===========================================================================
template<class T>
void TArrayCopyObject<T>::Destruct (T * dest, unsigned count) {
REF(dest);
for (unsigned loop = count; loop--; )
dest[loop].~T();
}

3
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp
View File

@ -107,8 +107,6 @@ unsigned Base64Encode (
ASSERT(dstChars >= Base64EncodeSize(srcChars));
ASSERT(dstData);
REF(dstChars);
const char * dstBase = dstData;
const byte * srcTerm = srcData + srcChars;
for (;;) switch (srcTerm - srcData) {
@ -152,7 +150,6 @@ unsigned Base64Decode (
ASSERT(srcData);
ASSERT(dstChars >= Base64DecodeSize(srcChars));
ASSERT(dstData);
REF(dstChars);
const byte * dstBase = dstData;
const char * srcTerm = srcData + srcChars;

5
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp
View File

@ -613,15 +613,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;
}

8
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp
View File

@ -159,7 +159,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());
}
@ -171,7 +171,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);
@ -181,7 +181,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();
@ -381,8 +381,6 @@ void CryptKeyGenerate (
break;
case kCryptRsa:
REF(keyBits);
REF(publicData);
#if 0
KeyRsa::KeyGen(
keyBits,

9
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtEndian.h
View File

@ -90,8 +90,6 @@ inline void EndianConvert (
word * array,
unsigned count
) {
REF(array);
REF(count);
return;
}
@ -100,8 +98,6 @@ inline void EndianConvert (
dword * array,
unsigned count
) {
REF(array);
REF(count);
return;
}
@ -110,8 +106,6 @@ inline void EndianConvert (
qword * array,
unsigned count
) {
REF(array);
REF(count);
return;
}
@ -121,9 +115,6 @@ inline void EndianConvert (
unsigned elemCount,
unsigned elemBytes
) {
REF(data);
REF(elemCount);
REF(elemBytes);
return;
}

3
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h
View File

@ -219,7 +219,6 @@ TBaseHashTable<T>::TBaseHashTable () {
//===========================================================================
template<class T>
TBaseHashTable<T>::TBaseHashTable (const TBaseHashTable<T> & source) {
REF(source);
#ifdef HS_DEBUGGING
FATAL("No copy constructor");
#endif
@ -229,7 +228,6 @@ TBaseHashTable<T>::TBaseHashTable (const TBaseHashTable<T> & source) {
//===========================================================================
template<class T>
TBaseHashTable<T> & TBaseHashTable<T>::operator= (const TBaseHashTable<T> & source) {
REF(source);
#ifdef HS_DEBUGGING
FATAL("No assignment operator");
#endif
@ -345,7 +343,6 @@ const T * TBaseHashTable<T>::Next (const T * object) const {
template<class T>
void TBaseHashTable<T>::Order (T * linkedObject, ELinkType linkType, T * existingObject) {
THashLink<T> & link = GetLink(linkedObject);
REF(link);
ASSERT(link.m_linkToFull.IsLinked());
m_fullList.Link(linkedObject, linkType, existingObject);
}

4
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h
View File

@ -138,7 +138,6 @@ CBaseLink::CBaseLink () {
//===========================================================================
CBaseLink::CBaseLink (const CBaseLink & source) {
REF(source);
#ifdef HS_DEBUGGING
if (source.IsLinked())
FATAL("No copy constructor");
@ -153,7 +152,6 @@ CBaseLink::~CBaseLink () {
//===========================================================================
CBaseLink & CBaseLink::operator= (const CBaseLink & source) {
REF(source);
#ifdef HS_DEBUGGING
FATAL("No assignment operator");
#endif
@ -364,7 +362,6 @@ CBaseList::CBaseList () {
//===========================================================================
CBaseList::CBaseList (const CBaseList & source) {
m_linkOffset = LINK_OFFSET_UNINIT;
REF(source);
}
//===========================================================================
@ -375,7 +372,6 @@ CBaseList::~CBaseList () {
//===========================================================================
CBaseList & CBaseList::operator= (const CBaseList & source) {
REF(source);
return *this;
}

5
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h
View File

@ -102,7 +102,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;
}
@ -119,7 +118,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;
}
@ -149,7 +147,6 @@ public:
#endif
OnZeroRef();
}
REF(tag);
REFTRACE("Dec %p %s: %u", this, tag, prev-1);
return prev-1;
}
@ -161,8 +158,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);
}

4
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp
View File

@ -92,8 +92,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
@ -156,8 +154,6 @@ void CBaseSpareList::CleanUp (const char typeName[]) {
}
#endif
}
#else
REF(typeName);
#endif
// walk chain of AllocNodes and free each of them

4
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h
View File

@ -110,9 +110,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 <PopPack.h>

4
Sources/Plasma/PubUtilLib/plNetCommon/plNetCommon.h
View File

@ -57,8 +57,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"

47
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
View File

@ -1550,8 +1550,6 @@ static void AsyncLookupCallback (
unsigned addrCount,
const NetAddress addrs[]
) {
REF(param);
if (!addrCount) {
ReportNetError(kNetProtocolCli2Auth, kNetErrNameLookupFailed);
return;
@ -2005,9 +2003,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);
@ -2538,8 +2533,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);
@ -2601,8 +2594,6 @@ bool AccountExistsRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_AccountExistsReply & reply = *(const Auth2Cli_AccountExistsReply *)msg;
m_exists = reply.exists;
@ -2710,8 +2701,6 @@ bool LoginRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
dword msgId = (dword)*msg;
switch (msgId) {
case kAuth2Cli_AcctPlayerInfo: {
@ -2799,7 +2788,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;
@ -2872,7 +2860,6 @@ bool AccountCreateRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_AcctCreateReply & reply = *(const Auth2Cli_AcctCreateReply *) msg;
m_result = reply.result;
@ -2944,7 +2931,6 @@ bool AccountCreateFromKeyRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_AcctCreateFromKeyReply & reply = *(const Auth2Cli_AcctCreateFromKeyReply *) msg;
m_result = reply.result;
@ -3012,7 +2998,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;
@ -3179,7 +3164,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;
@ -3241,7 +3225,6 @@ bool AccountChangePasswordRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_AcctChangePasswordReply & reply = *(const Auth2Cli_AcctChangePasswordReply *) msg;
m_result = reply.result;
@ -3297,7 +3280,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))
@ -3359,7 +3341,6 @@ bool AccountSetRolesRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_AcctSetRolesReply & reply = *(const Auth2Cli_AcctSetRolesReply *) msg;
m_result = reply.result;
@ -3417,7 +3398,6 @@ bool AccountSetBillingTypeRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_AcctSetBillingTypeReply & reply = *(const Auth2Cli_AcctSetBillingTypeReply *) msg;
m_result = reply.result;
@ -3472,7 +3452,6 @@ bool AccountActivateRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_AcctActivateReply & reply = *(const Auth2Cli_AcctActivateReply *) msg;
m_result = reply.result;
@ -3527,7 +3506,6 @@ bool FileListRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_FileListReply & reply = *(const Auth2Cli_FileListReply *) msg;
dword wcharCount = reply.wcharCount;
@ -3643,7 +3621,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)) {
@ -3978,8 +3955,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)) {
@ -4056,8 +4031,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)) {
@ -4126,8 +4099,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))
@ -4196,8 +4167,6 @@ bool VaultSaveNodeTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_VaultSaveNodeReply & reply = *(const Auth2Cli_VaultSaveNodeReply *) msg;
m_result = reply.result;
@ -4261,8 +4230,6 @@ bool VaultAddNodeTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_VaultAddNodeReply & reply = *(const Auth2Cli_VaultAddNodeReply *) msg;
m_result = reply.result;
@ -4323,8 +4290,6 @@ bool VaultRemoveNodeTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_VaultRemoveNodeReply & reply = *(const Auth2Cli_VaultRemoveNodeReply *) msg;
m_result = reply.result;
@ -4396,7 +4361,6 @@ bool SetPlayerBanStatusRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_SetPlayerBanStatusReply & reply = *(const Auth2Cli_SetPlayerBanStatusReply *) msg;
m_result = reply.result;
@ -4454,7 +4418,6 @@ bool ChangePlayerNameRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_ChangePlayerNameReply & reply = *(const Auth2Cli_ChangePlayerNameReply *) msg;
m_result = reply.result;
@ -4516,7 +4479,6 @@ bool SendFriendInviteTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_SendFriendInviteReply & reply = *(const Auth2Cli_SendFriendInviteReply *) msg;
m_result = reply.result;
@ -4607,7 +4569,6 @@ bool ScoreCreateTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_ScoreCreateReply & reply = *(const Auth2Cli_ScoreCreateReply *) msg;
m_scoreId = reply.scoreId;
@ -4667,7 +4628,6 @@ bool ScoreDeleteTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_ScoreDeleteReply & reply = *(const Auth2Cli_ScoreDeleteReply *) msg;
m_result = reply.result;
@ -4734,7 +4694,6 @@ bool ScoreGetScoresTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_ScoreGetScoresReply & reply = *(const Auth2Cli_ScoreGetScoresReply *) msg;
if (reply.scoreCount > 0) {
@ -4810,7 +4769,6 @@ bool ScoreAddPointsTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_ScoreAddPointsReply & reply = *(const Auth2Cli_ScoreAddPointsReply *) msg;
m_result = reply.result;
@ -4873,7 +4831,6 @@ bool ScoreTransferPointsTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_ScoreTransferPointsReply & reply = *(const Auth2Cli_ScoreTransferPointsReply *) msg;
m_result = reply.result;
@ -4933,7 +4890,6 @@ bool ScoreSetPointsTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_ScoreSetPointsReply & reply = *(const Auth2Cli_ScoreSetPointsReply *) msg;
m_result = reply.result;
@ -5014,7 +4970,6 @@ bool ScoreGetRanksTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const Auth2Cli_ScoreGetRanksReply & reply = *(const Auth2Cli_ScoreGetRanksReply *) msg;
if (reply.rankCount > 0) {
@ -5719,7 +5674,6 @@ unsigned NetCliAuthVaultNodeSave (
void NetCliAuthVaultNodeDelete (
unsigned nodeId
) {
REF(nodeId);
hsAssert(false, "eric, implement me");
}
@ -5852,7 +5806,6 @@ void NetCliAuthSetRecvBufferHandler (
void NetCliAuthSendCCRPetition (
const wchar * petitionText
) {
REF(petitionText);
hsAssert(false, "eric, implement me.");
}

6
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp
View File

@ -563,8 +563,6 @@ static void AsyncLookupCallback (
unsigned addrCount,
const NetAddress addrs[]
) {
REF(param);
if (!addrCount) {
ReportNetError(kNetProtocolCli2File, kNetErrNameLookupFailed);
return;
@ -793,7 +791,6 @@ void CliFileConn::Dispatch (const Cli2File_MsgHeader * msg) {
bool CliFileConn::Recv_PingReply (
const File2Cli_PingReply * msg
) {
REF(msg);
return true;
}
@ -874,7 +871,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)) {
@ -960,7 +956,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;
@ -1173,7 +1168,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;

14
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
View File

@ -430,9 +430,6 @@ static bool Recv_PingReply (
unsigned bytes,
void * param
) {
REF(msg);
REF(bytes);
REF(param);
return true;
}
@ -442,9 +439,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;
@ -460,9 +454,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);
@ -481,9 +472,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);
@ -571,8 +559,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;

8
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp
View File

@ -488,8 +488,6 @@ static void AsyncLookupCallback (
unsigned addrCount,
const NetAddress addrs[]
) {
REF(param);
if (!addrCount) {
ReportNetError(kNetProtocolCli2GateKeeper, kNetErrNameLookupFailed);
return;
@ -818,8 +816,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);
@ -882,8 +878,6 @@ bool FileSrvIpAddressRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const GateKeeper2Cli_FileSrvIpAddressReply & reply = *(const GateKeeper2Cli_FileSrvIpAddressReply *)msg;
@ -942,8 +936,6 @@ bool AuthSrvIpAddressRequestTrans::Recv (
const byte msg[],
unsigned bytes
) {
REF(bytes);
const GateKeeper2Cli_AuthSrvIpAddressReply & reply = *(const GateKeeper2Cli_AuthSrvIpAddressReply *)msg;
m_result = kNetSuccess;