Removed unused variables

This commit is contained in:
Xawotihs@gmail.com
2013-01-28 22:37:01 +00:00
parent 48d45f2a65
commit 73131c8064
3 changed files with 27 additions and 10 deletions

View File

@@ -60,7 +60,7 @@ int MTGEventBonus::receiveEvent(WEvent * event)
//only spells going to the stack are counted.
if(game->turn <2)//this shouldnt trigger on first turn, chances are they are cheating.
return 0;
if (WEventCardTappedForMana* e = dynamic_cast<WEventCardTappedForMana*>(event))
if (dynamic_cast<WEventCardTappedForMana*>(event))
{
if(chain[currentPlayer->getId()]/5 > 0)
@@ -1500,7 +1500,7 @@ PermanentAbility(observer, _id)
int MTGBlockRule::receiveEvent(WEvent *e)
{
if (WEventBlockersChosen * event = dynamic_cast<WEventBlockersChosen*>(e))
if (dynamic_cast<WEventBlockersChosen*>(e))
{
Player * p = game->currentPlayer;

View File

@@ -557,7 +557,7 @@ int TestSuite::loadNext()
size_t thread_count = 1;
#ifdef QT_CONFIG
thread_count = QThread::idealThreadCount();
thread_count = 1;//QThread::idealThreadCount();
#elif defined(IOS)
thread_count = 6;
#else

View File

@@ -1,12 +1,10 @@
# Add more folders to ship with the application, here
folder_01.source = qml/QmlWagic
folder_01.target = qml
folder_01.target = /usr/share
DEPLOYMENTFOLDERS = folder_01
TARGET = wagic
QT += core gui opengl network
!android:!symbian:QT += phonon
#!android:!symbian:QT += phonon
maemo5:QT += dbus
TARGET = wagic
@@ -19,10 +17,12 @@ windows:DEFINES += _CRT_SECURE_NO_WARNINGS
unix|macx:DEFINES += LINUX
CONFIG(debug, debug|release):DEFINES += _DEBUG
DEFINES += QT_CONFIG
!android:!symbian:DEFINES += USE_PHONON
#!android:!symbian:DEFINES += USE_PHONON
android:INCLUDEPATH += $$ANDROID_NDK_ROOT/platforms/android-9/arch-arm/usr/include
#DEFINES += QT_NO_DEBUG_OUTPUT
maemo5:DEFINES += QT_WIDGET
#maemo5:DEFINES += QT_WIDGET
DEFINES += QT_WIDGET
DEFINES += NETWORK_SUPPORT
windows:INCLUDEPATH += ../../JGE/Dependencies/include
windows{
@@ -304,6 +304,8 @@ SOURCES += \
../../JGE/src/JParticleSystem.cpp\
../../JGE/src/JResourceManager.cpp\
../../JGE/src/JSpline.cpp\
../../JGE/src/JNetwork.cpp\
../../JGE/src/pc/JSocket.cpp\
../../JGE/src/JSprite.cpp\
../../JGE/src/Vector2D.cpp\
../../JGE/src/tinyxml/tinystr.cpp\
@@ -406,7 +408,6 @@ maemo5: {
# Meego/maemo 6 packaging (no launcher)
} else:contains(MEEGO_EDITION,harmattan): {
# Variables
BINDIR = /opt/wagic/bin
RESDIR = /opt/wagic/Res
@@ -457,11 +458,27 @@ maemo5: {
DEFINES += RESDIR=\\\"$$RESDIR\\\"
DEFINES += USERDIR=\\\"$$USERDIR\\\"
} else:unix {
# Variables
BINDIR = /usr/bin
ICONDIR = /usr/share
RESDIR = Res
USERDIR = .Wagic
DEFINES += RESDIR=\\\"$$RESDIR\\\"
DEFINES += USERDIR=\\\"$$USERDIR\\\"
target.path = $$BINDIR
desktop.path = $$ICONDIR/applications
desktop.files += wagic.desktop
icon.path = $$ICONDIR/icons/hicolor/64x64/apps
icon.files += wagic-64x64.png
INSTALLS += target \
desktop \
icon
} else:windows {
RESDIR = ./Res
USERDIR = .Wagic