Commit Graph

2397 Commits

Author SHA1 Message Date
wagic.jeck f7d25cfe2e Jeck - Uncommenting the last resort code from r1192 (removes any misses for shop background when entering shop). 2009-10-27 03:09:02 +00:00
wagic.jeck fb7f48f26b Jeck - Please review: this makes minor changes to a lot of files, and major changes to the WCache flatten() function.
* Removed all calls to Release(JQuad*).
* Updated flatten(). Prior flatten was buggy beyond belief.
* Done some extensive testing, but if this causes more trouble than it fixes, we'll have to revert. It's too close to release time.
2009-10-27 02:46:39 +00:00
wagic.the.homebrew@gmail.com e762a5f983 Erwan
- revert r1187
- fix a bug with "@damaged" (see slith bloodletter test)
2009-10-26 13:31:30 +00:00
wagic.laurent 772ddd9ced Laurent - fixed a bug with @damaged.
Without this quick and dirty fix if you have 2 thieving magpie in play you get twice the bonus if only 1 deals damage (also you draw 2 cards instead of 1).
2009-10-26 13:20:08 +00:00
wagic.jeck 8e0bcef6e9 Jeck - Removed a ton of unreached or unused code from the cache, to make debugging easier. None of this actually effects execution at all. Some of these functions (though not many) are potentially useful, but as they aren't actually used there's no reason to have them cluttering up the files. 2009-10-26 05:55:52 +00:00
wagic.jeck eefd03ad84 Jeck - Reverting r1183. 2009-10-26 05:10:06 +00:00
wagic.jeck 8a6162ba15 Jeck - Please review.
Disconcertingly enough, this seems to resolve issue 109. Ran demo mode for 1 hour (w00t no crashes!), played five manual games, shop appeared fine... but why would an mObject ever be null? I'm not so sure about this commit. It "fixes" the issue, but doesn't do anything for the underlying cause. For all I know, I might just not have re-encountered issue 109 yet... still, it's not a /bad/ commit. In the worst case, it does some unnecessary sanity checking. There's potential for a a hang if item is NULL in Update(), if input doesn't get passed along in a way that allows the player to exit... But I think that's what the call to JGuiController::Update is for.

