From d6072b26b67023eeb5d6df42dbc437db1a5e19b3 Mon Sep 17 00:00:00 2001
From: Yimura <andreas.maerten@scarlet.be>
Date: Wed, 19 May 2021 18:09:13 +0200
Subject: [PATCH] feat(Core): Added speedo_meter to data and renamed
 CustomWeapon enum

---
 .../backend/looped/weapons/gravity_gun.cpp    |  2 +-
 BigBaseV2/src/core/data/custom_weapons.hpp    |  6 ++--
 BigBaseV2/src/core/data/speedo_meters.hpp     | 13 +++++++++
 BigBaseV2/src/core/enums.hpp                  |  9 +++++-
 BigBaseV2/src/core/globals.hpp                | 29 +++++++++++++++++--
 5 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 BigBaseV2/src/core/data/speedo_meters.hpp

diff --git a/BigBaseV2/src/backend/looped/weapons/gravity_gun.cpp b/BigBaseV2/src/backend/looped/weapons/gravity_gun.cpp
index 78040961..c89433a6 100644
--- a/BigBaseV2/src/backend/looped/weapons/gravity_gun.cpp
+++ b/BigBaseV2/src/backend/looped/weapons/gravity_gun.cpp
@@ -17,7 +17,7 @@ namespace big
 
 	void looped::weapons_gravity_gun()
 	{
-		bool bGravityGun = g.weapons.custom_weapon == CustomWeapons::GRAVITY_GUN;
+		bool bGravityGun = g.weapons.custom_weapon == CustomWeapon::GRAVITY_GUN;
 		double multiplier = 3.0;
 
 		if (bGravityGun)
diff --git a/BigBaseV2/src/core/data/custom_weapons.hpp b/BigBaseV2/src/core/data/custom_weapons.hpp
index 7a968743..9d8a41e2 100644
--- a/BigBaseV2/src/core/data/custom_weapons.hpp
+++ b/BigBaseV2/src/core/data/custom_weapons.hpp
@@ -2,11 +2,11 @@
 #include "core/enums.hpp"
 
 struct custom_weapon {
-	big::CustomWeapons id;
+	big::CustomWeapon id;
 	const char name[16];
 };
 
 const custom_weapon custom_weapons[] = {
-	{ big::CustomWeapons::NONE, "No weapon" },
-	{ big::CustomWeapons::GRAVITY_GUN, "Gravity Gun" }
+	{ big::CustomWeapon::NONE, "No weapon" },
+	{ big::CustomWeapon::GRAVITY_GUN, "Gravity Gun" }
 };
\ No newline at end of file
diff --git a/BigBaseV2/src/core/data/speedo_meters.hpp b/BigBaseV2/src/core/data/speedo_meters.hpp
new file mode 100644
index 00000000..722b7d8d
--- /dev/null
+++ b/BigBaseV2/src/core/data/speedo_meters.hpp
@@ -0,0 +1,13 @@
+#pragma once
+#include "core/enums.hpp"
+
+struct speedo_meter {
+	big::SpeedoMeter id;
+	const char name[16];
+};
+
+const speedo_meter speedo_meters[] = {
+	{ big::SpeedoMeter::DISABLED, "Disabled" },
+	{ big::SpeedoMeter::KMH, "km/h" },
+	{ big::SpeedoMeter::MPH, "mph" }
+};
\ No newline at end of file
diff --git a/BigBaseV2/src/core/enums.hpp b/BigBaseV2/src/core/enums.hpp
index 111f0d03..b426c023 100644
--- a/BigBaseV2/src/core/enums.hpp
+++ b/BigBaseV2/src/core/enums.hpp
@@ -2,9 +2,16 @@
 
 namespace big
 {
-	enum class CustomWeapons
+	enum class CustomWeapon
 	{
 		NONE,
 		GRAVITY_GUN
 	};
+
+	enum class SpeedoMeter
+	{
+		DISABLED,
+		KMH,
+		MPH
+	};
 }
\ No newline at end of file
diff --git a/BigBaseV2/src/core/globals.hpp b/BigBaseV2/src/core/globals.hpp
index 4b9f4d21..8070786f 100644
--- a/BigBaseV2/src/core/globals.hpp
+++ b/BigBaseV2/src/core/globals.hpp
@@ -1,19 +1,44 @@
 #pragma once
 #include "enums.hpp"
+#include "settings.h"
 
 #ifndef GLOBALS_H
 #define GLOBALS_H
 
+using namespace big;
 struct globals {
+	void load()
+	{
+		this->self.noclip = g_settings.options["self"]["godmode"];
+	}
+
+	void save()
+	{
+		g_settings.options["self"]["godmode"] = this->self.noclip;
+
+		g_settings.save();
+	}
+
 	struct self {
+		bool godmode = false;
 		bool noclip = false;
 	};
 
-	struct weapons {
-		big::CustomWeapons custom_weapon = big::CustomWeapons::NONE;
+	struct vehicle {
+		SpeedoMeter speedo_meter = SpeedoMeter::DISABLED;
 	};
 
+	struct weapons {
+		CustomWeapon custom_weapon = CustomWeapon::NONE;
+	};
+
+	globals()
+	{
+		this->load();
+	}
+
 	self self{};
+	vehicle vehicle{};
 	weapons weapons{};
 };