Inventory is up and running again! That wasn't so bad at all. It looks good and it works just fine. I don't have the merchants selling stuff again (yet), but that's another 'minor' thing to do. All the mechanics are there, so it's just a matter of setting the switches.

I should get that wrapped up in the next day or so and then (yes!) combat! If I can get that done this week, I'll have accomplished all my goals for this vacation time and set things up very nicely for the finishing stretch for the engine. We'll be back where we were prior to the port to the PopCap Framework - plus loads of new images, an entirely new map format (much, much improved with loads of nifty new features), and a (slightly) new interface design. It's looking very nice now. The added confidence we've gained has been well worth the effort - the game just hums now, is about 33% smaller in size and runs wonderfully with small video cards.