wrenczes 8610531bf3 Fixes for exclusion/inclusion combinations of colors or abilities.

2011-04-28 05:01:06 +00:00

..

ActionElement.cpp

…

ActionLayer.cpp

Per the conversation in r3388, adding an extra seatbelt to ensure that if an object is removed from ActionLayer, it doesn't leave a dangling pointer in mReactions. This should normally be a no-op, as the expectation is that mReactions is usually empty at this point.

2011-04-10 15:29:00 +00:00

ActionStack.cpp

moved the eventsending for drawing cards into the resolve of adrawer. tho i think this will make this event unusable for "card draw replacement effects"...it really doesn't matter as i don't see card draw replacement being added to wagic any time soon, if ever.

2011-04-25 12:00:33 +00:00

AIMomirPlayer.cpp

- reworked completly the JNetwork, JSocket interface (had to ifdef out the PSP socket code)

2011-03-13 21:19:02 +00:00

AIPlayer.cpp

fixed a crash witnessed when ai was trying to get the efficiency return of aamover the ai had a target, but the ability did not have a target, when "destinationZone()" was run, the game would crash due to a null pointer.

2011-04-26 14:49:15 +00:00

AIStats.cpp

- Files in Res/rules are now loaded dynamically. This allows people to add their own mods fairly easily

2011-04-23 13:24:19 +00:00

AllAbilities.cpp

fixed a crash witnessed when ai was trying to get the efficiency return of aamover the ai had a target, but the ability did not have a target, when "destinationZone()" was run, the game would crash due to a null pointer.

2011-04-26 14:49:15 +00:00

CardDescriptor.cpp

Fixes for exclusion/inclusion combinations of colors or abilities.

2011-04-28 05:01:06 +00:00

CardDisplay.cpp

…

CardEffect.cpp

…

CardGui.cpp

Fixes for exclusion/inclusion combinations of colors or abilities.

2011-04-28 05:01:06 +00:00

CardPrimitive.cpp

Fixes for exclusion/inclusion combinations of colors or abilities.

2011-04-28 05:01:06 +00:00

CardSelector.cpp

- Fix issue 552 (Card images too big in deck editor)

2011-04-03 06:07:23 +00:00

CardSelectorSingleton.cpp

…

Closest.cpp

…

Counters.cpp

suspend changes, suspended cards which would have a counter removed are checked for time counters and cast if no time counters are present as a statebased effect, as per MTG rules..

2011-02-27 15:19:02 +00:00

Credits.cpp

Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.

2011-04-20 07:50:00 +00:00

Damage.cpp

Android cross-compiling fixes regarding constants

2011-04-20 20:14:25 +00:00

DamagerDamaged.cpp

…

DeckDataWrapper.cpp

…

DeckEditorMenu.cpp

moved the translator init code earlier; added some translation support for the code of r2517 and r2907; updated some Chinese translation.

2011-01-31 14:21:46 +00:00

DeckManager.cpp

fixed a memory leak. Not sure how it got introduced but the destructor for DeckManager now does the heavy lifting for memory cleanup and not the static method EndInstance().

2011-04-21 06:35:44 +00:00

DeckMenu.cpp

Issue 634:

2011-04-21 08:32:32 +00:00

DeckMenuItem.cpp

ok made minor changes to mikes last commit, instead of loading "nothing" im making it load a card back instead, that black hole drove me nuts....second instead of loading a premade "evil twin" i made it load what ever the users avatar was flipped horizontally. didn't tint it red becuase i am not that attuned to the graphics side of wagic.

2011-04-20 20:24:53 +00:00

DeckMetaData.cpp

Issue 634:

2011-04-21 08:32:32 +00:00

DeckStats.cpp

reimplemented mana color display for deck selection. This is now totally controlled by

2011-02-10 17:19:11 +00:00

DuelLayers.cpp

3 things here

2011-04-22 11:17:20 +00:00

Effects.cpp

…

ExtraCost.cpp

Added object analytics around ExtraCost & ManaCost; some formatting style cleanup.

2011-04-24 10:33:38 +00:00

GameApp.cpp

- Files in Res/rules are now loaded dynamically. This allows people to add their own mods fairly easily

2011-04-23 13:24:19 +00:00

GameLauncher.cpp

…

GameObserver.cpp

Reverting r3496 to fix failing tests

2011-04-21 15:16:22 +00:00

GameOptions.cpp

3 things here

2011-04-22 11:17:20 +00:00

GameState.cpp

* Added new options parameter. "SaveDetailedDeckInfo". This will force the system to save all

2011-01-31 10:04:18 +00:00

GameStateAwards.cpp

Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.

