Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
35dde15fc61706cd4d5402053ae2eedb762fa4a2
wagic/projects/mtg/include
History
techdragon.nguyen@gmail.com 8bf983e2e5 Flagged numerous peices of code that have local variables that are masking either member variables or variables scoped outside the current scope. 
I've marked all the ones I found with the following TODO comment:

TODO: C6246: <blah blah>

a few in particular are the ones related to "oneShot" and "_target".  These are local variables that are declared that
mask either a method parameter or a member variable.
2011-04-21 10:04:32 +00:00
..
ActionElement.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
ActionLayer.h
Performance optimization: when processing for reactions to a card click, instead of looping through all the stored objects a second time, only call reactToClick() on objects that already indicated true to isReactingToClick().
2011-04-10 00:11:03 +00:00
ActionStack.h
added "colors" to word variables
2011-04-12 20:54:34 +00:00
AIMomirPlayer.h
- reworked completly the JNetwork, JSocket interface (had to ifdef out the PSP socket code)
2011-03-13 21:19:02 +00:00
AIPlayer.h
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
AIStats.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
AllAbilities.h
Flagged numerous peices of code that have local variables that are masking either member variables or variables scoped outside the current scope.
2011-04-21 10:04:32 +00:00
CacheEngine.h
*POSSIBLY DESTABLIZING CHANGE, PLS PING ME IF YOU SEE ISSUES*
2011-04-19 07:12:05 +00:00
CardDescriptor.h
added
2011-02-02 18:22:08 +00:00
CardDisplay.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
CardEffect.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
CardGui.h
Another minor change to eliminate an unneeded #include.
2011-04-21 03:21:15 +00:00
CardPrimitive.h
move reducedCost and increasedCost out of cardprimitives and into MTGCardInstance
2011-04-20 12:14:27 +00:00
CardSelector.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
CardSelectorSingleton.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
config.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
Counters.h
added a way to set the max amount a counter ability can give you...aka the clockworks effect...as per mtg rules, you are still allowed to activate the effect but if it would put the target counters higher then the max allowed by that ability, then it will do nothing.
2011-02-08 15:12:14 +00:00
Credits.h
Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.
2011-04-20 07:50:00 +00:00
Damage.h
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
DamagerDamaged.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
DeckDataWrapper.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
DeckEditorMenu.h
Forcing LF as the line ending style through SVN properties. No actual code changes here.
2011-01-28 06:00:51 +00:00
DeckManager.h
reimplemented mana color display for deck selection. This is now totally controlled by
2011-02-10 17:19:11 +00:00
DeckMenu.h
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
DeckMenuItem.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
DeckMetaData.h
Synchronized avatar images to be loaded correctly on first display of the opponent selection.
2011-04-20 17:51:40 +00:00
DeckStats.h
reimplemented mana color display for deck selection. This is now totally controlled by
2011-02-10 17:19:11 +00:00
DuelLayers.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
Effects.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
ExtraCost.h
Removed targets[20] from the ExtraCost class. It wasn't being used in any meaningful way, and was bloating the class size for nothing. Reduces ExtraCost from 128 to 48 bytes per instance.
2011-04-20 09:28:28 +00:00
GameApp.h
Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.
2011-04-20 07:50:00 +00:00
GameObserver.h
fix and completely reworked affinity AGAIN.
2011-02-12 15:06:28 +00:00
GameOptions.h
Formatting cleanup. No code changes here.
2011-04-21 06:14:54 +00:00
GameState.h
Implemented a lazy load pattern for the deck stats - when the DeckMenu is displaying decks, it calls LoadStats() for only the ones visible in the list. This helps reduces the lag that occurs each time we attempt to load all the AI decks during match selection.
2011-01-30 13:06:21 +00:00
GameStateAwards.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
GameStateDeckViewer.h
Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.
2011-04-20 07:50:00 +00:00
GameStateDuel.h
Synchronized avatar images to be loaded correctly on first display of the opponent selection.
2011-04-20 17:51:40 +00:00
GameStateMenu.h
- Moved the card collection out of the GameApp class to clean up the dependencies
2011-02-06 11:35:40 +00:00
GameStateOptions.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
GameStateShop.h
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
GameStateStory.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
GameStateTransitions.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
GuiAvatars.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
GuiBackground.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
GuiCardsController.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
GuiCombat.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
GuiFrame.h
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.h
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
GuiLayers.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
GuiMana.h
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
GuiPhaseBar.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
GuiPlay.h
2 changes, first fixed the bug where auras were causing the cards to slide to the right, auras always have targets, so i added a conditional to guiplay to ignore adding it to the horizontal shift as these auras should never be just laying in the battlefield with no target.
2011-01-24 17:58:14 +00:00
GuiStatic.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
ManaCost.h
few changes here, mostly small bug fixes,
2011-04-16 17:00:51 +00:00
ManaCostHybrid.h
updated ManaCost copy constructor to do a true deep copy.
2011-02-09 20:42:19 +00:00
MenuItem.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
MTGAbility.h
removed the variable doTap in Tap from all classes, all test pass but there could be an edge case where i missed removing one...if so just let me know, tweaked some ai eff returns, trying to teach it to use counters more effectively, i noticed it was not using -1/-1 counters on the players creature and was using off counters +1/-1 on its own creatures to the point where they died.
2011-04-19 17:31:19 +00:00
MTGCard.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
MTGCardInstance.h
move reducedCost and increasedCost out of cardprimitives and into MTGCardInstance
2011-04-20 12:14:27 +00:00
MTGDeck.h
reverted latest change
2011-02-14 09:35:43 +00:00
MTGDefinitions.h
added "abilities=canattack"
2011-03-31 16:39:28 +00:00
MTGGamePhase.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
MTGGameZones.h
Erwan
2011-03-02 13:41:24 +00:00
MTGPack.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
MTGRules.h
added "colors" to word variables
2011-04-12 20:54:34 +00:00
Navigator.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
NetworkPlayer.h
- reworked completly the JNetwork, JSocket interface (had to ifdef out the PSP socket code)
2011-03-13 21:19:02 +00:00
OptionItem.h
Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.
2011-04-20 07:50:00 +00:00
OSD.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
PhaseRing.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
Player.h
added "colors" to word variables
2011-04-12 20:54:34 +00:00
PlayerData.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
PlayGuiObject.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
PlayGuiObjectController.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
PlayRestrictions.h
Erwan
2011-02-15 14:17:34 +00:00
Pos.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
PrecompiledHeader.h
Moved GameOptions.h into the precompiled header. Shaves almost 20 seconds off my build times.
2011-04-20 07:50:00 +00:00
PriceList.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
ReplacementEffects.h
Forcing LF as the line ending style through SVN properties. No actual code changes here.
2011-01-28 06:00:51 +00:00
Rules.h
added support for customphasering construction in rules txt...
2011-03-02 21:33:42 +00:00
SimpleMenu.h
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
SimpleMenuItem.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
SimplePad.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
SimplePopup.h
Forcing LF as the line ending style through SVN properties. No actual code changes here.
2011-01-28 06:00:51 +00:00
StoryFlow.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
StyleManager.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
Subtypes.h
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
Targetable.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
TargetChooser.h
added "colors" to word variables
2011-04-12 20:54:34 +00:00
TargetsList.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
Tasks.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
TestSuiteAI.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
TextScroller.h
Forcing LF as the line ending style through SVN properties. No actual code changes here.
2011-01-28 06:00:51 +00:00
ThisDescriptor.h
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.h
Forcing LF as the line ending style through SVN properties. No actual code changes here.
2011-01-28 06:00:51 +00:00
Translate.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
TranslateKeys.h
J :
2010-02-27 18:49:03 +00:00
Trash.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
utils.h
A simpler way to allow trim() to work with temporary strings.
2011-02-05 06:42:53 +00:00
WCachedResource.h
Fixed compilation times by refactoring: WResourceManager.h gets included either directly or indirectly into every header & cpp file; so does its includes & implementation details. Broke out WResourceManager into a pure virtual class that contains only the required calls, and added a WResourceManagerImpl header that contains all the dirty details that the rest of the app doesn't care about / need to know.
2011-04-20 06:27:44 +00:00
WDataSrc.h
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
WEvent.h
added "colors" to word variables
2011-04-12 20:54:34 +00:00
WFilter.h
Jeck - First doxygen commit, basic information on WFilter classes. Also added filter price adjustment for some of the newer basic abilities (the CANTLOSE varieties now cost more to filter).
2011-01-30 11:14:36 +00:00
WFont.h
No code change just reformatting of header files.
2011-01-21 18:01:14 +00:00
WGui.h
Jeck - Begun documentation for the WGui classes. Also updated doxygen config to support STL.
2011-01-31 10:24:06 +00:00
WResource_Fwd.h
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
WResourceManager.h
Fixed compilation times by refactoring: WResourceManager.h gets included either directly or indirectly into every header & cpp file; so does its includes & implementation details. Broke out WResourceManager into a pure virtual class that contains only the required calls, and added a WResourceManagerImpl header that contains all the dirty details that the rest of the app doesn't care about / need to know.
2011-04-20 06:27:44 +00:00
WResourceManagerImpl.h
Fix for a crash (I think the same one Zeth reported) where the game dies somewhere in file reading source - I wasn't paying close enough attention to the fact that there are in fact 3 separate caches, so each had their own mutex, so JFileSystem wasn't actually being protected from reentrancy. So, if the app tried to load an audio sample at the same time as an image, boom...
2011-04-20 09:03:08 +00:00