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.
This commit is contained in:
wagic.jeck
2009-10-27 02:46:39 +00:00
parent 538248d979
commit fb7f48f26b
17 changed files with 114 additions and 121 deletions
+8 -6
View File
@@ -107,9 +107,8 @@ int ShopItem::updateCount(DeckDataWrapper * ddw){
ShopItem::~ShopItem(){
OutputDebugString("delete shopitem\n");
if(mRelease){
resources.Release(thumb);
}
if(thumb)
resources.Release(thumb->mTex);
SAFE_DELETE(mesh);
}
@@ -219,9 +218,12 @@ ShopItems::ShopItems(int id, JGuiListener* listener, JLBFont* font, int x, int y
myCollection = NEW DeckDataWrapper(NEW MTGDeck(options.profileFile(PLAYER_COLLECTION).c_str(), _collection));
showCardList = true;
mBgAA = resources.RetrieveQuad("shop_aliasing.png");
if(mBgAA)
mBgAA = NULL;
mBgAATex = resources.RetrieveTexture("shop_aliasing.png",RETRIEVE_LOCK);
if(mBgAATex){
mBgAA = resources.RetrieveQuad("shop_aliasing.png");
mBgAA->SetTextureRect(0,0,250,120);
}
}
@@ -453,7 +455,7 @@ ShopItems::~ShopItems(){
SAFE_DELETE(dialog);
safeDeleteDisplay();
SAFE_DELETE(myCollection);
resources.Release(mBgAA);
resources.Release(mBgAATex);
}
ostream& ShopItem::toString(ostream& out) const