2011-04-20 07:50:00 +00:00

GameStateDeckViewer.cpp

Minor code cleanup: removed a path to fetch thumbnails in the non-threaded code - at this point, it's trying to draw in text mode, so this shouldn't be here (it was always stepped over because of the options flag, so it was never executing anyway).

2011-04-25 05:26:46 +00:00

GameStateDuel.cpp

- Files in Res/rules are now loaded dynamically. This allows people to add their own mods fairly easily

2011-04-23 13:24:19 +00:00

GameStateMenu.cpp

- removed unused variables in Menu. These where used for the old moving "W" which is probably not coming back any time soon...

2011-04-23 13:52:46 +00:00

GameStateOptions.cpp

3 things here

2011-04-22 11:17:20 +00:00

GameStateShop.cpp

Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.

2011-04-20 07:50:00 +00:00

GameStateStory.cpp

…

GameStateTransitions.cpp

Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.

2011-04-20 07:50:00 +00:00

GuiAvatars.cpp

3 things here

2011-04-22 11:17:20 +00:00

GuiBackground.cpp

Consolidated some loose strings into constant declarations in order to reduce allocation thrashing on temporary string constructs. I'm sure there are more, but "back_thumb", "back", and "backdrop.jpg" were the ones that showed up most in memory profiling.

2011-04-21 22:48:22 +00:00

GuiCardsController.cpp

…

GuiCombat.cpp

Reverting r3496 to fix failing tests

2011-04-21 15:16:22 +00:00

GuiFrame.cpp

Resuming on my threading support work with the card caching mechanism. This change unfortunately touches quite a few files, but I needed to get it out of the way before things got out of hand: one significant hurdle is the assumed lifetime of a JQuad pointer. In a single threaded model, the life time of the pointer is clear: you fetch it into the cache, the cache makes room, you use the pointer immediately. In a multithreaded context however, it's unsafe, as the drawing thread can request a few JQuads, and the cache operating on a separate thread can potentially bounce a JQuad out of the cache before the draw routine is done using it, which ends up in an access violation when you attempt to draw using an invalidated quad pointer. To prevent this, the bulk of this change swaps out the use of naked JQuad* pointers in the code with a JQuadPtr, which is basically a typedef to a boost shared_ptr<JQuad>.

2011-02-01 10:37:21 +00:00

GuiHand.cpp

Consolidated some loose strings into constant declarations in order to reduce allocation thrashing on temporary string constructs. I'm sure there are more, but "back_thumb", "back", and "backdrop.jpg" were the ones that showed up most in memory profiling.

2011-04-21 22:48:22 +00:00

GuiLayers.cpp

…

GuiMana.cpp

Resuming on my threading support work with the card caching mechanism. This change unfortunately touches quite a few files, but I needed to get it out of the way before things got out of hand: one significant hurdle is the assumed lifetime of a JQuad pointer. In a single threaded model, the life time of the pointer is clear: you fetch it into the cache, the cache makes room, you use the pointer immediately. In a multithreaded context however, it's unsafe, as the drawing thread can request a few JQuads, and the cache operating on a separate thread can potentially bounce a JQuad out of the cache before the draw routine is done using it, which ends up in an access violation when you attempt to draw using an invalidated quad pointer. To prevent this, the bulk of this change swaps out the use of naked JQuad* pointers in the code with a JQuadPtr, which is basically a typedef to a boost shared_ptr<JQuad>.

2011-02-01 10:37:21 +00:00

GuiMessageBox.cpp

…

GuiPhaseBar.cpp

Resuming on my threading support work with the card caching mechanism. This change unfortunately touches quite a few files, but I needed to get it out of the way before things got out of hand: one significant hurdle is the assumed lifetime of a JQuad pointer. In a single threaded model, the life time of the pointer is clear: you fetch it into the cache, the cache makes room, you use the pointer immediately. In a multithreaded context however, it's unsafe, as the drawing thread can request a few JQuads, and the cache operating on a separate thread can potentially bounce a JQuad out of the cache before the draw routine is done using it, which ends up in an access violation when you attempt to draw using an invalidated quad pointer. To prevent this, the bulk of this change swaps out the use of naked JQuad* pointers in the code with a JQuadPtr, which is basically a typedef to a boost shared_ptr<JQuad>.

2011-02-01 10:37:21 +00:00

GuiPlay.cpp

Reverting r3496 to fix failing tests

2011-04-21 15:16:22 +00:00

GuiStatic.cpp

Consolidated some loose strings into constant declarations in order to reduce allocation thrashing on temporary string constructs. I'm sure there are more, but "back_thumb", "back", and "backdrop.jpg" were the ones that showed up most in memory profiling.

