From 88c5a35830bc163ac4f834a331ea57b06b3f294f Mon Sep 17 00:00:00 2001 From: Yimura Date: Tue, 4 Jan 2022 23:10:27 +0100 Subject: [PATCH] refactor(Core): Removed eExplosionType and updated gta/enums instead --- BigBaseV2/src/core/enums.hpp | 88 ------------- BigBaseV2/src/gta/enums.hpp | 124 ++++++++++++------ .../src/gui/window/player/player_toxic.cpp | 1 + BigBaseV2/src/util/toxic.hpp | 2 +- 4 files changed, 88 insertions(+), 127 deletions(-) diff --git a/BigBaseV2/src/core/enums.hpp b/BigBaseV2/src/core/enums.hpp index fe3af2fa..146c4613 100644 --- a/BigBaseV2/src/core/enums.hpp +++ b/BigBaseV2/src/core/enums.hpp @@ -13,94 +13,6 @@ namespace big VEHICLE_GUN }; - enum class eExplosionType : unsigned int - { - DONTCARE = UINT_MAX, - GRENADE = 0, - GRENADELAUNCHER = 1, - STICKYBOMB = 2, - MOLOTOV = 3, - ROCKET = 4, - TANKSHELL = 5, - HI_OCTANE = 6, - CAR = 7, - PLANE = 8, - PETROL_PUMP = 9, - BIKE = 10, - DIR_STEAM = 11, - DIR_FLAME = 12, - DIR_WATER_HYDRANT = 13, - DIR_GAS_CANISTER = 14, - BOAT = 15, - SHIP_DESTROY = 16, - TRUCK = 17, - BULLET = 18, - SMOKEGRENADELAUNCHER = 19, - SMOKEGRENADE = 20, - BZGAS = 21, - FLARE = 22, - GAS_CANISTER = 23, - EXTINGUISHER = 24, - _0x988620B8 = 25, - EXP_TAG_TRAIN = 26, - EXP_TAG_BARREL = 27, - EXP_TAG_PROPANE = 28, - EXP_TAG_BLIMP = 29, - EXP_TAG_DIR_FLAME_EXPLODE = 30, - EXP_TAG_TANKER = 31, - PLANE_ROCKET = 32, - EXP_TAG_VEHICLE_BULLET = 33, - EXP_TAG_GAS_TANK = 34, - EXP_TAG_BIRD_CRAP = 35, - EXP_TAG_RAILGUN = 36, - EXP_TAG_BLIMP2 = 37, - EXP_TAG_FIREWORK = 38, - EXP_TAG_SNOWBALL = 39, - EXP_TAG_PROXMINE = 40, - EXP_TAG_VALKYRIE_CANNON = 41, - EXP_TAG_AIR_DEFENCE = 42, - EXP_TAG_PIPEBOMB = 43, - EXP_TAG_VEHICLEMINE = 44, - EXP_TAG_EXPLOSIVEAMMO = 45, - EXP_TAG_APCSHELL = 46, - EXP_TAG_BOMB_CLUSTER = 47, - EXP_TAG_BOMB_GAS = 48, - EXP_TAG_BOMB_INCENDIARY = 49, - EXP_TAG_BOMB_STANDARD = 50, - EXP_TAG_TORPEDO = 51, - EXP_TAG_TORPEDO_UNDERWATER = 52, - EXP_TAG_BOMBUSHKA_CANNON = 53, - EXP_TAG_BOMB_CLUSTER_SECONDARY = 54, - EXP_TAG_HUNTER_BARRAGE = 55, - EXP_TAG_HUNTER_CANNON = 56, - EXP_TAG_ROGUE_CANNON = 57, - EXP_TAG_MINE_UNDERWATER = 58, - EXP_TAG_ORBITAL_CANNON = 59, - EXP_TAG_BOMB_STANDARD_WIDE = 60, - EXP_TAG_EXPLOSIVEAMMO_SHOTGUN = 61, - EXP_TAG_OPPRESSOR2_CANNON = 62, - EXP_TAG_MORTAR_KINETIC = 63, - EXP_TAG_VEHICLEMINE_KINETIC = 64, - EXP_TAG_VEHICLEMINE_EMP = 65, - EXP_TAG_VEHICLEMINE_SPIKE = 66, - EXP_TAG_VEHICLEMINE_SLICK = 67, - EXP_TAG_VEHICLEMINE_TAR = 68, - EXP_TAG_SCRIPT_DRONE = 69, - EXP_TAG_RAYGUN = 70, - EXP_TAG_BURIEDMINE = 71, - EXP_TAG_SCRIPT_MISSILE = 72, - EXP_TAG_RCTANK_ROCKET = 73, - EXP_TAG_BOMB_WATER = 74, - EXP_TAG_BOMB_WATER_SECONDARY = 75, - _0xF728C4A9 = 76, - _0xBAEC056F = 77, - EXP_TAG_FLASHGRENADE = 78, - EXP_TAG_STUNGRENADE = 79, - _0x763D3B3B = 80, - EXP_TAG_SCRIPT_MISSILE_LARGE = 81, - EXP_TAG_SUBMARINE_BIG = 82, - }; - enum class ePedTask { TASK_NONE, diff --git a/BigBaseV2/src/gta/enums.hpp b/BigBaseV2/src/gta/enums.hpp index c172e808..4020ae78 100644 --- a/BigBaseV2/src/gta/enums.hpp +++ b/BigBaseV2/src/gta/enums.hpp @@ -377,45 +377,93 @@ enum class ControllerInputs : std::uint32_t SCRIPTED_INPUT_LAST }; -enum class ExplosionTypes : std::uint32_t +enum eExplosionType { - EXPLOSION_GRENADE, - EXPLOSION_GRENADELAUNCHER, - EXPLOSION_STICKYBOMB, - EXPLOSION_MOLOTOV, - EXPLOSION_ROCKET, - EXPLOSION_TANKSHELL, - EXPLOSION_HI_OCTANE, - EXPLOSION_CAR, - EXPLOSION_PLANE, - EXPLOSION_PETROL_PUMP, - EXPLOSION_BIKE, - EXPLOSION_DIR_STEAM, - EXPLOSION_DIR_FLAME, - EXPLOSION_DIR_WATER_HYDRANT, - EXPLOSION_DIR_GAS_CANISTER, - EXPLOSION_BOAT, - EXPLOSION_SHIP_DESTROY, - EXPLOSION_TRUCK, - EXPLOSION_BULLET, - EXPLOSION_SMOKEGRENADELAUNCHER, - EXPLOSION_SMOKEGRENADE, - EXPLOSION_BZGAS, - EXPLOSION_FLARE, - EXPLOSION_GAS_CANISTER, - EXPLOSION_EXTINGUISHER, - EXPLOSION_PROGRAMMABLEAR, - EXPLOSION_TRAIN, - EXPLOSION_BARREL, - EXPLOSION_PROPANE, - EXPLOSION_BLIMP, - EXPLOSION_DIR_FLAME_EXPLODE, - EXPLOSION_TANKER, - EXPLOSION_PLANE_ROCKET, - EXPLOSION_VEHICLE_BULLET, - EXPLOSION_GAS_TANK, - EXPLOSION_BIRD_CRAP, - EXPLOSION_SNOWBALL = 39 + DONTCARE = -1, + GRENADE, + GRENADELAUNCHER, + STICKYBOMB, + MOLOTOV, + ROCKET, + TANKSHELL, + HI_OCTANE, + CAR, + PLANE, + PETROL_PUMP, + BIKE, + DIR_STEAM, + DIR_FLAME, + DIR_WATER_HYDRANT, + DIR_GAS_CANISTER, + BOAT, + SHIP_DESTROY, + TRUCK, + BULLET, + SMOKEGRENADELAUNCHER, + SMOKEGRENADE, + BZGAS, + FLARE, + GAS_CANISTER, + EXTINGUISHER, + PROGRAMMABLEAR, + TRAIN, + BARREL, + PROPANE, + BLIMP, + DIR_FLAME_EXPLODE, + TANKER, + PLANE_ROCKET, + VEHICLE_BULLET, + GAS_TANK, + BIRD_CRAP, + RAILGUN, + BLIMP2, + FIREWORK, + SNOWBALL, + PROXMINE, + VALKYRIE_CANNON, + AIR_DEFENCE, + PIPEBOMB, + VEHICLEMINE, + EXPLOSIVEAMMO, + APCSHELL, + BOMB_CLUSTER, + BOMB_GAS, + BOMB_INCENDIARY, + BOMB_STANDARD, + TORPEDO, + TORPEDO_UNDERWATER, + BOMBUSHKA_CANNON, + BOMB_CLUSTER_SECONDARY, + HUNTER_BARRAGE, + HUNTER_CANNON, + ROGUE_CANNON, + MINE_UNDERWATER, + ORBITAL_CANNON, + BOMB_STANDARD_WIDE, + EXPLOSIVEAMMO_SHOTGUN, + OPPRESSOR2_CANNON, + MORTAR_KINETIC, + VEHICLEMINE_KINETIC, + VEHICLEMINE_EMP, + VEHICLEMINE_SPIKE, + VEHICLEMINE_SLICK, + VEHICLEMINE_TAR, + SCRIPT_DRONE, + RAYGUN, + BURIEDMINE, + SCRIPT_MISSILE, + RCTANK_ROCKET, + BOMB_WATER, + BOMB_WATER_SECONDARY, + _0xF728C4A9, + _0xBAEC056F, + FLASHGRENADE, + STUNGRENADE, + _0x763D3B3B, + SCRIPT_MISSILE_LARGE, + SUBMARINE_BIG, + EMPLAUNCHER_EMP }; enum class HudColor : std::uint32_t diff --git a/BigBaseV2/src/gui/window/player/player_toxic.cpp b/BigBaseV2/src/gui/window/player/player_toxic.cpp index 981ea018..5a5b25a6 100644 --- a/BigBaseV2/src/gui/window/player/player_toxic.cpp +++ b/BigBaseV2/src/gui/window/player/player_toxic.cpp @@ -1,4 +1,5 @@ #include "fiber_pool.hpp" +#include "gta/enums.hpp" #include "gta_util.hpp" #include "player_tabs.hpp" #include "natives.hpp" diff --git a/BigBaseV2/src/util/toxic.hpp b/BigBaseV2/src/util/toxic.hpp index a075c6f1..e1a05369 100644 --- a/BigBaseV2/src/util/toxic.hpp +++ b/BigBaseV2/src/util/toxic.hpp @@ -1,5 +1,5 @@ #pragma once -#include "core/enums.hpp" +#include "gta/enums.hpp" #include "natives.hpp" #include "script_global.hpp" #include "system.hpp"