aboutsummaryrefslogtreecommitdiff
path: root/game/menus/mainmenu
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2025-01-08 15:03:34 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2025-01-08 15:03:34 +0100
commit14d2398b776d7be3c404af5f4e983b435efaf1d1 (patch)
tree76a4d0b73a0e179dca61ca0f95544edcd017f2d1 /game/menus/mainmenu
parent38c88e394414556a464b07e091b4b7fc8fd27b1d (diff)
`make format`jaro/game
Diffstat (limited to 'game/menus/mainmenu')
-rw-r--r--game/menus/mainmenu/CreditsSubScene.cpp30
-rw-r--r--game/menus/mainmenu/CreditsSubScript.cpp4
-rw-r--r--game/menus/mainmenu/CreditsSubScript.h2
3 files changed, 20 insertions, 16 deletions
diff --git a/game/menus/mainmenu/CreditsSubScene.cpp b/game/menus/mainmenu/CreditsSubScene.cpp
index bdd6fa0..65576ee 100644
--- a/game/menus/mainmenu/CreditsSubScene.cpp
+++ b/game/menus/mainmenu/CreditsSubScene.cpp
@@ -55,7 +55,7 @@ void CreditsSubScene::create(Scene & scn) {
ButtonSubScene::Data {
.text = "Back",
.text_width = 150,
- .position = {-button_position.x+150, button_position.y},
+ .position = {-button_position.x + 150, button_position.y},
.script_type = ButtonSubScene::ScriptSelect::CREDITS_BACK,
.button_type = ButtonSubScene::ButtonSelect::BACK,
.scale = 0.6,
@@ -69,58 +69,64 @@ void CreditsSubScene::create(Scene & scn) {
const float Y_OFFSET_NAMES_BEGIN = 100;
const float Y_OFFSET_NAMES = 30;
const string LOEK = "Loek Le Blansch";
- crepe::vec2 size_loek = {LOEK.size()*SIZE_CHAR_NAMES, (LOEK.size()*SIZE_CHAR_NAMES / LOEK.size()) * 2};
+ crepe::vec2 size_loek
+ = {LOEK.size() * SIZE_CHAR_NAMES, (LOEK.size() * SIZE_CHAR_NAMES / LOEK.size()) * 2};
titel.add_component<Text>(
size_loek, FONT,
Text::Data {
.world_space = false,
.text_color = Color::WHITE,
},
- vec2 {150, -207+Y_OFFSET_NAMES+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, LOEK
+ vec2 {150, -207 + Y_OFFSET_NAMES + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, LOEK
);
const string WOUTER = "Wouter Boerenkamps";
- crepe::vec2 size_wouter = {WOUTER.size()*SIZE_CHAR_NAMES, (WOUTER.size()*SIZE_CHAR_NAMES / WOUTER.size()) * 2};
+ crepe::vec2 size_wouter
+ = {WOUTER.size() * SIZE_CHAR_NAMES,
+ (WOUTER.size() * SIZE_CHAR_NAMES / WOUTER.size()) * 2};
titel.add_component<Text>(
size_wouter, FONT,
Text::Data {
.world_space = false,
.text_color = Color::WHITE,
},
- vec2 {150, -207+Y_OFFSET_NAMES*2+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, WOUTER
+ vec2 {150, -207 + Y_OFFSET_NAMES * 2 + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, WOUTER
);
const string JARO = "Jaro Rutjes";
- crepe::vec2 size_jaro = {JARO.size()*SIZE_CHAR_NAMES, (JARO.size()*SIZE_CHAR_NAMES / JARO.size()) * 2};
+ crepe::vec2 size_jaro
+ = {JARO.size() * SIZE_CHAR_NAMES, (JARO.size() * SIZE_CHAR_NAMES / JARO.size()) * 2};
titel.add_component<Text>(
size_jaro, FONT,
Text::Data {
.world_space = false,
.text_color = Color::WHITE,
},
- vec2 {150, -207+Y_OFFSET_NAMES*3+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, JARO
+ vec2 {150, -207 + Y_OFFSET_NAMES * 3 + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, JARO
);
const string MAX = "Max Smits";
- crepe::vec2 size_max = {MAX.size()*SIZE_CHAR_NAMES, (MAX.size()*SIZE_CHAR_NAMES / MAX.size()) * 2};
+ crepe::vec2 size_max
+ = {MAX.size() * SIZE_CHAR_NAMES, (MAX.size() * SIZE_CHAR_NAMES / MAX.size()) * 2};
titel.add_component<Text>(
size_max, FONT,
Text::Data {
.world_space = false,
.text_color = Color::WHITE,
},
- vec2 {150, -207+Y_OFFSET_NAMES*4+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, MAX
+ vec2 {150, -207 + Y_OFFSET_NAMES * 4 + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, MAX
);
const string NIELS = "Niels Stunnebrink";
- crepe::vec2 size_niels = {NIELS.size()*SIZE_CHAR_NAMES, (NIELS.size()*SIZE_CHAR_NAMES / NIELS.size()) * 2};
+ crepe::vec2 size_niels
+ = {NIELS.size() * SIZE_CHAR_NAMES, (NIELS.size() * SIZE_CHAR_NAMES / NIELS.size()) * 2
+ };
titel.add_component<Text>(
size_niels, FONT,
Text::Data {
.world_space = false,
.text_color = Color::WHITE,
},
- vec2 {150, -207+Y_OFFSET_NAMES*5+Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, NIELS
+ vec2 {150, -207 + Y_OFFSET_NAMES * 5 + Y_OFFSET_NAMES_BEGIN} + FONTOFFSET, NIELS
);
-
}
diff --git a/game/menus/mainmenu/CreditsSubScript.cpp b/game/menus/mainmenu/CreditsSubScript.cpp
index ce74ba4..4224dc8 100644
--- a/game/menus/mainmenu/CreditsSubScript.cpp
+++ b/game/menus/mainmenu/CreditsSubScript.cpp
@@ -1,8 +1,8 @@
#include "CreditsSubScript.h"
#include "../../Events.h"
-#include "../IFloatingWindowScript.h"
#include "../ButtonReplaySubScript.h"
+#include "../IFloatingWindowScript.h"
#include <string>
@@ -13,7 +13,6 @@
using namespace crepe;
-
CreditsSubScript::CreditsSubScript(const std::string & tag) { this->tag = tag; }
void CreditsSubScript::init() {
@@ -57,4 +56,3 @@ bool CreditsSubScript::enable_all() {
bool CreditsSubScript::on_button_press(const ButtonPressEvent & e) {
return this->disable_all();
}
-
diff --git a/game/menus/mainmenu/CreditsSubScript.h b/game/menus/mainmenu/CreditsSubScript.h
index e411202..81f941a 100644
--- a/game/menus/mainmenu/CreditsSubScript.h
+++ b/game/menus/mainmenu/CreditsSubScript.h
@@ -1,7 +1,7 @@
#pragma once
-#include "../IFloatingWindowScript.h"
#include "../IButtonScript.h"
+#include "../IFloatingWindowScript.h"
#include <crepe/api/Event.h>
#include <crepe/api/Script.h>