Thoughts?
2009-10-26 02:27:55 +00:00
wagic.the.homebrew@gmail.com dd7c307c7a Erwan
-Fix issue 107 as well as another issue with doesnotuntap mentioned by leungcl
-Changed wording for Paralyzing Graps (to match oracle), please verify
2009-10-25 14:01:25 +00:00
wagic.the.homebrew@gmail.com 24ea5b7b6a Erwan
- Fix issue 42
2009-10-25 08:55:56 +00:00
wagic.jeck cc0b67fb17 Jeck - Fix to issue 136, which caused the "unlocked set/mode" noise to play regardless of SFX volume. 2009-10-25 07:19:42 +00:00
wagic.jeck 0efb205469 Jeck - Final theme updates. Reverted backdrop.jpg to 255H, expanded wood.png to 32H, though only 28 are used (to prevent gray box issue). Also minor change to OptionItem.cpp so that themeinfo.txt loads on Default theme. 2009-10-25 01:37:23 +00:00
wagic.jeck 80be924614 Jeck - Some theme work. Reverted default theme background. Added Jade theme, mana colors for Inverted.
* In GuiBackground, we now load and use all of backdrop.jpg. This is for effects like that in Jade. It's an extremely minor change, so shouldn't effect stability.
2009-10-24 23:42:06 +00:00
wagic.the.homebrew@gmail.com 8d0f3a4c81 Erwan
- minor string corrections
2009-10-24 14:59:35 +00:00
wagic.the.homebrew@gmail.com 6f1772e938 Erwan
-fix issue mentioned at http://wololo.net/forum/viewtopic.php?f=4&t=371&p=6296#p6296 . I touched a very sensitive area of the code so please let me know if something goes wrong with this revision with spells or abilities that involve targets and/or sacrifice
2009-10-24 14:15:08 +00:00
wagic.the.homebrew@gmail.com 60845ee3b3 Erwan
- fix issue 111
2009-10-24 13:06:02 +00:00
wagic.the.homebrew@gmail.com fb52ea5452 Erwan
- fix for issue 113
2009-10-24 11:52:55 +00:00
wagic.the.homebrew@gmail.com da6d650c3d Erwan
-fix issue 128
2009-10-24 11:17:38 +00:00
wagic.jeck 19913b8a63 Jeck - Quick spellcheck to r1159 2009-10-24 02:23:57 +00:00
wagic.the.homebrew@gmail.com b41a03f332 Erwan
- Updated credits, please let me know if I misspelled your name, or if I forgot someone you think is important (don't feel offended if I did, I have bad memory)
2009-10-24 01:54:01 +00:00
wagic.jeck f117b04dea Jeck - And this is why I shouldn't code at 3 AM. Fix to r1152, which potentially closed a non-existent file descriptor. Not a major bug, but it's better to do it this way. 2009-10-23 07:29:21 +00:00
wagic.jeck c552a47087 Jeck - Fix to r1151, which left an open file descriptor. 2009-10-23 07:26:12 +00:00
wagic.jeck c87343a7f2 Jeck - Simplistic solution to issue 131. Reads only the first line of themeinfo.txt and uses the first 16 characters as the author name, if present. The rest of the file is completely ignored. Not exactly the most elegant solution, but I don't think we really need much metadata beyond who the theme's author is. My suggestion would be to let the authors use the rest of the file as a "Readme.txt" with whatever details they want to put in it. (Art credits, etc.).
The next version of Wagic will use XML-like themes, so I think it's alright to use such a non-extensible format.
2009-10-23 07:16:58 +00:00
wagic.the.homebrew@gmail.com f0124ce53a Erwan
- fix issue 125 (Ondu Cleric)
2009-10-22 13:57:49 +00:00
wagic.the.homebrew@gmail.com 2c1a44ed43 Erwan
-fix for issue 123 (Cockatrice)
2009-10-22 13:08:33 +00:00
wagic.jeck 4dc217edcb Jeck - Potential fix to issue 109, issue 112. Looks hopeful so far, please confirm (or confirm failure).
* We only want to record misses when the file doesn't exist. Item can be null if we're out of memory for whatever reason, resulting in an invalid miss.
2009-10-22 09:33:16 +00:00
wagic.jeck f005aabe30 Jeck - Possible fix for issue 112. 2009-10-22 07:11:07 +00:00
wagic.jeck 34ef5016f5 Jeck - Possible fix for issue 109, issue 112. Please confirm.
* mError status was being reset properly. What I'm thinking happened is that somewhere along the line, a file would miss and return CACHE_ERROR_404. Then, cache.find() would fail because the file was not in the cache, but because mError wasn't reset it would still report CACHE_ERROR_404. In some cases, this would be overwritten (causing the flickering single frame wrong image), and in others this would erroneously report a miss. 
 * Tested through three demo games and three player games. Shop screen still shows, didn't notice any missing sounds.
2009-10-22 05:54:45 +00:00
wagic.jeck 3c84fe3830 Jeck - Fix for issue 126. System didn't reset "I'm using a premade deck" boolean, so would look in the wrong place for decks if profiles were switched after playing with a premade deck. 2009-10-22 05:16:14 +00:00
wagic.the.homebrew@gmail.com 3af15e9901 Erwan - 2nd part for issue 119 (bad commit) 2009-10-21 13:54:41 +00:00
wagic.the.homebrew@gmail.com c02f65eda2 Erwan
-fix issue 119
2009-10-21 13:53:53 +00:00
wagic.the.homebrew@gmail.com c1dc258ef0 Erwan - fix issue 118 2009-10-21 13:49:31 +00:00
wagic.jeck 6d62c013df Jeck - Fix for two obscure edge case bugs in the options menu.
* Confirmable options used to only check for confirmation when selecting another option. They now autoconfirm when saving & exiting. This bug could possibly result in loading the wrong theme. Fixed.
 * Changing profiles, canceling, then changing to the profile again could also result in improper theme loading. Fixed.
2009-10-21 02:34:29 +00:00
wagic.jeck 63ddbd52ad Jeck - Hopefully fixes issue 114.
* Options before the desired optionID were not using the correct option class.
 * Enums were expected to be lower-case.
2009-10-20 16:54:53 +00:00
wagic.the.homebrew@gmail.com 83bc12a275 Erwan
- Fix issue 102 (Rampage not working correctly)
2009-10-20 13:24:12 +00:00
wagic.the.homebrew@gmail.com 771b6d75be Erwan
- fix for Dromad Purebred and other @damaged effects
2009-10-20 11:22:12 +00:00
wagic.jeck 8c4c3f2418 Jeck - Final fix to r1109. It was reloading the old options halfway through saving the new ones. 2009-10-20 04:33:43 +00:00
wagic.jeck 3a4dd403e2 Jeck - Quick fix to r1109. 2009-10-20 04:14:13 +00:00
wagic.jeck 7f7320f904 Jeck - Some basic options handling rewrites, main menu update, example alternate theme (for testing). I'm closing issues 44 and 45, as hopefully this resolves them satisfactorily.
* The alternate theme is just useful for testing themes, but please comment on the changes to the main theme.
 * Options reading and initializing separated from UI.
 * Options UI abstracted a bit, made more easily extensible.
 * With some extension, the options UI could be used as the basis for more complicated themes, if we load a file and use it to do stuff like GameStateOptions::Start()
2009-10-20 03:46:18 +00:00
wagic.the.homebrew@gmail.com 9d55a43ef0 Erwan
- fix for issue 108 (mana icon disappears)
- potential fix for issue 110 (victory bonus texts). Need to check
- Fix for issue 100. A better solution would be to "stretch" the cards in hand the way it is done for the rest of the game, but this will do for now as it is a border case
- Fix for issue 55. We'll remove 2 players mode for now, and put it back when/if we get network play
2009-10-19 13:48:09 +00:00
jean.chalard 77a00a3c4d J :
* Some cleaning after r1062 code review.
- Remove code that was never reached.
- Remove a useless function.
- Make GuiPlay treat cards that are both spells and creatures as
  creatures and not spells.
2009-10-19 13:36:42 +00:00
wagic.the.homebrew@gmail.com 273b0672e4 Erwan
- various optimization fixes
2009-10-19 11:37:47 +00:00
wagic.laurent 323fd4100c Laurent - Corrected "plainswalk" 2009-10-16 15:28:34 +00:00
wagic.the.homebrew@gmail.com 8c50e71b33 Erwan
- Fix a bug when a token would be removed from game while being an attacker or a blocker. Potentially fix issue 42
2009-10-16 14:41:27 +00:00
wagic.jeck 8984f690b4 Jeck — Minor fix, removed unnecessary options save. 2009-10-16 01:40:33 +00:00
wagic.jeck 08a9f00100 Jeck - Fixed issue 106. 2009-10-15 23:43:19 +00:00
wagic.the.homebrew@gmail.com 0e74773b57 Erwan
- Fix issue 105 (threaten on own creature)
2009-10-15 14:36:24 +00:00
wagic.the.homebrew@gmail.com 97a0732682 Erwan
- Fix issue 97. Please review. How about performance ?
2009-10-15 13:58:35 +00:00
wagic.laurent adba482340 -Laurent Added @damaged, cards to 10E and LEG, small correction to ALA, ARB, CHK, EVE and ZEN
- Added @damaged works fine (tested with thieving magpie), please test your additions if you plan to add some cards with this keyword and report if buggy. As the other trigger, you cannot have a target unless there is a may ability.
- Added 2 cards to 10E - Reminisce and Thieving Magpie both tested and working.
- Added 2 cards to LEG - Jovial Evil and Spiritual Sanctuary (not tested yet) but should work.
2009-10-15 09:30:09 +00:00
wagic.jeck e23fac82e0 Jeck - Resolved issue 101, fixed "Cancel" after "Switch decks without saving". 2009-10-14 20:58:38 +00:00
wagic.the.homebrew@gmail.com ad1492b888 Erwan
-some small performance enhancements
2009-10-14 14:35:26 +00:00