- reworked the testsuite and the rules (storyflow) to use the same game deserialization code, moved that code to the players and zone classes

- removed every references to the gameobserver singleton. This object can now be instantiated several times as it's needed for minmax. To be able to do that, I mostly added a reference to a gameobserver from any targetable object (cards, players, spells) and abilities.
This commit is contained in:
Xawotihs
2011-10-01 13:30:30 +00:00
parent d6db0c4f63
commit 9adb9d625d
86 changed files with 1902 additions and 1961 deletions

View File

@@ -31,7 +31,7 @@ int ThisDescriptor::matchValue(int value)
return 0;
}
ThisDescriptor * ThisDescriptorFactory::createThisDescriptor(string s)
ThisDescriptor * ThisDescriptorFactory::createThisDescriptor(GameObserver* observer, string s)
{
size_t found;
@@ -116,7 +116,7 @@ ThisDescriptor * ThisDescriptorFactory::createThisDescriptor(string s)
size_t start = s.find("{");
size_t end = s.find("}");
string counterString = s.substr(start + 1, end - start - 1);
AbilityFactory abf;
AbilityFactory abf(observer);
Counter * counter = abf.parseCounter(counterString, NULL);
if (counter)
{