Commit Graph

905 Commits

Author SHA1 Message Date
wagic.the.homebrew@gmail.com
3ce216d5e6 Erwan
-adding exception handler to JGE. Copy the exception.prx file to the same directory as the EBOOT from now on
2009-09-23 03:33:02 +00:00
wagic.jeck
e577f3e378 Jeck - Resolved issue 44 and issue 45.
* Options can now use specialized loading functions. OptionEnum should work now.
 * Options are now stored in memory as a map<integer,GameOption>.
2009-09-23 00:24:43 +00:00
wagic.the.homebrew@gmail.com
433897bf38 Erwan - daily build based on rev 902 2009-09-22 14:53:12 +00:00
wagic.the.homebrew@gmail.com
f5ddbd2396 Erwan
-Issue 31 fixed. Land and tokens don't use the stack anymore. Taking control of a card in opponent's battlefield doesn't trigger "spell cast" triggers either
2009-09-22 14:45:01 +00:00
jean.chalard
7f396b13b4 J :
* Shift mana to the bottom of the screen to make them easier to count.
2009-09-22 08:44:42 +00:00
wagic.the.homebrew@gmail.com
202d461767 Erwan
-Adding AI decks provided on the forums. Let's test them, and let me know if some of them crash the game or are just too bad
2009-09-22 07:41:18 +00:00
jean.chalard
f6aba5c5cb J :
* Hand option.
2009-09-22 07:39:24 +00:00
wagic.the.homebrew@gmail.com
71d4818646 Erwan
- Fix issue #16 (testsuite segfaults if file does not exist)
- Fix issue #37 (Normal Combat Damage is not dealt to creatures when the AI attacks)
- TestSuite now has an "AI" mode (see test/manual/p2_attacks.txt)
2009-09-22 06:15:32 +00:00
wagic.jeck
d7657e8bdf Jeck - Less irritating version of gold glow. Please review. 2009-09-22 05:52:33 +00:00
wagic.jeck
d9786dfdc2 Jeck - (Probable) fix for issue 41. Turns out AttachZipFile is very robust, and already handles all the unattach / reattach optimizing & checking for us. 2009-09-22 05:33:01 +00:00
jean.chalard
694df9dc13 J :
* Minor fixes
2009-09-22 04:37:36 +00:00
wagic.jeck
07fab74945 Jeck - Updates to proposed manual thanks to Psyringe's proofreading. 2009-09-22 04:28:23 +00:00
wagic.jeck
3675099c85 Jeck - Took proposed manual changes and shrunk the files to something more net friendly. 2009-09-22 03:12:39 +00:00
wagic.jeck
7510ee165f Jeck - Daily build, deck renaming, small keypad bugfix, profileFile() fix, proposed new iconspsp.png.
* Decks now support naming and renaming. Also added a "Switch decks without saving" option.
 * Removed unused static const char * menuTexts, from old 6-deck limited system
 * Keypad didn't display correctly when not given a title, and was never destructed. Fixed.
 * profileFile() default behavior was to fall back to RESPATH/player. Fixed.
 * New iconspsp.png, updated look to seem like PSP buttons, added some extra (unused) button icons.
2009-09-22 02:47:48 +00:00
wagic.jeck
643b37d8b2 Jeck - Proposed update to game manual. Please comment with suggestions, corrections, or criticisms. 2009-09-21 19:47:32 +00:00
jean.chalard
5f04e7245c J :
* Fix carriage returns.
* Fix linux compilation.
* Make flags more common between linux/psp to help reducing occurences
  of flags being different.
2009-09-21 17:40:29 +00:00
wagic.jeck
67ef5b026c Jeck - Extremely subtle lighting effect fades in on boot screen sword.
* Yeah, it's kinda gratuitous. I was playing with various overlays, and this is really the only thing I could think of, given the limited space. Blood and rust just look wrong, fading in like that... and the area for text is really limited the card, from the Wagic logo down. Feature notes like "Single and multiplayer! Over 3000 cards!" just look cramped there, and detract from the overall image.
2009-09-21 07:44:22 +00:00
wagic.jeck
6de4f5612e Jeck - Resource manager zipfile fix.
* Only attaches when necessary.
2009-09-21 06:59:28 +00:00
wagic.jeck
f7eadb839b Jeck - Proposed pic1.png. Please comment here with thoughts / suggestions. 2009-09-21 06:40:02 +00:00
wagic.jeck
334938840b Jeck - Lock and release alternate thumbnails in shop view. 2009-09-21 05:16:42 +00:00
wagic.the.homebrew@gmail.com
ae93341a98 Erwan
- Stop calling the PNG Loading routine if not a .png file
2009-09-21 03:58:19 +00:00
leungclj
2bb4377f80 J0N4TH4N - small fix, plz leave (PLC), I almost finished, n dont want to clash with anyone. 2009-09-21 01:25:21 +00:00
wagic.jeck
e2adadd1bd Jeck - Re-enable sound effects. 2009-09-21 00:37:31 +00:00
wagic.jeck
20b41ab569 Jeck - Larger small cache size, to reduce likelihood of issue 39. 2009-09-21 00:02:10 +00:00
wagic.jeck
8c9374fe1f Jeck - GameStateMenu releases background image from cache, minor cache fixes. 2009-09-20 23:56:08 +00:00
wagic.laurent
31cf4ac884 Laurent - Fix to R878 (forgot some abilities) 2009-09-20 12:24:53 +00:00
wagic.laurent
8da116a4da Laurent - Small addition FUT tested and working. Nimbus maze works great sure there is some other cards like this one that could be coded. 2009-09-20 12:18:08 +00:00
wagic.laurent
4284e685e6 Laurent - Small addition CFX tested and working. Blood Tyrant is not technically 100% but in current wagic is 100% correct since there is no real "loose life" protection and no multiplayer option. 2009-09-20 12:15:50 +00:00
wagic.jeck
be723369ba Jeck - Restore proper deck stat save/loading. 2009-09-20 05:42:06 +00:00
wagic.jeck
e0b225bad9 Jeck - TEMPORARY enabling of exceptions. (~6hrs) Sorry, I've been an idiot lately and coded myself into a corner with stuff that "should only take a minute" to fine tune. I honestly shouldn't have committed r871+, but I'd sworn to high heaven that the damn thing was fixed. In reality getting the cache 100% needs a bit more time, so I'm committing this in the hopes that it'll prevent sloppy cache work from interrupting other people's coding.
Exception handling in the cache means that Wagic runs slightly, but noticeably slower. However, it also means that the cache works the way it was intended to, and should prevent all sorts of awkward errors I introduced because things were half-allocated or worse. 