2011-04-21 22:48:22 +00:00

ManaCost.cpp

Wrong #define.

2011-04-25 08:42:47 +00:00

ManaCostHybrid.cpp

updated ManaCost copy constructor to do a true deep copy.

2011-02-09 20:42:19 +00:00

MenuItem.cpp

Removed GameApp.h from GameOptions.h - this should help prevent the precompiled header from rebuilding constantly when any header is touched, as GameApp.h ends up pulling virtually every other header by some level of indirection. We really need though to sit down at some point & refactor the inclusion tree. It's a big yarn ball at the moment.

2011-04-21 02:35:51 +00:00

MTGAbility.cpp

fixed a crash witnessed when ai was trying to get the efficiency return of aamover the ai had a target, but the ability did not have a target, when "destinationZone()" was run, the game would crash due to a null pointer.

2011-04-26 14:49:15 +00:00

MTGardInstance.cpp

…

MTGCard.cpp

Improvement on my last change for reducing the formatted text caching: chopped it out altogether. I ran some profiling to see how much time on the psp it took to process the formatting on the description text (ie word wrapping it into several lines to fit on a card), and it ends up taking an average of 0.14 ms per card. For context, 60 fps is 16 ms. So clearly the formatting time is not the bottleneck here, and we gain no real performance caching the text, but lose memory due to pooling. So I cut it out entirely of the base class and we format on the fly during renders.

2011-04-23 09:54:19 +00:00

MTGCardInstance.cpp

Converted CardPrimitive's basicAbilities from a map<int, int> to a bitset. With 92 abilities, that means our base container for abilities is now 16 bytes in size (down from 28), and is a fixed size, whereas the map would grow by 8 bytes per added ability.

2011-04-26 09:35:38 +00:00

MTGDeck.cpp

Converted CardPrimitive's basicAbilities from a map<int, int> to a bitset. With 92 abilities, that means our base container for abilities is now 16 bytes in size (down from 28), and is a fixed size, whereas the map would grow by 8 bytes per added ability.

2011-04-26 09:35:38 +00:00

MTGDefinitions.cpp

added "abilities=canattack"

2011-03-31 16:39:28 +00:00

MTGGamePhase.cpp

Forcing LF as the line ending style through SVN properties. No actual code changes here.

2011-01-28 06:00:51 +00:00

MTGGameZones.cpp

Some minor tweaks to make the image prefetching feel less flickery : when a card goes from a player's library into their hand, trigger a prefetch of the image. Also do the same thing when the AI decides on what card to play and creates an action. The idea being, new cards in play will probably want to be viewed by the player (and in the case of the AI playing a spell, we automatically show the image during the interrupt window before it comes into play). This makes for a much smoother gameplay - we have to get the image at some point anyway, and by doing it before we get to the render call, we no longer have the back card image pop up briefly.

2011-04-20 21:07:24 +00:00

MTGPack.cpp

fixed very obscure bug. In VS2010 the string was being trimmed before going into Construct method, but the string length was not updated.

2011-02-23 18:30:45 +00:00

MTGRules.cpp

3 things here

2011-04-22 11:17:20 +00:00

MTGSpellStack.cpp

…

Navigator.cpp

…

NetworkPlayer.cpp

- reworked completly the JNetwork, JSocket interface (had to ifdef out the PSP socket code)

2011-03-13 21:19:02 +00:00

ObjectAnalytics.cpp

Added object analytics around ExtraCost & ManaCost; some formatting style cleanup.

2011-04-24 10:33:38 +00:00

OptionItem.cpp

- Moved the card collection out of the GameApp class to clean up the dependencies

2011-02-06 11:35:40 +00:00

PhaseRing.cpp

omitted a unneeded include.

2011-03-02 21:35:31 +00:00

Player.cpp

- reworked completly the JNetwork, JSocket interface (had to ifdef out the PSP socket code)

2011-03-13 21:19:02 +00:00

PlayerData.cpp

Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.

2011-04-20 07:50:00 +00:00

PlayGuiObject.cpp

Eliminated a spurious float to long conversion.

2011-04-17 06:26:52 +00:00

PlayGuiObjectController.cpp

…

PlayRestrictions.cpp

Erwan

2011-03-02 13:41:24 +00:00

Pos.cpp

…

PrecompiledHeader.cpp

…

PriceList.cpp

Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.

2011-04-20 07:50:00 +00:00

ReplacementEffects.cpp

…

Rules.cpp

- Files in Res/rules are now loaded dynamically. This allows people to add their own mods fairly easily

2011-04-23 13:24:19 +00:00

