|
8 | 8 | #define GENERATE_TYPE_DAMAGE_EVENT(TYPE) QString event = TYPE + QString::number(dealtDamage)
|
9 | 9 | #define EMIT_CLICK_DAMAGE_FEED updateEventFeed(event)
|
10 | 10 |
|
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" |
13 | 13 |
|
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)) |
16 | 16 |
|
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" |
19 | 19 |
|
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)) |
22 | 22 |
|
23 | 23 | // MACRO PAIR
|
24 | 24 | #define FIREBALL a,b
|
|
57 | 57 | game->currEnemyInstance->getMaxHP())
|
58 | 58 |
|
59 | 59 | // INITIALIZE ENEMY BUTTON
|
60 |
| -#define INIT_ENEMYBUTTON this->enemyButton->initButton(ui->enemyButton); |
| 60 | +#define INIT_ENEMYBUTTON this->enemyButton->initButton(ui->enemyButton); |
61 | 61 |
|
62 | 62 | // INITIALIZE EVENT FEED
|
63 |
| -#define INIT_EVENTPANEL this->eventPanel->initEventPanel(ui->eventList); |
| 63 | +#define INIT_EVENTPANEL this->eventPanel->initEventPanel(ui->eventList); |
64 | 64 |
|
65 | 65 | // 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()))) |
71 | 71 |
|
72 | 72 |
|
73 | 73 | /* -- QT RELATED MACROS -- */
|
74 | 74 |
|
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) |
80 | 80 |
|
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()) |
82 | 82 |
|
83 | 83 | #endif // GAMEMACROS_H
|
0 commit comments