fix(Globals): Assign to correct settings and don't int cast

This commit is contained in:
Yimura 2022-02-13 23:52:33 +01:00
parent 5ea6135856
commit c49cb35cfc

View File

@ -116,8 +116,8 @@ struct globals {
struct weapons { struct weapons {
CustomWeapon custom_weapon = CustomWeapon::NONE; CustomWeapon custom_weapon = CustomWeapon::NONE;
char vehicle_gun_model[12] = "bus"; char vehicle_gun_model[12] = "bus";
bool infinite_ammo {}; bool infinite_ammo = false;
bool infinite_mag {}; bool infinite_mag = false;
}; };
struct window { struct window {
@ -205,8 +205,8 @@ struct globals {
this->vehicle.speedo_meter.y = j["vehicle"]["speedo_meter"]["position_y"]; this->vehicle.speedo_meter.y = j["vehicle"]["speedo_meter"]["position_y"];
this->weapons.custom_weapon = (CustomWeapon)j["weapons"]["custom_weapon"]; this->weapons.custom_weapon = (CustomWeapon)j["weapons"]["custom_weapon"];
this->weapons.custom_weapon = j["weapons"]["infinite_ammo"]; this->weapons.infinite_ammo = j["weapons"]["infinite_ammo"];
this->weapons.custom_weapon = j["weapons"]["infinite_mag"]; this->weapons.infinite_mag = j["weapons"]["infinite_mag"];
this->window.debug = j["window"]["debug"]; this->window.debug = j["window"]["debug"];
this->window.handling = j["window"]["handling"]; this->window.handling = j["window"]["handling"];
@ -317,8 +317,8 @@ struct globals {
{ {
"weapons", { "weapons", {
{ "custom_weapon", (int)this->weapons.custom_weapon }, { "custom_weapon", (int)this->weapons.custom_weapon },
{ "infinite_ammo", (int)this->weapons.infinite_ammo }, { "infinite_ammo", this->weapons.infinite_ammo },
{ "infinite_mag", (int)this->weapons.infinite_mag } { "infinite_mag", this->weapons.infinite_mag }
} }
}, },
{ {