SimpleMenu.cpp

3 things here

2011-04-22 11:17:20 +00:00

SimpleMenuItem.cpp

…

SimplePad.cpp

…

SimplePopup.cpp

Resuming on my threading support work with the card caching mechanism. This change unfortunately touches quite a few files, but I needed to get it out of the way before things got out of hand: one significant hurdle is the assumed lifetime of a JQuad pointer. In a single threaded model, the life time of the pointer is clear: you fetch it into the cache, the cache makes room, you use the pointer immediately. In a multithreaded context however, it's unsafe, as the drawing thread can request a few JQuads, and the cache operating on a separate thread can potentially bounce a JQuad out of the cache before the draw routine is done using it, which ends up in an access violation when you attempt to draw using an invalidated quad pointer. To prevent this, the bulk of this change swaps out the use of naked JQuad* pointers in the code with a JQuadPtr, which is basically a typedef to a boost shared_ptr<JQuad>.

2011-02-01 10:37:21 +00:00

StoryFlow.cpp

- Files in Res/rules are now loaded dynamically. This allows people to add their own mods fairly easily

2011-04-23 13:24:19 +00:00

StyleManager.cpp

- Moved the card collection out of the GameApp class to clean up the dependencies

2011-02-06 11:35:40 +00:00

Subtypes.cpp

Performance improvements/cleanup: card->hasType("foo") performs a string lookup for an integer id. Now that our primitives have over 1000 types (1018, I believe is the number I saw while debugging), this is not the cheapest lookup. Over the course of time, a lot of new rules have crept in the code - support for 'aura', 'equipment', and recently 'planeswalker'. While profiling, I saw an inordinate amount of time being used doing map lookups for these strings. Since they're used so frequently, I've added them to the SubTypes enumeration, and swapped out doing the string lookup in favour of using the int ID directly. I also found a few places where we were using hasType("Creature") or hasType("land") when we already had helper functions to do the int lookup, so I swapped these in as appropriate, as well as a couple of places where we had hasType("instant") instead of hasType(Subtypes::TYPE_INSTANT), etc.

2011-04-10 00:07:34 +00:00

TargetChooser.cpp

Fixes for exclusion/inclusion combinations of colors or abilities.

2011-04-28 05:01:06 +00:00

TargetsList.cpp

…

Tasks.cpp

…

testfeatures.c

…

TestSuiteAI.cpp

- reworked completly the JNetwork, JSocket interface (had to ifdef out the PSP socket code)

2011-03-13 21:19:02 +00:00

TextScroller.cpp

…

ThisDescriptor.cpp

fixed a parsing error with tokengen, no actually my fault :P there was never a check if the end was the real end or not.

2011-04-14 17:06:44 +00:00

Token.cpp

…

Translate.cpp

Removed GameApp.h from GameOptions.h - this should help prevent the precompiled header from rebuilding constantly when any header is touched, as GameApp.h ends up pulling virtually every other header by some level of indirection. We really need though to sit down at some point & refactor the inclusion tree. It's a big yarn ball at the moment.

2011-04-21 02:35:51 +00:00

TranslateKeys.cpp

- Defined keys translation for SDL config

2011-04-23 21:30:36 +00:00

Trash.cpp

…

utils.cpp

Minor project cleanup:

2011-04-22 13:12:36 +00:00

WCachedResource.cpp

Some preparation work for new platform support.

2011-04-21 13:16:11 +00:00

WDataSrc.cpp

*POSSIBLY DESTABLIZING CHANGE, PLS PING ME IF YOU SEE ISSUES*

2011-04-19 07:12:05 +00:00

WEvent.cpp

added "colors" to word variables

2011-04-12 20:54:34 +00:00

WFilter.cpp

Converted CardPrimitive's basicAbilities from a map<int, int> to a bitset. With 92 abilities, that means our base container for abilities is now 16 bytes in size (down from 28), and is a fixed size, whereas the map would grow by 8 bytes per added ability.

2011-04-26 09:35:38 +00:00

WFont.cpp

Some preparation work for new platform support.

2011-04-21 13:16:11 +00:00

WGui.cpp

Consolidated some loose strings into constant declarations in order to reduce allocation thrashing on temporary string constructs. I'm sure there are more, but "back_thumb", "back", and "backdrop.jpg" were the ones that showed up most in memory profiling.

2011-04-21 22:48:22 +00:00

WResourceManager.cpp

Optimized a heavily thrashing reallocation (temporary string construct) inside the resource manager. (Also contains a few more PSPENV->PSP consolidations, this should have been part of my last submit)

2011-04-22 13:33:42 +00:00