wrenczes@gmail.com ffd3b7b074 At Z's request, fixed Issue 184, ExtraCost types with targets such as Siege-Gang Commander/Drowner of secrets combined with targeted abilities bug. ...

This one was a bit of a doozy to fix correctly, but the actual fix ended up being fairly simple - the upshot is that TargetAbility never checked for whether an extra cost needed setting prior doing a target selection.  While at it, I discovered and fixed another bug:  if you're in the middle of an extra cost choice (like sacrifice, for instance) and hit the next phase button, the game would let you proceed, and then hang in an endless loop.

While at it, did a little cleanup/refactoring around GameObserver's waitForExtraPayment - any time a bool has something that sounds like a verb, it probably deserves to be a function.  Now it is. (I needed to refactor it anyway, as I reused that code for the next phase hang.)

Note that after this fix, I had to patch two test cases (siege_gang_commander.txt & seismic_assault.txt) - since I've change the selection order (ie a target ability with a sacrifice cost requires the cost to be paid up front before picking the target), this means that tests involving targeting & sacrifices need to switch the order of the cards to pass.

2010-12-06 06:49:36 +00:00

..

ActionElement.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

ActionLayer.cpp

At Z's request, fixed Issue 184, ExtraCost types with targets such as Siege-Gang Commander/Drowner of secrets combined with targeted abilities bug.

2010-12-06 06:49:36 +00:00

ActionStack.cpp

moved the gaurds i introduced in r2734 into the function selectAbility() as a static bool as suggested by jean, its much cleaner this way.

2010-12-04 18:25:59 +00:00

AIMomirPlayer.cpp

moved the gaurds i introduced in r2734 into the function selectAbility() as a static bool as suggested by jean, its much cleaner this way.

2010-12-04 18:25:59 +00:00

AIPlayer.cpp

Erwan

2010-12-05 14:13:42 +00:00

AIStats.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

AllAbilities.cpp

redid the counters menutext function to be more like the one "add mana" uses. makes it easier to read and add to later if needed.

2010-12-04 16:08:51 +00:00

CardDescriptor.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

CardDisplay.cpp

Fixed a crash occuring when trying to select card with the mouse in an empty list

2010-12-02 20:35:42 +00:00

CardEffect.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

CardGui.cpp

Fix for Issue 530: wither vs daily regimen = crash?. Turns out that it was a simple missing NULL check in the code that draws counter info on the large format cards.

2010-12-04 09:09:24 +00:00

CardPrimitive.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

CardSelector.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

CardSelectorSingleton.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Closest.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Counters.cpp

bug fixs, added colon to "damage" parsing so we can finally not worry about "damage" wanting to build a ability. it now has to look for "damage:" which makes it more consistent with how we made the other abilities. did the same with lifeset however no bug there.

2010-12-04 12:32:33 +00:00

Credits.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

Damage.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

DamagerDamaged.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

DeckDataWrapper.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

DeckEditorMenu.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

DeckManager.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

DeckMenu.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

DeckMenuItem.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

DeckMetaData.cpp

* fixed some boundary conditions for menu initialization

2010-11-20 10:11:06 +00:00

DeckStats.cpp

reverting change made in r2701

2010-11-29 11:50:12 +00:00

DuelLayers.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Effects.cpp

J :

2009-06-15 01:01:57 +00:00

ExtraCost.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

GameApp.cpp

Erwan

2010-12-02 12:56:18 +00:00

GameLauncher.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

GameObserver.cpp

At Z's request, fixed Issue 184, ExtraCost types with targets such as Siege-Gang Commander/Drowner of secrets combined with targeted abilities bug.

2010-12-06 06:49:36 +00:00

GameOptions.cpp

Fixed the graphics whiteout bug I introduced when switching profiles. When Refresh() was being called on the texture, the bitmap wasn't been re-transferred back into the openGL context.

2010-12-02 04:04:03 +00:00

GameState.cpp

fixed line endings

2010-11-30 12:15:32 +00:00

GameStateAwards.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

GameStateDeckViewer.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

GameStateDuel.cpp

Premade decks will not create/update stats on battles.

2010-12-02 08:36:36 +00:00

GameStateMenu.cpp

Fixed the graphics whiteout bug I introduced when switching profiles. When Refresh() was being called on the texture, the bitmap wasn't been re-transferred back into the openGL context.

2010-12-02 04:04:03 +00:00

