Commit Graph

2397 Commits

Author SHA1 Message Date
wagic.jeck 2a7d6819bb Jeck - More minor WResourceManager fixes.
* Locked resources are now guaranteed, though they currently share memory limits with the cache, so be certain to release them when you're done.
* RetrieveQuad now returns different quads for different resource names, regardless of if they share size and position.
2009-09-03 22:41:25 +00:00
wagic.jeck 0689b01536 Jeck - WResourceManager now tracks filesystem misses for cards (up to MAX_CACHE_OBJECTS) and sfx, so disk use is much reduced. 2009-09-03 21:52:41 +00:00
wagic.jeck 805a78e39d Jeck - Some logic fixes, reducing number of filesys calls when loading graphics. (Cards still check filesys way too often, but I'm working on that) 2009-09-03 21:10:04 +00:00
wagic.jeck 8ea9222122 Jeck - Initialize player avatar to NULL, cleanup some minor debug leftovers. Still eventually crashes with corrupted MTGCardInstance reference. 2009-09-03 20:10:59 +00:00
wagic.jeck c6f319d685 Jeck - Some minor fiddling with cache. 2009-09-03 19:08:09 +00:00
wagic.jeck 8340fdbd5b Jeck - It wasn't emptying the cache properly, so this is a step in the right direction. I'll keep looking for more issues, though. 2009-09-03 18:21:57 +00:00
jean.chalard 3db0969c0e J :
* Fix the speed of the animation.
* Use a Pos for the animation of the back.
2009-09-03 17:25:15 +00:00
jean.chalard 30e416b0b3 J :
* Animation smoothing (and bugfix on slow machines).
2009-09-03 17:24:42 +00:00
jean.chalard 4e7b172846 J :
* Code cleaning
2009-09-03 17:23:26 +00:00
jean.chalard dd2a541c2b J :
* Fix the acting player.
* This should make most things work.
* I still witness some segfaults.
2009-09-03 17:23:03 +00:00
jean.chalard a0cc143261 J :
* Some animation smoothing.
2009-09-03 17:21:28 +00:00
wagic.the.homebrew@gmail.com 37ea7f95b4 Erwan
-cache fix(?)
2009-09-03 12:47:40 +00:00
wagic.the.homebrew@gmail.com 83d573f11e Erwan
-prevent a segfault (not fixing the root cause)
2009-09-03 12:17:28 +00:00
wagic.jeck f220d2e9b9 Jeck - Cache and resource manager merged, streamlined.
This is pretty major, so there'll probably be something wrong with it... even though I did spend a few hours looking.
NOTES:
 * If you've Retrieved it, don't delete it--- Use resources.Release(Whatever). 
    Textures automatically release subordinate quads.
 * Most of the time, use resources.RetrieveQuad to grab a quad. Should handle everything for you.
    RetrieveQuad will load the required texture, if needed.
    Only managed resources have a resource name ("back", "simon", etc). 
    Managed resources can be retrieved with GetTexture/GetQuad/GetWhatever.
    Non managed quads lookup by position/dimensions, defaulting to the whole texture.
 * Use resources.RetrieveTexture only when you need to do something special to it. 
    Calling retrieve texture with RETRIEVE_MANAGE will permanently add a texture to the manager
    RETRIEVE_LOCK and RETRIEVE_VRAM will lock a texture. It will not leave the cache until
    Release(JTexture*) is called, or as a last resort during cache overflow.
 * Try to only store (as a class member) pointers to textures retrieved with RETRIEVE_MANAGE. 
    All others may become invalid, although locked textures do have a high degree of stability. It's
    pretty safe to store a locked texture if you're not going to load much between uses.

There's a lot going on here, so I might have missed something... but it runs through the test suite alright.

TODO: 
 * When called without any arguments, RetrieveQuad sometimes leaves a thin border around the image. 
    This can be bypassed by specifying a quad one or two pixels less than the image size. Why?
 * I've had a crash while runing the Demo mode, something to do with receiveEventMinus? 
    This hasn't exactly reproduced on a clean SVN copy, (being a hang, rather than a crash) so 
    I've probably done something to worsen the problem somehow? I'll look into it tomorrow.
 * Clean up lock/unlock system, memory usage. Streamline interface, consider phasing out calls using GetWhatever() format.
2009-09-03 09:28:16 +00:00
jean.chalard 7214248494 J :
* Some more tweaking for combat.
* This still doesn't work, but it's closer.
2009-09-03 02:16:53 +00:00
wagic.the.homebrew@gmail.com a7bef9142c Erwan
-removing unpackDamageStack/repackDamageStack obsolete functions
2009-09-02 12:59:55 +00:00
jean.chalard 336412f006 J :
* Fix PSP compilation errors
* This does not magically make it work
2009-08-31 16:55:03 +00:00
jean.chalard f407fa31ef J :
* Display the avatar in the damaged list if the attacker has trample.
2009-08-31 12:35:16 +00:00
wagic.the.homebrew@gmail.com 0454fb20ec Erwan
- fixed textures cache bug
- fixed one card in TMP
2009-08-31 12:22:43 +00:00
wagic.the.homebrew@gmail.com 794eec8bb8 Erwan
-code cleanup
-fix one card in TSP
2009-08-31 10:17:28 +00:00
jean.chalard 6dab048a9e J :
* Interface for damage assignment.
2009-08-31 02:00:33 +00:00
wagic.the.homebrew@gmail.com 8709b6d74a Erwan
-added toggle for attacker choice
2009-08-30 10:15:37 +00:00
wagic.the.homebrew@gmail.com e4a2c39683 Erwan
-removed unneeded file
2009-08-30 10:08:29 +00:00
wagic.the.homebrew@gmail.com 89419f90a7 Erwan
-moved card backs to Cache instead of ResourceManager
2009-08-30 08:11:38 +00:00
wagic.the.homebrew@gmail.com 5afd1a45a2 Erwan
-some memory leaks fixes
2009-08-29 14:16:58 +00:00
wagic.jeck 79fe55c71c Jeck - Quick patch to GuiCombat so it continues without the missing file. Did someone forget to commit OK.png? 2009-08-29 08:39:46 +00:00
wagic.jeck b13593c958 Jeck - Small fix to GameOptions theme/profile loading. 2009-08-29 05:34:56 +00:00
jean.chalard 1496f9ecd2 J :
* Really not pop out when not my turn
2009-08-28 15:16:03 +00:00
jean.chalard fe6e811f0b J :
* Add a forgotten file.
2009-08-28 15:09:21 +00:00
jean.chalard 71e9a3b2cc J :
* Attempt not to display when it's not my turn.
  Does not work because of the internals of GameObs, will ask when I get
  the chance
2009-08-28 14:22:06 +00:00
jean.chalard 2ff279fad8 J :
* Order blocker interface.
2009-08-28 13:57:12 +00:00
wagic.the.homebrew@gmail.com 163d296bb5 Erwan
- removed useless "color=" lines
- Added color override for cards such as crimson kobolds (note: color should be after the "mana" line to avoid side effects)
2009-08-28 13:40:14 +00:00
jean.chalard 9723f18827 J :
* Fix the last warning and reinstate -Werror on PSP.
2009-08-28 11:25:03 +00:00
wagic.jeck d1f6cdcd96 Jeck - Some warnings cleanup. 2009-08-28 05:40:10 +00:00
jean.chalard e5bbbb358f J :
* Fix a few compilation issues.
2009-08-28 01:58:57 +00:00
wagic.jeck 62e12380a4 Jeck - Stopgap update fixing WResourceManager slowdown until complete rewrite. 2009-08-27 23:24:55 +00:00
wagic.jeck db1730ee7f Jeck - Fixed issue with destructor not being called on OptionProfile, split settings into tabs. 2009-08-27 14:08:38 +00:00
wagic.the.homebrew@gmail.com 99aa284431 Erwan
-code cleanup
-memory leaks fixes
2009-08-27 13:32:12 +00:00
wagic.the.homebrew@gmail.com 890c893c94 Erwan
-a few warning fixes
2009-08-27 13:11:29 +00:00
wagic.the.homebrew@gmail.com a18b163b17 Erwna
-replace "new" with "NEW" for memory leak detection
2009-08-27 12:48:54 +00:00
wagic.jeck 807eea7ddb Jeck - As prior, but for sounds and music as well. Use CommonRes->ssLoadMusic / CommonRes->ssLoadSample. 2009-08-27 06:31:38 +00:00
wagic.jeck 5e14efed3c Jeck - CommonRes transparently finds themed versions of files. Use JRenderer::LoadTexture for unthemed files, and CommonRes::LoadTexture for themed files. Res/graphics/back.jpg renamed to Res/graphics/backdrop.jpg due to collision with sets/back.jpg. 2009-08-27 05:58:26 +00:00
wagic.jeck 6728794ce9 Jeck - Quick crashfix when loading without a profiles directory, slight keypad modifications. 2009-08-27 03:17:25 +00:00
wagic.jeck 355ee7a271 Jeck - Support for user profiles, preliminary theme support, virtual keypad, options GUI update. Still a bit unorganized, but it works. 2009-08-26 20:13:09 +00:00
wagic.the.homebrew@gmail.com 0dfa3f2e16 Erwan
-fixesRockslide Elemental, Welkin Hawk
-Added messages for Manapool updates
-Cleaned up ManaProducer code
2009-08-26 14:30:24 +00:00
jean.chalard 5e18cdb25d J :
* Fix the mana consume event so as to consume the right number of manas
2009-08-26 14:25:55 +00:00
wagic.the.homebrew@gmail.com 3b8f5fdd7e Erwan
- a few card fixes
2009-08-25 12:50:16 +00:00
wagic.the.homebrew@gmail.com fb0dccb7f3 Erwan
-added possibility for tester to take control of the test suite
2009-08-25 11:55:07 +00:00
wagic.the.homebrew@gmail.com 0454d39f79 Erwan
-fixed GameObserver::receiveEvent
2009-08-23 10:52:10 +00:00
wagic.the.homebrew@gmail.com a2149131fb Erwan
- fix bug eventBlocker
2009-08-23 10:48:06 +00:00