Erwan
- fixed a problem with DOS card files under psp/linux - Added a bunch of SAFE_DELETE, not sure they're really necessary - fixed a small interface problem in Shop
This commit is contained in:
@@ -626,9 +626,9 @@ class AManaProducer: public MTGAbility{
|
||||
|
||||
~AManaProducer(){
|
||||
LOG("==Destroying ManaProducer Object");
|
||||
if (cost) delete cost;
|
||||
SAFE_DELETE(cost);
|
||||
SAFE_DELETE(output);
|
||||
if (mParticleSys) delete mParticleSys;
|
||||
SAFE_DELETE(mParticleSys);
|
||||
LOG("==Destroying ManaProducer Object Successful!");
|
||||
}
|
||||
|
||||
@@ -2377,7 +2377,7 @@ class AAtog:public TargetAbility{
|
||||
TargetAbility::Update(dt);
|
||||
Player * newController = source->controller();
|
||||
if (newController != currentController){
|
||||
delete tc;
|
||||
SAFE_DELETE(tc);
|
||||
MTGGameZone * zones[] = {newController->game->inPlay}; //In case Atog's controller changes
|
||||
tc = NEW TypeTargetChooser("artifact", zones, 1, source);
|
||||
currentController = newController;
|
||||
|
||||
@@ -77,7 +77,7 @@ class GameStateDeckViewer: public GameState, public JGuiListener
|
||||
|
||||
GameStateDeckViewer(GameApp* parent): GameState(parent) {
|
||||
bgMusic = NULL;
|
||||
scrollSpeed = HIGH_SPEED;
|
||||
scrollSpeed = MED_SPEED;
|
||||
}
|
||||
virtual ~GameStateDeckViewer() {
|
||||
SAFE_DELETE(bgMusic);
|
||||
@@ -241,7 +241,7 @@ class GameStateDeckViewer: public GameState, public JGuiListener
|
||||
SAFE_DELETE(menu);
|
||||
SAFE_DELETE(pspIconsTexture);
|
||||
for (int i=0; i < 8; i++){
|
||||
delete pspIcons[i];
|
||||
SAFE_DELETE(pspIcons[i]);
|
||||
}
|
||||
SAFE_DELETE(myCollection);
|
||||
SAFE_DELETE(myDeck);
|
||||
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
int lastTime;
|
||||
JSample * sample;
|
||||
SampleCached(int _lastTime, JSample * _sample):lastTime(_lastTime),sample(_sample){};
|
||||
~SampleCached(){delete sample;};
|
||||
~SampleCached(){SAFE_DELETE(sample);};
|
||||
};
|
||||
|
||||
class SampleCache{
|
||||
|
||||
Reference in New Issue
Block a user