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

Get rid of DEL() and FREE() macros.

Browse Source 
Part of CoreLibExe must die.
This commit is contained in:
Darryl Pogue
2011-10-23 20:52:33 -07:00
committed by Adam Johnson
parent be26b145df
commit 8a3f0cfd5b
88 changed files with 262 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,7 @@ pfGmBlueSpiral::pfGmBlueSpiral (
//============================================================================
pfGmBlueSpiral::~pfGmBlueSpiral () {
DEL(internal);
delete internal;
}
//============================================================================

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

@ -211,7 +211,7 @@ pfGmClimbingWall::pfGmClimbingWall (
//============================================================================
pfGmClimbingWall::~pfGmClimbingWall () {
DEL(internal);
delete internal;
}
//============================================================================
@ -347,4 +347,4 @@ void pfGmClimbingWall::Panic () {
msg.transId = 0;
GameMgrSend(&msg);
}
}

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

@ -245,7 +245,7 @@ pfGmHeek::pfGmHeek (
//============================================================================
pfGmHeek::~pfGmHeek () {
DEL(internal);
delete internal;
}
//============================================================================
@ -343,4 +343,4 @@ void pfGmHeek::SequenceFinished (EHeekSeqFinished seq) {
msg.seqFinished = (uint8_t)seq;
GameMgrSend(&msg);
}
}

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

@ -229,7 +229,7 @@ void IMarker::RecvGameDeleted (const Srv2Cli_Marker_GameDeleted & msg, void * pa
gameCliMsg->Send(gameCli->GetReceiver());
if (!msg.failed)
DEL(gameCli); // we're done
delete gameCli; // we're done
}
//============================================================================
@ -280,7 +280,7 @@ pfGmMarker::pfGmMarker (
//============================================================================
pfGmMarker::~pfGmMarker () {
DEL(internal);
delete internal;
}
//============================================================================
@ -464,4 +464,4 @@ void pfGmMarker::CaptureMarker (unsigned long markerID) {
msg.markerID = markerID;
GameMgrSend(&msg);
}
}

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

@ -174,7 +174,7 @@ void ITicTacToe::RecvGameOver (const Srv2Cli_TTT_GameOver & msg, void * param) {
gameCliMsg->Set(gameCli, msg);
gameCliMsg->Send(gameCli->GetReceiver());
DEL(gameCli); // we're done
delete gameCli; // we're done
}
//============================================================================
@ -210,7 +210,7 @@ pfGmTicTacToe::pfGmTicTacToe (
//============================================================================
pfGmTicTacToe::~pfGmTicTacToe () {
DEL(internal);
delete internal;
}
//============================================================================

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

@ -202,7 +202,7 @@ pfGmVarSync::pfGmVarSync (
//============================================================================
pfGmVarSync::~pfGmVarSync () {
DEL(internal);
delete internal;
}
//============================================================================

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

@ -148,7 +148,7 @@ static ARRAYOBJ(plKey) s_receivers;
static void ShutdownFactories () {
while (Factory * factory = s_factories.Head())
DEL(factory);
delete factory;
}
//============================================================================
@ -200,7 +200,7 @@ void IGameMgr::RecvGameInstance (const Srv2Cli_GameMgr_GameInstance & msg, void
cli = internal->gameCli;
}
DEL(state);
delete state;
}
//============================================================================
@ -228,7 +228,7 @@ void IGameMgr::Recv (GameMsgHeader * msg) {
void * param;
if (TransState * trans = s_trans.Find(msg->transId)) {
param = trans->param;
DEL(trans);
delete trans;
}
else {
param = nil;
@ -280,13 +280,13 @@ pfGameMgrMsg::pfGameMgrMsg () {
//============================================================================
pfGameMgrMsg::~pfGameMgrMsg () {
FREE(netMsg);
free(netMsg);
}
//============================================================================
void pfGameMgrMsg::Set (const GameMsgHeader & msg) {
netMsg = (GameMsgHeader *)ALLOC(msg.messageBytes);
netMsg = (GameMsgHeader *)malloc(msg.messageBytes);
MemCopy(netMsg, &msg, msg.messageBytes);
}
@ -307,13 +307,13 @@ pfGameCliMsg::pfGameCliMsg () {
//============================================================================
pfGameCliMsg::~pfGameCliMsg () {
FREE(netMsg);
free(netMsg);
}
//============================================================================
void pfGameCliMsg::Set (pfGameCli * cli, const GameMsgHeader & msg) {
netMsg = (GameMsgHeader *)ALLOC(msg.messageBytes);
netMsg = (GameMsgHeader *)malloc(msg.messageBytes);
MemCopy(netMsg, &msg, msg.messageBytes);
gameCli = cli;
}
@ -475,7 +475,7 @@ pfGameCli::pfGameCli (
//============================================================================
pfGameCli::~pfGameCli () {
DEL(internal);
delete internal;
}
//============================================================================