Skip to content

Commit 43f56ff

Browse files
committed
Update gamemacros.h
1 parent a767ac3 commit 43f56ff

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

lib/gamemacros.h

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
#define GENERATE_TYPE_DAMAGE_EVENT(TYPE) QString event = TYPE + QString::number(dealtDamage)
99
#define EMIT_CLICK_DAMAGE_FEED updateEventFeed(event)
1010

11-
#define GENERATE_FIREBALL_INIT_LABELS QString a = "LEVEL " + QString::number(game->playerInstance->fireSkill.getLevel()); \
12-
QString b = QString::number(game->playerInstance->fireSkill.getLevelUp() - game->playerInstance->fireSkill.getExp()) + " IS NEEDED TO LEVEL UP"
11+
#define GENERATE_FIREBALL_INIT_LABELS QString a = "LEVEL " + QString::number(game->playerInstance->fireSkill.getLevel()); \
12+
QString b = QString::number(game->playerInstance->fireSkill.getLevelUp() - game->playerInstance->fireSkill.getExp()) + " IS NEEDED TO LEVEL UP"
1313

14-
#define INIT_FIREBALL_INFO this->fireballInfo->initSkillInfo(qMakePair(ui->fireballLevelValue, a), \
15-
qMakePair(ui->fireballCoinsNeededUpgrade, b))
14+
#define INIT_FIREBALL_INFO this->fireballInfo->initSkillInfo(qMakePair(ui->fireballLevelValue, a), \
15+
qMakePair(ui->fireballCoinsNeededUpgrade, b))
1616

17-
#define GENERATE_DESTAURA_INIT_LABELS QString c = "LEVEL " + QString::number(game->playerInstance->destructionSkill.getLevel()); \
18-
QString d = QString::number(game->playerInstance->destructionSkill.getLevelUp() - game->playerInstance->destructionSkill.getExp()) + " IS NEEDED TO LEVEL UP"
17+
#define GENERATE_DESTAURA_INIT_LABELS QString c = "LEVEL " + QString::number(game->playerInstance->destructionSkill.getLevel()); \
18+
QString d = QString::number(game->playerInstance->destructionSkill.getLevelUp() - game->playerInstance->destructionSkill.getExp()) + " IS NEEDED TO LEVEL UP"
1919

20-
#define INIT_DESTAURA_INFO this->destructionAuraInfo->initSkillInfo(qMakePair(ui->destructionAuraLevelValue, c), \
21-
qMakePair(ui->destructionAuraCoinsNeededUpgrade, d))
20+
#define INIT_DESTAURA_INFO this->destructionAuraInfo->initSkillInfo(qMakePair(ui->destructionAuraLevelValue, c), \
21+
qMakePair(ui->destructionAuraCoinsNeededUpgrade, d))
2222

2323
// MACRO PAIR
2424
#define FIREBALL a,b
@@ -57,27 +57,27 @@
5757
game->currEnemyInstance->getMaxHP())
5858

5959
// INITIALIZE ENEMY BUTTON
60-
#define INIT_ENEMYBUTTON this->enemyButton->initButton(ui->enemyButton);
60+
#define INIT_ENEMYBUTTON this->enemyButton->initButton(ui->enemyButton);
6161

6262
// INITIALIZE EVENT FEED
63-
#define INIT_EVENTPANEL this->eventPanel->initEventPanel(ui->eventList);
63+
#define INIT_EVENTPANEL this->eventPanel->initEventPanel(ui->eventList);
6464

6565
// INITIALIZE LIESEL INFO
66-
#define INIT_LIESELINFO this->lieselInfo->initLieselInfo(qMakePair(ui->lieselFloorValue, QString::number(game->getCurrentFloor())), \
67-
qMakePair(ui->lieselCurrentLevelValue, QString::number(game->playerInstance->getLevel())), \
68-
qMakePair(ui->lieselCurrentLevelExp, QString::number(game->playerInstance->getExp())), \
69-
qMakePair(ui->lieselLevelMax, QString::number(game->playerInstance->getLevelUp())), \
70-
qMakePair(ui->lieselSoulCoinsValue, QString::number(game->playerInstance->getSoulCoins())))
66+
#define INIT_LIESELINFO this->lieselInfo->initLieselInfo(qMakePair(ui->lieselFloorValue, QString::number(game->getCurrentFloor())), \
67+
qMakePair(ui->lieselCurrentLevelValue, QString::number(game->playerInstance->getLevel())), \
68+
qMakePair(ui->lieselCurrentLevelExp, QString::number(game->playerInstance->getExp())), \
69+
qMakePair(ui->lieselLevelMax, QString::number(game->playerInstance->getLevelUp())), \
70+
qMakePair(ui->lieselSoulCoinsValue, QString::number(game->playerInstance->getSoulCoins())))
7171

7272

7373
/* -- QT RELATED MACROS -- */
7474

75-
#define SET_WINDOW_FLAGS setWindowFlags(windowFlags() | \
76-
Qt::CustomizeWindowHint | \
77-
Qt::WindowMinimizeButtonHint | \
78-
Qt::WindowMaximizeButtonHint | \
79-
Qt::WindowCloseButtonHint)
75+
#define SET_WINDOW_FLAGS setWindowFlags(windowFlags() | \
76+
Qt::CustomizeWindowHint | \
77+
Qt::WindowMinimizeButtonHint | \
78+
Qt::WindowMaximizeButtonHint | \
79+
Qt::WindowCloseButtonHint)
8080

81-
#define SET_WINDOW_CENTERED move(QGuiApplication::screens().at(0)->geometry().center() - frameGeometry().center())
81+
#define SET_WINDOW_CENTERED move(QGuiApplication::screens().at(0)->geometry().center() - frameGeometry().center())
8282

8383
#endif // GAMEMACROS_H

0 commit comments

Comments
 (0)