Skip to content

Commit a1cf6d9

Browse files
Arc676Arc676
committed
Created utility function for creating vectors
Designated initializers not supported on Windows :(
1 parent 7a56d80 commit a1cf6d9

File tree

12 files changed

+59
-37
lines changed

12 files changed

+59
-37
lines changed

‎Dork 2/Entities/Enemy.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include "Enemy.h"
2323
#include "Player.h"
24+
#include "Scene.h"
2425

2526
const float Enemy::healthBounds[] = {0.7, 2, 0.5, 0.8, 1.4, 1, 1.7};
2627
const float Enemy::speeds[] = {1, 4, 0.5, 1.2, 2, 1.4, 0.3};
@@ -61,19 +62,19 @@ void Enemy::newRandomDirection() {
6162
orxSTRING strDir = (orxSTRING)"";
6263
switch (dir) {
6364
case 0:
64-
direction = {{.fX = 1}, {.fY = 0}, {.fZ = 0}};
65+
direction = Scene::createVector(1, 0, 0);
6566
strDir = (orxSTRING)"Right";
6667
break;
6768
case 1:
68-
direction = {{.fX = 0}, {.fY = 1}, {.fZ = 0}};
69+
direction = Scene::createVector(0, 1, 0);
6970
strDir = (orxSTRING)"Down";
7071
break;
7172
case 2:
72-
direction = {{.fX = -1}, {.fY = 0}, {.fZ = 0}};
73+
direction = Scene::createVector(-1, 0, 0);
7374
strDir = (orxSTRING)"Left";
7475
break;
7576
case 3:
76-
direction = {{.fX = 0}, {.fY = -1}, {.fZ = 0}};
77+
direction = Scene::createVector(0, -1, 0);
7778
strDir = (orxSTRING)"Up";
7879
break;
7980
default:

‎Dork 2/Entities/Enemy.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "Entity.h"
2626

2727
class Player;
28+
class Scene;
2829

2930
#define ENEMYCOUNT 7
3031
enum EnemyType {

‎Dork 2/Entities/Player.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
//See README and LICENSE for more details
2121

2222
#include "Player.h"
23+
#include "Scene.h"
2324

2425
Player::Player(orxSTRING name, EntityType type) : name(name) {
2526
this->type = type;
@@ -31,7 +32,7 @@ Player::Player(orxSTRING name, EntityType type) : name(name) {
3132
orxInput_Load(orxSTRING_EMPTY);
3233
entity = orxObject_CreateFromConfig("Player");
3334

34-
position = {{.fX = 1632}, {.fY = 1792}, {.fZ = 0}};
35+
position = Scene::createVector(1632, 1792, 0);
3536
orxObject_SetPosition(entity, &position);
3637

3738
ownedPotions = std::vector<int>(POTIONCOUNT);

‎Dork 2/Entities/Player.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#include "Entity.h"
2828
#include "Enemy.h"
2929

30+
class Scene;
31+
3032
class Player : public Entity {
3133
std::vector<int> ownedPotions;
3234
std::vector<bool> ownedWeapons;

‎Dork 2/Scenes/Armory.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323

2424
Armory::Armory(Player* player) : Purchasing() {
2525
selectorArrow = orxObject_CreateFromConfig("Selector");
26-
defaultPos = {{.fX = -1300}, {.fY = 750}, {.fZ = 0}};
26+
defaultPos = Scene::createVector(-1300, 750, 0);
2727
orxObject_SetPosition(selectorArrow, &defaultPos);
2828
orxObject_CreateFromConfig("ArmoryHelp");
2929

3030
tickMarks = std::vector<orxOBJECT*>(WEAPONCOUNT);
31-
orxVECTOR pos = {{.fX = -1100}, {.fY = 750}, {.fZ = 0}};
32-
orxVECTOR wpos = {{.fX = -1200}, {.fY = 750}, {.fZ = 0}};
31+
orxVECTOR pos = Scene::createVector(-1100, 750, 0);
32+
orxVECTOR wpos = Scene::createVector(-1200, 750, 0);
3333
for (int i = 0; i < WEAPONCOUNT; i++) {
3434
orxOBJECT* tick = orxObject_CreateFromConfig("TickMark");
3535
orxObject_SetPosition(tick, &pos);
@@ -47,7 +47,7 @@ Armory::Armory(Player* player) : Purchasing() {
4747

4848
loadPlayerData(player);
4949

50-
pos = {{.fX = -950}, {.fY = 750}, {.fZ = 0}};
50+
pos = Scene::createVector(-950, 750, 0);
5151
weaponName = orxObject_CreateFromConfig("SV");
5252
orxObject_SetPosition(weaponName, &pos);
5353

@@ -71,11 +71,11 @@ Armory::Armory(Player* player) : Purchasing() {
7171
weaponSpeed = orxObject_CreateFromConfig("SV");
7272
orxObject_SetPosition(weaponSpeed, &pos);
7373

74-
statViewer = new StatViewer(player, {{.fX = -1590}, {.fY = 1000}, {.fZ = 0}});
74+
statViewer = new StatViewer(player, Scene::createVector(-1590, 1000, 0));
7575
selectionLimit = WEAPONCOUNT;
7676

77-
setPauseMenuPosition({{.fX = -1150}, {.fY = 1000}, {.fZ = 0}});
78-
initializeUITextAt({{.fX = -1600}, {.fY = 1160}, {.fZ = -0.1}});
77+
setPauseMenuPosition(Scene::createVector(-1150, 1000, 0));
78+
initializeUITextAt(Scene::createVector(-1600, 1160, -0.1));
7979
}
8080

8181
void Armory::loadPlayerData(Player* player) {

‎Dork 2/Scenes/Combat.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ Move Combat::moves[2][2] = {
2626
{USE_ITEM, RUN}
2727
};
2828

29-
const orxVECTOR Combat::scaleUp = {{.fX = 2}, {.fY = 2}, {.fZ = 0}};
30-
const orxVECTOR Combat::scaleNormal = {{.fX = 1}, {.fY = 1}, {.fZ = 0}};
29+
const orxVECTOR Combat::scaleUp = Scene::createVector(2, 2, 0);
30+
const orxVECTOR Combat::scaleNormal = Scene::createVector(1, 1, 0);
3131

3232
Combat::Combat(Player* player, Enemy* enemy) : Scene(), enemy(enemy) {
3333
loadPlayerData(player);
3434
selector = orxObject_CreateFromConfig("Selector");
35-
orxVECTOR pos = {{.fX = -1400}, {.fY = 596}, {.fZ = 0}};
35+
orxVECTOR pos = Scene::createVector(-1400, 596, 0);
3636
orxObject_SetPosition(selector, &pos);
3737

38-
playerStats = new StatViewer(player, {{.fX = -1500}, {.fY = 270}, {.fZ = 0}});
39-
enemyStats = new StatViewer(enemy, {{.fX = -1000}, {.fY = 150}, {.fZ = 0}});
38+
playerStats = new StatViewer(player, Scene::createVector(-1500, 270, 0));
39+
enemyStats = new StatViewer(enemy, Scene::createVector(-1000, 150, 0));
4040
music = orxSound_CreateFromConfig("FightMusic");
4141
memset(modifiers, 0, sizeof(modifiers));
4242

4343
potionName = orxObject_CreateFromConfig("SV");
44-
pos = {{.fX = -1000}, {.fY = 470}, {.fZ = 0}};
44+
pos = Scene::createVector(-1000, 470, 0);
4545
orxObject_SetPosition(potionName, &pos);
4646
orxObject_Enable(potionName, orxFALSE);
4747

@@ -50,7 +50,7 @@ Combat::Combat(Player* player, Enemy* enemy) : Scene(), enemy(enemy) {
5050
orxObject_SetPosition(potionEffect, &pos);
5151
orxObject_Enable(potionEffect, orxFALSE);
5252

53-
pos = {{.fX = -1060}, {.fY = 480}, {.fZ = 0}};
53+
pos = Scene::createVector(-1060, 480, 0);
5454
allPotions = std::vector<orxOBJECT*>(POTIONCOUNT);
5555
for (int i = 0; i < POTIONCOUNT; i++) {
5656
orxOBJECT* potion = orxObject_CreateFromConfig(Potion::configCodeForType((PotionType)i));
@@ -60,16 +60,16 @@ Combat::Combat(Player* player, Enemy* enemy) : Scene(), enemy(enemy) {
6060
}
6161

6262
orxObject_CreateFromConfig("CombatUI");
63-
setPauseMenuPosition({{.fX = -1150.0}, {.fY = 400.0}, {.fZ = 0}});
64-
initializeUITextAt({{.fX = -1600}, {.fY = 560}, {.fZ = -0.1}});
63+
setPauseMenuPosition(Scene::createVector(-1150.0, 400.0, 0));
64+
initializeUITextAt(Scene::createVector(-1600, 560, -0.1));
6565
}
6666

6767
void Combat::activate() {
6868
playerPos = player->getPosition();
69-
player->setPosition({{.fX = -1200}, {.fY = 450}, {.fZ = 0}});
69+
player->setPosition(Scene::createVector(-1200, 450, 0));
7070
orxObject_SetScale(player->getEntity(), &scaleUp);
7171

72-
enemy->setPosition({{.fX = -1100}, {.fY = 200}, {.fZ = 0}});
72+
enemy->setPosition(Scene::createVector(-1100, 200, 0));
7373
orxObject_SetScale(enemy->getEntity(), &scaleUp);
7474

7575
orxObject_SetTargetAnim(player->getEntity(), "IdleUAnim");

‎Dork 2/Scenes/Exploration.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ Exploration::Exploration(Player* player, orxCAMERA* camera) : Scene(), camera(ca
2727
resetMusic();
2828
canSave = orxTRUE;
2929

30-
setPauseMenuPosition({{.fX = -50}, {.fY = 0}, {.fZ = 0}});
31-
initializeUITextAt({{.fX = -500}, {.fY = 160}, {.fZ = -0.1}});
30+
setPauseMenuPosition(Scene::createVector(-50, 0, 0));
31+
initializeUITextAt(Scene::createVector(-500, 160, -0.1));
3232
}
3333

3434
void Exploration::resetMusic() {

‎Dork 2/Scenes/Exploration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
class Exploration : public Scene {
3030
orxCAMERA* camera;
31-
const orxVECTOR UITextOffset = {{.fX = -500}, {.fY = 160}, {.fZ = 0.9}};
31+
const orxVECTOR UITextOffset = Scene::createVector(-500, 160, 0.9);
3232

3333
std::list<Enemy*> existingEnemies;
3434
orxFLOAT timeSinceEnemySpawn = 0;

‎Dork 2/Scenes/MainMenu.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ void MainMenu::activate() {
2727
cursorPos = 0;
2828
orxKeyboard_ClearBuffer();
2929

30-
orxVECTOR pos = {{.fX = -1216}, {.fY = 1592}, {.fZ = 0}};
30+
orxVECTOR pos = Scene::createVector(-1216, 1592, 0);
3131
orxObject_SetTextString(nameField, "Name:");
3232
orxObject_SetPosition(nameField, &pos);
3333

34-
pos = {{.fX = -1216}, {.fY = 1652}, {.fZ = 0}};
34+
pos = Scene::createVector(-1216, 1652, 0);
3535
orxObject_SetTextString(typeField, Entity::typeToString(chosenType));
3636
orxObject_SetPosition(typeField, &pos);
3737

3838
//reset selector
39-
pos = {{.fX = -1100}, {.fY = 1600}, {.fZ = 0}};
39+
pos = Scene::createVector(-1100, 1600, 0);
4040
orxObject_SetPosition(selector, &pos);
4141
currentSelection = 0;
4242

‎Dork 2/Scenes/Scene.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,15 @@
2222
#include "Scene.h"
2323

2424
orxBOOL Scene::playMusic = orxTRUE;
25-
const orxVECTOR Scene::textMargin = {{.fX = 10}, {.fY = 10}, {.fZ = 0}};
25+
const orxVECTOR Scene::textMargin = Scene::createVector(10, 10, 0);
26+
27+
orxVECTOR Scene::createVector(orxFLOAT x, orxFLOAT y, orxFLOAT z) {
28+
orxVECTOR vector;
29+
vector.fX = x;
30+
vector.fY = y;
31+
vector.fZ = z;
32+
return vector;
33+
}
2634

2735
Scene::Scene() {
2836
pauseSelector = orxObject_CreateFromConfig("Selector");

0 commit comments

Comments
 (0)