From 33760f40666d06da1a1fd024d59dfb140b158eef Mon Sep 17 00:00:00 2001 From: xawotihs Date: Fri, 8 Aug 2014 18:08:13 +0200 Subject: [PATCH] Add minmax in Qt project, fixed small issue in later qtMultimedia code --- JGE/src/pc/JSfx.cpp | 10 +++++++--- projects/mtg/wagic.pri | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/JGE/src/pc/JSfx.cpp b/JGE/src/pc/JSfx.cpp index f7d08e3ba..97d8ec503 100644 --- a/JGE/src/pc/JSfx.cpp +++ b/JGE/src/pc/JSfx.cpp @@ -67,7 +67,9 @@ void JMusic::seekAtTheBegining() ////////////////////////////////////////////////////////////////////////// JSample::JSample() -#ifdef USE_PHONON +#ifdef QT_CONFIG + : effect(0) +#elif (defined USE_PHONON) : mOutput(0), mMediaObject(0) #endif { @@ -77,9 +79,11 @@ JSample::JSample() JSample::~JSample() { #ifdef QT_CONFIG - if(effect) + if(effect) { delete effect; -#elif USE_PHONON + effect = 0; + } +#elif (defined USE_PHONON) if(mOutput) delete mOutput; if(mMediaObject) diff --git a/projects/mtg/wagic.pri b/projects/mtg/wagic.pri index 7360f681e..0e195b615 100644 --- a/projects/mtg/wagic.pri +++ b/projects/mtg/wagic.pri @@ -59,6 +59,7 @@ SOURCES += \ src/AIMomirPlayer.cpp\ src/AIPlayer.cpp\ src/AIPlayerBaka.cpp\ + src/AIPlayerMinMax.cpp\ src/AIStats.cpp\ src/AllAbilities.cpp\ src/CardDescriptor.cpp\ @@ -177,6 +178,7 @@ HEADERS += \ include/AIHints.h\ include/AIPlayerBaka.h\ include/AIPlayerBakaB.h\ + include/AIPlayerMinMax.h\ include/DeckEditorMenu.h\ include/WResourceManagerImpl.h\ include/DeckMenu.h\