I've learned my lesson from tonight, and once I get this stuff put back together without exception handling I think I'll self-impose a manditory 24 hours debugging time before any commits. Sorry for the inconvenience. 

If for some reason you can't compile with exceptions, r862 should be completely without them. Again, wow, this was stupid-- I hadn't even realized exceptions were off for like 24 hours, as the compiler wasn't producing warnings. 

Apologies,
—Jeck
2009-09-20 03:10:34 +00:00
wagic.jeck
00c5b8cd7d Jeck - CACHESIZE option does something again. 2009-09-20 00:39:55 +00:00
wagic.jeck
1689edc69b Jeck - Cleanup some debug messages, cache now clears unlocked items between states. 2009-09-20 00:05:23 +00:00
wagic.jeck
1ba7f108b0 Jeck - Cache is using map<> again. The implementation is cleaner and seems a little faster. 2009-09-19 23:20:43 +00:00
wagic.jeck
8cc9bff484 Jeck - Stricter cache limits. 2009-09-19 22:34:48 +00:00
wagic.jeck
0d3686e65a Jeck - Cache fix, booster duplicate fix.
* Restored OptionItem saving fix.
 * Booster duplicate replacement was picking random cards from the wrong set. My fault, but I've fixed it :)
 * The problem with cache had nothing to do with memory fragmentation, but I've switched to an array rather than map<> just in case. The actual issue was that in GameStateDeckViewer, I'd given the cache unlimited space, thinking that AttemptNew would recover from any bad_allocs. Unfortunately, the image loading routines and similar stuff called by various implementations of WResource::Attempt() could fail halfway through, leaking memory. 

The temporary solution is to set a proper limit (8000000 px, more or less) and (in case we still run out of memory) test to make certain CACHE_SPACE_RESERVED can be malloc'd/free'd. The proper solution would be to keep byte-perfect records of memory used (right now we're kinda fuzzy-- we track pixels per image and bytes per sound, but not the space for jquads or other incidentals) instead of testing a malloc, and potentially cleaning up all calls inside of Attempt() so they fail without leaks. That's what I'm working on now.

Still, it's nice to have identified the problem. This version of the cache should be fully functional, it's just a bit inelegant.
2009-09-19 21:11:35 +00:00
wagic.the.homebrew@gmail.com
e0f5a81dad Erwan
- Minor cleanup
2009-09-19 10:51:45 +00:00
wagic.jeck
f1670f2394 Jeck - Revert to r867. r868 logic sucks. 2009-09-19 04:17:42 +00:00
wagic.jeck
a5ded3e836 Jeck - Cleaned up logic a little in Cache::Get() 2009-09-19 04:11:07 +00:00
wagic.jeck
3ea5ab9b88 Jeck - Minor fix to r866, quads are now invalidated before being recycled. 2009-09-19 02:03:49 +00:00
wagic.jeck
4b8d344bcd Jeck - Card ID collisions, cache fixes, cache deleted pooling.
* mtgid now defaults to 0.
 * TextScroller will not update when empty.
 * Cache now moves WCachedResources we're finished with to a garbage pool for later use (to reduce memory fragmentation). 
 * Demo still crashes... but I'm thinking that has to do with fragmentation, not a leak?
2009-09-19 01:48:42 +00:00
wagic.the.homebrew
5d57693d31 Erwan
-adding dissension cards
2009-09-18 10:26:13 +00:00
wagic.the.homebrew
265d82c136 Erwan
- card fix Stronghold
2009-09-18 09:21:46 +00:00
wagic.the.homebrew
8cb3daa3ad Erwan
-Adding a few sets, please add/correct/remove cards, have fun :)
2009-09-18 08:13:16 +00:00
wagic.jeck
8ba34dafca Jeck - WResourceManager / Cache should now be leak free. Demo mode still crashes around EnstackBlocker. 2009-09-18 01:20:46 +00:00
solo81@web.de
6abd3cc160 Fixed Kindle (TMP) 2009-09-17 17:32:20 +00:00
leungclj
074b7fc391 J0N4TH4N - minor fix 2009-09-17 16:21:44 +00:00
leungclj
09ed6d149d J0N4TH4N - few updates 2009-09-17 03:33:55 +00:00
leungclj
626e13f1ed J0N4TH4N - few fixes 2009-09-16 01:40:02 +00:00
leungclj
63504a00c4 JON4TH4N - sets update, "ueot" added to a few cards 2009-09-16 01:14:15 +00:00
jean.chalard
5fe68bc8a2 J :
* Un-revert compiling fixes
2009-09-15 16:15:46 +00:00