Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Removed "isClone" flag. This flag was error prone. The "core" classes now have decent copy constructors, and ideally long term we should create copy constructors for the abilities that have additional pointers in them.

Browse Source 
-- The test suite passes but this is a big change. I might have introduced some memory leaks or bugs. I might have fixed some bugs, too
This commit is contained in:
wagic.the.homebrew
2011-07-27 14:31:27 +00:00
parent a26125ee4c
commit ef5e011e23
14 changed files with 520 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
projects/mtg/src/ActionElement.cpp
View File

@@ -14,15 +14,22 @@ ActionElement::ActionElement(int id) :
currentPhase = -1;
newPhase = -1;
tc = NULL;
isClone = 0;
}
ActionElement::ActionElement(const ActionElement& a): JGuiObject(a)
{
activeState = a.activeState;
tc = a.tc ? a.tc->clone() : NULL;
currentPhase = a.currentPhase;
newPhase = a.newPhase;
modal = a.modal;
waitingForAnswer = a.waitingForAnswer;
}
ActionElement::~ActionElement()
{
if (!isClone)
{
SAFE_DELETE(tc);
}
SAFE_DELETE(tc);
}
int ActionElement::getActivity()