From f73c1bdc9839efb1108d76c5168cc68e2f10bed2 Mon Sep 17 00:00:00 2001 From: HCR-750F <54973190+sch-lda@users.noreply.github.com> Date: Thu, 27 Jul 2023 00:26:09 +0800 Subject: [PATCH] Fix crash reaction and add more translation key (#1850) --- .../commands/player/kick/host_kick.cpp | 2 +- src/backend/commands/self/ammo.cpp | 2 +- src/backend/commands/self/beast_jump.cpp | 2 +- src/backend/commands/self/clean_player.cpp | 2 +- src/backend/commands/self/clearwanted.cpp | 2 +- src/backend/commands/self/fill_inventory.cpp | 2 +- src/backend/commands/self/repair_vehicle.cpp | 2 +- .../commands/self/request_services.cpp | 18 +++--- src/backend/commands/self/skip_cutscene.cpp | 2 +- src/backend/commands/self/suicide.cpp | 2 +- src/backend/commands/self/super_jump.cpp | 2 +- src/backend/looped/self/off_radar.cpp | 2 +- src/backend/looped/tunables/disable_phone.cpp | 2 +- src/backend/looped/vehicle/block_homing.cpp | 2 +- src/backend/looped/vehicle/disable_siren.cpp | 2 +- src/backend/looped/vehicle/drive_on_water.cpp | 2 +- src/backend/looped/vehicle/fly.cpp | 2 +- src/backend/looped/vehicle/horn_boost.cpp | 2 +- src/backend/looped/vehicle/instant_brake.cpp | 2 +- src/backend/looped/vehicle/invisibility.cpp | 4 +- .../looped/vehicle/keep_engine_running.cpp | 2 +- src/backend/looped/vehicle/keep_on_ground.cpp | 2 +- .../looped/vehicle/keep_vehicle_clean.cpp | 2 +- .../looped/vehicle/keep_vehicle_repaired.cpp | 2 +- src/backend/looped/vehicle/no_collision.cpp | 2 +- .../looped/vehicle/no_water_collision.cpp | 2 +- src/backend/looped/vehicle/seatbelt.cpp | 2 +- src/backend/looped/vehicle/speedo_meter.cpp | 2 +- src/backend/looped/vehicle/turn_signals.cpp | 2 +- .../looped/vehicle/unlimited_weapons.cpp | 2 +- src/backend/looped/vehicle/vehicle_god.cpp | 2 +- src/backend/looped/vehicle/vehicle_jump.cpp | 2 +- src/backend/reactions/reaction.hpp | 4 +- src/services/orbital_drone/orbital_drone.cpp | 2 +- src/util/notify.hpp | 3 + src/views/network/view_network.cpp | 62 ++++++++++--------- src/views/settings/view_reaction_settings.cpp | 2 +- 37 files changed, 81 insertions(+), 74 deletions(-) diff --git a/src/backend/commands/player/kick/host_kick.cpp b/src/backend/commands/player/kick/host_kick.cpp index 110679f4..36cd31dc 100644 --- a/src/backend/commands/player/kick/host_kick.cpp +++ b/src/backend/commands/player/kick/host_kick.cpp @@ -24,5 +24,5 @@ namespace big } }; - host_kick g_host_kick("hostkick", "Host Kick", "Host kick that only works when host", 0, false); + host_kick g_host_kick("hostkick", "HOST_KICK", "HOST_KICK_DESC", 0, false); } \ No newline at end of file diff --git a/src/backend/commands/self/ammo.cpp b/src/backend/commands/self/ammo.cpp index 29583964..a18d33e5 100644 --- a/src/backend/commands/self/ammo.cpp +++ b/src/backend/commands/self/ammo.cpp @@ -18,5 +18,5 @@ namespace big } } }; - fill_ammo g_fill_ammo("fillammo", "Fill Ammo", "Fills all of your ammo.", 0); + fill_ammo g_fill_ammo("fillammo", "FILL_AMMO", "FILL_AMMO_DESC", 0); } \ No newline at end of file diff --git a/src/backend/commands/self/beast_jump.cpp b/src/backend/commands/self/beast_jump.cpp index 51bcc9c9..eddc025b 100644 --- a/src/backend/commands/self/beast_jump.cpp +++ b/src/backend/commands/self/beast_jump.cpp @@ -2,6 +2,6 @@ namespace big { - bool_command g_beastjump("beastjump", "Beast Jump", "Allows you to jump as if you were the beast like in the Hunt the Beast event", + bool_command g_beastjump("beastjump", "BEAST_JUMP", "BEAST_JUMP_DESC", g.self.beast_jump); } diff --git a/src/backend/commands/self/clean_player.cpp b/src/backend/commands/self/clean_player.cpp index 15e25bb1..a32c0920 100644 --- a/src/backend/commands/self/clean_player.cpp +++ b/src/backend/commands/self/clean_player.cpp @@ -14,5 +14,5 @@ namespace big } }; - clean_player g_clean_player("clean", "Clean Player", "Cleans the player of wetness and decals", 0); + clean_player g_clean_player("clean", "CLEAN_PLAYER", "CLEAN_PLAYER_DESC", 0); } \ No newline at end of file diff --git a/src/backend/commands/self/clearwanted.cpp b/src/backend/commands/self/clearwanted.cpp index d60fdd60..1d3e5c22 100644 --- a/src/backend/commands/self/clearwanted.cpp +++ b/src/backend/commands/self/clearwanted.cpp @@ -18,5 +18,5 @@ namespace big } }; - clear_wanted g_clear_wanted("clearwantedlvl", "Clear Wanted Level", "Clears your wanted level", 0); + clear_wanted g_clear_wanted("clearwantedlvl", "CLEAR_WANTED_LEVEL", "CLEAR_WANTED_LEVEL_DESC_SELF", 0); } \ No newline at end of file diff --git a/src/backend/commands/self/fill_inventory.cpp b/src/backend/commands/self/fill_inventory.cpp index f384b0d9..4e0299ae 100644 --- a/src/backend/commands/self/fill_inventory.cpp +++ b/src/backend/commands/self/fill_inventory.cpp @@ -22,5 +22,5 @@ namespace big } }; - fill_inventory g_fill_inventory("fillsnacks", "Fill Inventory", "Refills snacks and armor", 0); + fill_inventory g_fill_inventory("fillsnacks", "FILL_INVENTORY", "FILL_INVENTORY_DESC", 0); } \ No newline at end of file diff --git a/src/backend/commands/self/repair_vehicle.cpp b/src/backend/commands/self/repair_vehicle.cpp index 17852380..5c8e3e01 100644 --- a/src/backend/commands/self/repair_vehicle.cpp +++ b/src/backend/commands/self/repair_vehicle.cpp @@ -12,5 +12,5 @@ namespace big vehicle::repair(self::veh); } }; - repairpv g_repairpv("repairpv", "Repair PV", "Repairs your currently active personal vehicle", 0); + repairpv g_repairpv("repairpv", "REPAIR_PV", "REPAIR_PV_DESC", 0); } \ No newline at end of file diff --git a/src/backend/commands/self/request_services.cpp b/src/backend/commands/self/request_services.cpp index e57e6dfb..0d97572a 100644 --- a/src/backend/commands/self/request_services.cpp +++ b/src/backend/commands/self/request_services.cpp @@ -94,13 +94,13 @@ namespace big } }; - boat_pickup g_boat_pickup("boatpickup", "Request Boat Pickup", "Request a boat pickup", 0); - ballistic_armor g_ballistic_armor("ballisticarmor", "Request Ballistic Equipment", "Requests ballistic equipment which includes ballistic armor and an minigun", 0); - request_avenger g_request_avenger("avenger", "Request Avenger", "Requests the Avenger", 0); - request_kosatka g_request_kosatka("kosatka", "Request Kosatka", "Requests the Kosatka", 0); - request_moc g_request_moc("moc", "Request M.O.C", "Requests the Mobile Operations Center", 0); - request_terrorbyte g_request_terrorbyte("terrorbyte", "Request Terrorbyte", "Requests the terrorbyte", 0); - request_acidlab g_request_acidlab("acidlab", "Request Acid Lab", "Requests the Acid Lab", 0); - request_acidlab_bike g_request_acidlab_bike("acidbike", "Request Acid Bike", "Requests the Acid Lab Delivery Bike", 0); - request_taxi g_request_taxi("taxi", "Request Taxi", "Requests a taxi to give you a ride", 0); + boat_pickup g_boat_pickup("boatpickup", "REQUEST_BOAT", "REQUEST_BOAT_DESC", 0); + ballistic_armor g_ballistic_armor("ballisticarmor", "REQUEST_BALLISTIC", "REQUEST_BALLISTIC_DESC", 0); + request_avenger g_request_avenger("avenger", "REQUEST_AVENGER", "REQUEST_AVENGER_DESC", 0); + request_kosatka g_request_kosatka("kosatka", "REQUEST_KOSATKA", "REQUEST_KOSATKA_DESC", 0); + request_moc g_request_moc("moc", "REQUEST_MOC", "REQUEST_MOC_DESC", 0); + request_terrorbyte g_request_terrorbyte("terrorbyte", "REQUEST_TERRORBYTE", "REQUEST_TERRORBYTE_DESC", 0); + request_acidlab g_request_acidlab("acidlab", "REQUEST_ACIDLAB", "REQUEST_ACIDLAB_DESC", 0); + request_acidlab_bike g_request_acidlab_bike("acidbike", "REQUEST_ACIDBIKE", "REQUEST_ACIDBIKE_DESC", 0); + request_taxi g_request_taxi("taxi", "REQUEST_TAXI", "REQUEST_TAXI_DESC", 0); } \ No newline at end of file diff --git a/src/backend/commands/self/skip_cutscene.cpp b/src/backend/commands/self/skip_cutscene.cpp index 03766e00..f99585f1 100644 --- a/src/backend/commands/self/skip_cutscene.cpp +++ b/src/backend/commands/self/skip_cutscene.cpp @@ -13,5 +13,5 @@ namespace big } }; - skip_cutscene g_skip_cutscene("skipcutscene", "Skip Cutscene", "Skips the currently playing cutscene", 0); + skip_cutscene g_skip_cutscene("skipcutscene", "SKIP_CUTSCENE", "SKIP_CUTSCENE_DESC", 0); } \ No newline at end of file diff --git a/src/backend/commands/self/suicide.cpp b/src/backend/commands/self/suicide.cpp index bcab13ae..1da33024 100644 --- a/src/backend/commands/self/suicide.cpp +++ b/src/backend/commands/self/suicide.cpp @@ -13,5 +13,5 @@ namespace big } }; - suicide g_suicide("suicide", "Suicide", "Kills you", 0); + suicide g_suicide("suicide", "SUICIDE", "SUICIDE_DESC", 0); } \ No newline at end of file diff --git a/src/backend/commands/self/super_jump.cpp b/src/backend/commands/self/super_jump.cpp index 0d38f387..50e0bd82 100644 --- a/src/backend/commands/self/super_jump.cpp +++ b/src/backend/commands/self/super_jump.cpp @@ -2,5 +2,5 @@ namespace big { - bool_command g_super_jump("superjump", "Super Jump", "Jump really high", g.self.super_jump); + bool_command g_super_jump("superjump", "SUPER_JUMP", "SUPER_JUMP_DESC", g.self.super_jump); } \ No newline at end of file diff --git a/src/backend/looped/self/off_radar.cpp b/src/backend/looped/self/off_radar.cpp index 947d32d5..8b9068e1 100644 --- a/src/backend/looped/self/off_radar.cpp +++ b/src/backend/looped/self/off_radar.cpp @@ -28,5 +28,5 @@ namespace big }; off_radar g_off_radar("otr", "OFF_RADAR", "OFF_RADAR_DESC", g.self.off_radar); - bool_command ghost_org("ghostorg", "Ghost Org", "Use Ghost Organization instead of standard off radar.", g.self.ghost_org); + bool_command ghost_org("ghostorg", "GHOST_ORG", "GHOST_ORG_DESC", g.self.ghost_org); } diff --git a/src/backend/looped/tunables/disable_phone.cpp b/src/backend/looped/tunables/disable_phone.cpp index 8dd5c1af..9e37283b 100644 --- a/src/backend/looped/tunables/disable_phone.cpp +++ b/src/backend/looped/tunables/disable_phone.cpp @@ -19,5 +19,5 @@ namespace big } }; - disable_phone g_disable_phone("nophone", "Disable Phone", "Blocks phone and stops all phone calls", g.tunables.disable_phone); + disable_phone g_disable_phone("nophone", "DISABLE_PHONE", "DISABLE_PHONE_DESC", g.tunables.disable_phone); } diff --git a/src/backend/looped/vehicle/block_homing.cpp b/src/backend/looped/vehicle/block_homing.cpp index 99277a1e..b2c0136c 100644 --- a/src/backend/looped/vehicle/block_homing.cpp +++ b/src/backend/looped/vehicle/block_homing.cpp @@ -21,6 +21,6 @@ namespace big } }; - block_homing g_block_homing("blockhoming", "Block Homing Missiles", "Prevents homing missiles from locking on to your vehicle", + block_homing g_block_homing("blockhoming", "BLOCK_HOMING", "BLOCK_HOMING_DESC", g.vehicle.block_homing); } diff --git a/src/backend/looped/vehicle/disable_siren.cpp b/src/backend/looped/vehicle/disable_siren.cpp index 8dcb3d05..3566eeda 100644 --- a/src/backend/looped/vehicle/disable_siren.cpp +++ b/src/backend/looped/vehicle/disable_siren.cpp @@ -24,6 +24,6 @@ namespace big } }; - siren_mute g_siren_mute("mutesiren", "Mute Siren", "Disables the siren sound of Emergency vehicles", + siren_mute g_siren_mute("mutesiren", "MUTE_SIREN", "MUTE_SIREN_DESC", g.vehicle.siren_mute); } diff --git a/src/backend/looped/vehicle/drive_on_water.cpp b/src/backend/looped/vehicle/drive_on_water.cpp index ea9d7b15..dde082c6 100644 --- a/src/backend/looped/vehicle/drive_on_water.cpp +++ b/src/backend/looped/vehicle/drive_on_water.cpp @@ -94,5 +94,5 @@ namespace big } }; - drive_on_water g_drive_on_water("driveonwater", "Drive On Water", "Allows you to drive on water", g.vehicle.drive_on_water); + drive_on_water g_drive_on_water("driveonwater", "DRIVE_ON_WATER", "DRIVE_ON_WATER_DESC", g.vehicle.drive_on_water); } diff --git a/src/backend/looped/vehicle/fly.cpp b/src/backend/looped/vehicle/fly.cpp index a58d9ab6..dc8d9878 100644 --- a/src/backend/looped/vehicle/fly.cpp +++ b/src/backend/looped/vehicle/fly.cpp @@ -124,5 +124,5 @@ namespace big } }; - vehicle_fly g_vehicle_fly("vehiclefly", "Vehicle Fly", "Fly with any land vehicle", g.vehicle.fly.enabled); + vehicle_fly g_vehicle_fly("vehiclefly", "VEHICLE_FLY", "VEHICLE_FLY_DESC", g.vehicle.fly.enabled); } diff --git a/src/backend/looped/vehicle/horn_boost.cpp b/src/backend/looped/vehicle/horn_boost.cpp index 0217ec42..0a342c62 100644 --- a/src/backend/looped/vehicle/horn_boost.cpp +++ b/src/backend/looped/vehicle/horn_boost.cpp @@ -39,5 +39,5 @@ namespace big } }; - horn_boost g_horn_boost("hornboost", "Horn Boost", "Boosts your vehicle forward when you sound the horn", g.vehicle.horn_boost); + horn_boost g_horn_boost("hornboost", "HORN_BOOST", "HORN_BOOST_DESC", g.vehicle.horn_boost); } diff --git a/src/backend/looped/vehicle/instant_brake.cpp b/src/backend/looped/vehicle/instant_brake.cpp index 7153539c..27e299f0 100644 --- a/src/backend/looped/vehicle/instant_brake.cpp +++ b/src/backend/looped/vehicle/instant_brake.cpp @@ -18,6 +18,6 @@ namespace big } }; - instant_brake g_instant_brake("instantbrake", "Instant Brake", "Makes your vehicle stop instantly when you press the brake", + instant_brake g_instant_brake("instantbrake", "INSTANT_BRAKE", "INSTANT_BRAKE_DESC", g.vehicle.instant_brake); } diff --git a/src/backend/looped/vehicle/invisibility.cpp b/src/backend/looped/vehicle/invisibility.cpp index af09fc47..6153516c 100644 --- a/src/backend/looped/vehicle/invisibility.cpp +++ b/src/backend/looped/vehicle/invisibility.cpp @@ -39,7 +39,7 @@ namespace big } }; - vehinvisibility g_vehinvisibility("invisveh", "Vehicle Invisiblity", "Makes your car invisible", g.vehicle.vehinvisibility); - bool_command g_localveh_visibility("localinvisveh", "Visible Locally", "Makes your car visible to yourself, other players will still not be able to see it", + vehinvisibility g_vehinvisibility("invisveh", "VEHICLE_INVISIBILITY", "VEHICLE_INVISIBILITY_DESC", g.vehicle.vehinvisibility); + bool_command g_localveh_visibility("localinvisveh", "VEHICLE_LOCAL_VISIBLE", "VEHICLE_LOCAL_VISIBLE_DESC", g.vehicle.localveh_visibility); } diff --git a/src/backend/looped/vehicle/keep_engine_running.cpp b/src/backend/looped/vehicle/keep_engine_running.cpp index d3551409..8edfafe7 100644 --- a/src/backend/looped/vehicle/keep_engine_running.cpp +++ b/src/backend/looped/vehicle/keep_engine_running.cpp @@ -24,6 +24,6 @@ namespace big } }; - keep_engine_running g_keep_engine_running("keepengine", "Keep Engine Running", "Keeps the engine running when you exit the vehicle", + keep_engine_running g_keep_engine_running("keepengine", "KEEP_ENGINE", "KEEP_ENGINE_DESC", g.vehicle.keep_engine_running); } \ No newline at end of file diff --git a/src/backend/looped/vehicle/keep_on_ground.cpp b/src/backend/looped/vehicle/keep_on_ground.cpp index f5bd8f9a..60dcda18 100644 --- a/src/backend/looped/vehicle/keep_on_ground.cpp +++ b/src/backend/looped/vehicle/keep_on_ground.cpp @@ -16,6 +16,6 @@ namespace big } }; - keep_on_ground g_keep_on_ground("keeponground", "Keep On Ground", "Makes it so your vehicle is always on the ground on all four wheels", + keep_on_ground g_keep_on_ground("keeponground", "KEEP_ON_GROUND", "KEEP_ON_GROUND_DESC", g.vehicle.keep_on_ground); } \ No newline at end of file diff --git a/src/backend/looped/vehicle/keep_vehicle_clean.cpp b/src/backend/looped/vehicle/keep_vehicle_clean.cpp index ed934a38..693a9121 100644 --- a/src/backend/looped/vehicle/keep_vehicle_clean.cpp +++ b/src/backend/looped/vehicle/keep_vehicle_clean.cpp @@ -17,5 +17,5 @@ namespace big }; keep_vehicle_clean - g_keep_vehicle_clean("keepvehicleclean", "Keep Vehicle Clean", "Keeps the vehicle clean", g.vehicle.keep_vehicle_clean); + g_keep_vehicle_clean("keepvehicleclean", "KEEP_VEHICLE_CLEAN_CMD", "KEEP_VEHICLE_CLEAN_CMD_DESC", g.vehicle.keep_vehicle_clean); } \ No newline at end of file diff --git a/src/backend/looped/vehicle/keep_vehicle_repaired.cpp b/src/backend/looped/vehicle/keep_vehicle_repaired.cpp index 023fcb7e..2aca7e9d 100644 --- a/src/backend/looped/vehicle/keep_vehicle_repaired.cpp +++ b/src/backend/looped/vehicle/keep_vehicle_repaired.cpp @@ -15,6 +15,6 @@ namespace big } }; - keep_vehicle_repaired g_keep_vehicle_repaired("keepfixed", "Keep Vehicle Repaired", "Keeps your vehicle free of wear and tear", + keep_vehicle_repaired g_keep_vehicle_repaired("keepfixed", "KEEP_VEHICLE_FIXED", "KEEP_VEHICLE_FIXED_DESC", g.vehicle.keep_vehicle_repaired); } diff --git a/src/backend/looped/vehicle/no_collision.cpp b/src/backend/looped/vehicle/no_collision.cpp index b72a4afe..9ce3260a 100644 --- a/src/backend/looped/vehicle/no_collision.cpp +++ b/src/backend/looped/vehicle/no_collision.cpp @@ -23,5 +23,5 @@ namespace big vehicle::disable_collisions::m_patch->restore(); } }; - veh_no_collision g_veh_no_collision("vehnocollision", "No Collision", "Same as Ped No Collision, except this is global and also affects Ped", g.vehicle.no_collision); + veh_no_collision g_veh_no_collision("vehnocollision", "NO_COLLISION_VEHICLE", "NO_COLLISION_VEHICLE_DESC", g.vehicle.no_collision); } diff --git a/src/backend/looped/vehicle/no_water_collision.cpp b/src/backend/looped/vehicle/no_water_collision.cpp index f5eb4c7e..f397aa15 100644 --- a/src/backend/looped/vehicle/no_water_collision.cpp +++ b/src/backend/looped/vehicle/no_water_collision.cpp @@ -21,5 +21,5 @@ namespace big }; no_vehicle_water_collision - g_no_vehicle_water_collision("driveunder", "Drive Underwater", "Allows you to drive underwater", g.vehicle.no_water_collision); + g_no_vehicle_water_collision("driveunder", "NO_COLLISION_WATER", "NO_COLLISION_WATER_DESC", g.vehicle.no_water_collision); } diff --git a/src/backend/looped/vehicle/seatbelt.cpp b/src/backend/looped/vehicle/seatbelt.cpp index afb7a5b3..d35dcff9 100644 --- a/src/backend/looped/vehicle/seatbelt.cpp +++ b/src/backend/looped/vehicle/seatbelt.cpp @@ -20,6 +20,6 @@ namespace big } }; - seatbelt g_seatbelt("seatbelt", "Seatbelt", "Prevent you from falling off bikes or flying through the windshield", + seatbelt g_seatbelt("seatbelt", "SEATBELT", "SEATBELT_DESC", g.vehicle.seatbelt); } diff --git a/src/backend/looped/vehicle/speedo_meter.cpp b/src/backend/looped/vehicle/speedo_meter.cpp index f9cc9630..dee6a79f 100644 --- a/src/backend/looped/vehicle/speedo_meter.cpp +++ b/src/backend/looped/vehicle/speedo_meter.cpp @@ -62,7 +62,7 @@ namespace big }; speedo_meter - g_speedo_meter("speedometer", "Speedometer", "Enable/disable the speedo meter for vehicles.", g.vehicle.speedo_meter.enabled); + g_speedo_meter("speedometer", "SPEEDO_METER", "SPEEDO_METER_DESC", g.vehicle.speedo_meter.enabled); bool_command g_speedo_meter_gears("speedometergears", "Show current gear", "Adds the current gear the vehicle is in to the speedo meter.", g.vehicle.speedo_meter.show_current_gear); bool_command g_speedo_meter_left_side("speedometerleftside", "Align to left", "Aligns the speedo meter text to the left instead of to the right.", diff --git a/src/backend/looped/vehicle/turn_signals.cpp b/src/backend/looped/vehicle/turn_signals.cpp index dd56bd97..c2d77e4b 100644 --- a/src/backend/looped/vehicle/turn_signals.cpp +++ b/src/backend/looped/vehicle/turn_signals.cpp @@ -161,5 +161,5 @@ namespace big } }; - turn_signals g_turn_signals("turnsignals", "Turn Signals", "Makes your car invisible", g.vehicle.turn_signals); + turn_signals g_turn_signals("turnsignals", "TURN_SIGNALS", "TURN_SIGNALS_DESC", g.vehicle.turn_signals); } diff --git a/src/backend/looped/vehicle/unlimited_weapons.cpp b/src/backend/looped/vehicle/unlimited_weapons.cpp index b4f471c4..4c5cf5cd 100644 --- a/src/backend/looped/vehicle/unlimited_weapons.cpp +++ b/src/backend/looped/vehicle/unlimited_weapons.cpp @@ -3,6 +3,6 @@ namespace big { - bool_command g_veh_unlimited_weapons("vehallweapons", "Allow Weapons In Vehicle", "Allows you to use all weapons in vehicle", + bool_command g_veh_unlimited_weapons("vehallweapons", "VEHICLE_ALL_WEAPONS", "VEHICLE_ALL_WEAPONS_DESC", g.vehicle.unlimited_weapons); } diff --git a/src/backend/looped/vehicle/vehicle_god.cpp b/src/backend/looped/vehicle/vehicle_god.cpp index c0b38cd9..002e108c 100644 --- a/src/backend/looped/vehicle/vehicle_god.cpp +++ b/src/backend/looped/vehicle/vehicle_god.cpp @@ -134,6 +134,6 @@ namespace big static bool true_ref = true; vehicle_godmode_internal g_vehicle_godmode_internal("$$vehgodmode", "", "", true_ref); - bool_command g_vehicle_godmode("vehgodmode", "Vehicle God Mode", "Prevents your vehicle from taking any form of damage", + bool_command g_vehicle_godmode("vehgodmode", "VEHICLE_GOD", "VEHICLE_GOD_DESC", g.vehicle.god_mode); } \ No newline at end of file diff --git a/src/backend/looped/vehicle/vehicle_jump.cpp b/src/backend/looped/vehicle/vehicle_jump.cpp index 2a5d5feb..fe3741b6 100644 --- a/src/backend/looped/vehicle/vehicle_jump.cpp +++ b/src/backend/looped/vehicle/vehicle_jump.cpp @@ -19,5 +19,5 @@ namespace big }; vehicle_jump - g_vehicle_jump("vehjump", "Vehicle Jump", "Makes the vehicle jump when you press the handbrake", g.vehicle.vehicle_jump); + g_vehicle_jump("vehjump", "VEHICLE_JUMP", "VEHICLE_JUMP_DESC", g.vehicle.vehicle_jump); } diff --git a/src/backend/reactions/reaction.hpp b/src/backend/reactions/reaction.hpp index 64b24cc7..9bb2dd21 100644 --- a/src/backend/reactions/reaction.hpp +++ b/src/backend/reactions/reaction.hpp @@ -7,9 +7,6 @@ namespace big class reaction { - protected: - void process_common(player_ptr player); - public: bool announce_in_chat = false; bool notify = true; @@ -27,5 +24,6 @@ namespace big reaction(const char* event_name, const char* notify_message, const char* announce_message); virtual void process(player_ptr player); + virtual void process_common(player_ptr player); }; } \ No newline at end of file diff --git a/src/services/orbital_drone/orbital_drone.cpp b/src/services/orbital_drone/orbital_drone.cpp index ebb723df..5aced256 100644 --- a/src/services/orbital_drone/orbital_drone.cpp +++ b/src/services/orbital_drone/orbital_drone.cpp @@ -13,7 +13,7 @@ namespace big { - bool_command g_orbital_drone("orbitaldrone", "Toggle Orbital Drone", "Enables/Disables the orbital drone", + bool_command g_orbital_drone("orbitaldrone", "ORBITAL_DRONE", "ORBITAL_DRONE_DESC", g.world.orbital_drone.enabled); static bool nav_override; diff --git a/src/util/notify.hpp b/src/util/notify.hpp index b90bf77c..86dd5884 100644 --- a/src/util/notify.hpp +++ b/src/util/notify.hpp @@ -5,6 +5,7 @@ #include "network/ChatData.hpp" #include "pointers.hpp" #include "script.hpp" +#include "services/players/player_service.hpp" #include