GameStateOptions.cpp

Fixed the graphics whiteout bug I introduced when switching profiles. When Refresh() was being called on the texture, the bitmap wasn't been re-transferred back into the openGL context.

2010-12-02 04:04:03 +00:00

GameStateShop.cpp

Issue 494: "Valuable Collection" trophy is gone?

2010-12-04 09:46:31 +00:00

GameStateStory.cpp

refactored menu classes

2010-11-19 04:19:03 +00:00

GameStateTransitions.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

GuiAvatars.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

GuiBackground.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

GuiCardsController.cpp

Enabled precompiled headers for the build. This cuts the win compile time in debug by at least half on my laptop; on the psp compile, it shaves it down by ~ 45 seconds. I only did a cursory inspection of what to add to PrecompiledHeader.h, there's probably more that we can throw in there for more incremental speed improvements.

2010-10-24 05:55:24 +00:00

GuiCombat.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

GuiFrame.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

GuiHand.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

GuiLayers.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

GuiMana.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

GuiMessageBox.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

GuiPhaseBar.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

GuiPlay.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

GuiStatic.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

ManaCost.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

ManaCostHybrid.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

MenuItem.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

MTGAbility.cpp

At Z's request, fixed Issue 184, ExtraCost types with targets such as Siege-Gang Commander/Drowner of secrets combined with targeted abilities bug.

2010-12-06 06:49:36 +00:00

MTGardInstance.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

MTGCard.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

MTGCardInstance.cpp

Erwan

2010-12-05 14:13:42 +00:00

MTGDeck.cpp

added border to extra details popup as per design at

2010-11-23 14:02:02 +00:00

MTGDefinitions.cpp

* added hashmap for all basic abilities.

2010-11-20 19:41:26 +00:00

MTGGamePhase.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

MTGGameZones.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

MTGPack.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

MTGRules.cpp

At Z's request, fixed Issue 184, ExtraCost types with targets such as Siege-Gang Commander/Drowner of secrets combined with targeted abilities bug.

2010-12-06 06:49:36 +00:00

MTGSpellStack.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Navigator.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

OptionItem.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

PhaseRing.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Player.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

PlayerData.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

PlayGuiObject.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

PlayGuiObjectController.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Pos.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

PrecompiledHeader.cpp

Enabled precompiled headers for the build. This cuts the win compile time in debug by at least half on my laptop; on the psp compile, it shaves it down by ~ 45 seconds. I only did a cursory inspection of what to add to PrecompiledHeader.h, there's probably more that we can throw in there for more incremental speed improvements.

2010-10-24 05:55:24 +00:00

PriceList.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

ReplacementEffects.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Rules.cpp

Added 2 new cheats, "Optimize starting hand" and "Unlock all Ai decks"

2010-11-28 20:55:04 +00:00

SimpleMenu.cpp

Fix for [PSP|PC]ability menus and card view switch causes a crash. This broke as a side effect to the addition of the 'details' option that Mike added - the ActionStack had very rigid interpretations of what a valid control ID would be (either -1, or a valid id in its container). As kInfoMenuID is assigned a value of -200, this would crash when attempting to look up that index value in the vector.

2010-12-04 04:25:43 +00:00

SimpleMenuItem.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

SimplePad.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

SimplePopup.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

StoryFlow.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

StyleManager.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

Subtypes.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

TargetChooser.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

TargetsList.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Tasks.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

testfeatures.c

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

TestSuiteAI.cpp

modified phase error statement to be more descriptive. Added phase name to message. It was previously showing only the index number which is unhelpful.

2010-11-20 11:49:28 +00:00

TextScroller.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

ThisDescriptor.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Token.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

Translate.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

TranslateKeys.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

Trash.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

utils.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

WCachedResource.cpp

Fixed the graphics whiteout bug I introduced when switching profiles. When Refresh() was being called on the texture, the bitmap wasn't been re-transferred back into the openGL context.

2010-12-02 04:04:03 +00:00

WDataSrc.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

WEvent.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

WFilter.cpp

reformatting code according to guidelines defined at

2010-11-16 00:55:16 +00:00

WFont.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

WGui.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00

WResourceManager.cpp

Another change that looks bigger than it is: changed out the global extern WResourceManager to a real singleton. This means that it's no longer being init'ed at static initialization time, and we can debug construction/destruction properly; it's also safer in a multithreaded context.

2010-12-01 08:22:17 +00:00