From a64fa8a3a17c5ff5f2de06229b6efb676a0867ac Mon Sep 17 00:00:00 2001 From: Sandu Liviu Catalin Date: Sat, 20 Aug 2016 22:42:54 +0300 Subject: [PATCH] Undo changes from previous commit. As it turns out this is just another conflict between Brits and Americans. A conflict which makes everything warn about a spelling mistake when it's not the case. --- source/Constants.cpp | 2 +- source/Core.hpp | 6 +++--- source/CoreEvents.cpp | 6 +++--- source/CoreUtils.cpp | 8 ++++---- source/Entity/Vehicle.cpp | 20 ++++++++++---------- source/Entity/Vehicle.hpp | 10 +++++----- source/SqBase.hpp | 2 +- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/source/Constants.cpp b/source/Constants.cpp index 47f89166..d8e24a10 100644 --- a/source/Constants.cpp +++ b/source/Constants.cpp @@ -156,7 +156,7 @@ static const EnumElement g_EventEnum[] = { {_SC("VehicleWorld"), EVT_VEHICLEWORLD}, {_SC("VehicleImmunity"), EVT_VEHICLEIMMUNITY}, {_SC("VehiclePartStatus"), EVT_VEHICLEPARTSTATUS}, - {_SC("VehicleTireStatus"), EVT_VEHICLETIRESTATUS}, + {_SC("VehicleTyreStatus"), EVT_VEHICLETYRESTATUS}, {_SC("VehicleDamageData"), EVT_VEHICLEDAMAGEDATA}, {_SC("VehicleRadio"), EVT_VEHICLERADIO}, {_SC("VehicleHandlingRule"), EVT_VEHICLEHANDLINGRULE}, diff --git a/source/Core.hpp b/source/Core.hpp index fcf8af24..bdc1a900 100644 --- a/source/Core.hpp +++ b/source/Core.hpp @@ -507,7 +507,7 @@ protected: Function mOnWorld; Function mOnImmunity; Function mOnPartStatus; - Function mOnTireStatus; + Function mOnTyreStatus; Function mOnDamageData; Function mOnRadio; Function mOnHandlingRule; @@ -1049,7 +1049,7 @@ public: void EmitVehicleWorld(Int32 vehicle_id, Int32 old_world, Int32 new_world); void EmitVehicleImmunity(Int32 vehicle_id, Int32 old_immunity, Int32 new_immunity); void EmitVehiclePartStatus(Int32 vehicle_id, Int32 part, Int32 old_status, Int32 new_status); - void EmitVehicleTireStatus(Int32 vehicle_id, Int32 tire, Int32 old_status, Int32 new_status); + void EmitVehicleTyreStatus(Int32 vehicle_id, Int32 tyre, Int32 old_status, Int32 new_status); void EmitVehicleDamageData(Int32 vehicle_id, Uint32 old_data, Uint32 new_data); void EmitVehicleRadio(Int32 vehicle_id, Int32 old_radio, Int32 new_radio); void EmitVehicleHandlingRule(Int32 vehicle_id, Int32 rule, Float32 old_data, Float32 new_data); @@ -1211,7 +1211,7 @@ private: Function mOnVehicleWorld; Function mOnVehicleImmunity; Function mOnVehiclePartStatus; - Function mOnVehicleTireStatus; + Function mOnVehicleTyreStatus; Function mOnVehicleDamageData; Function mOnVehicleRadio; Function mOnVehicleHandlingRule; diff --git a/source/CoreEvents.cpp b/source/CoreEvents.cpp index b91b5926..b995222e 100644 --- a/source/CoreEvents.cpp +++ b/source/CoreEvents.cpp @@ -935,11 +935,11 @@ void Core::EmitVehiclePartStatus(Int32 vehicle_id, Int32 part, Int32 old_status, } // ------------------------------------------------------------------------------------------------ -void Core::EmitVehicleTireStatus(Int32 vehicle_id, Int32 tire, Int32 old_status, Int32 new_status) +void Core::EmitVehicleTyreStatus(Int32 vehicle_id, Int32 tyre, Int32 old_status, Int32 new_status) { VehicleInst & _vehicle = m_Vehicles.at(vehicle_id); - Emit(_vehicle.mOnTireStatus, tire, old_status, new_status); - Emit(mOnVehicleTireStatus, _vehicle.mObj, tire, old_status, new_status); + Emit(_vehicle.mOnTyreStatus, tyre, old_status, new_status); + Emit(mOnVehicleTyreStatus, _vehicle.mObj, tyre, old_status, new_status); } // ------------------------------------------------------------------------------------------------ diff --git a/source/CoreUtils.cpp b/source/CoreUtils.cpp index 23590484..e2eda911 100644 --- a/source/CoreUtils.cpp +++ b/source/CoreUtils.cpp @@ -266,7 +266,7 @@ void Core::ResetFunc(VehicleInst & inst) inst.mOnWorld.ReleaseGently(); inst.mOnImmunity.ReleaseGently(); inst.mOnPartStatus.ReleaseGently(); - inst.mOnTireStatus.ReleaseGently(); + inst.mOnTyreStatus.ReleaseGently(); inst.mOnDamageData.ReleaseGently(); inst.mOnRadio.ReleaseGently(); inst.mOnHandlingRule.ReleaseGently(); @@ -392,7 +392,7 @@ void Core::ResetFunc() Core::Get().mOnVehicleWorld.ReleaseGently(); Core::Get().mOnVehicleImmunity.ReleaseGently(); Core::Get().mOnVehiclePartStatus.ReleaseGently(); - Core::Get().mOnVehicleTireStatus.ReleaseGently(); + Core::Get().mOnVehicleTyreStatus.ReleaseGently(); Core::Get().mOnVehicleDamageData.ReleaseGently(); Core::Get().mOnVehicleRadio.ReleaseGently(); Core::Get().mOnVehicleHandlingRule.ReleaseGently(); @@ -523,7 +523,7 @@ Function & Core::GetEvent(Int32 evid) case EVT_VEHICLEWORLD: return mOnVehicleWorld; case EVT_VEHICLEIMMUNITY: return mOnVehicleImmunity; case EVT_VEHICLEPARTSTATUS: return mOnVehiclePartStatus; - case EVT_VEHICLETIRESTATUS: return mOnVehicleTireStatus; + case EVT_VEHICLETYRESTATUS: return mOnVehicleTyreStatus; case EVT_VEHICLEDAMAGEDATA: return mOnVehicleDamageData; case EVT_VEHICLERADIO: return mOnVehicleRadio; case EVT_VEHICLEHANDLINGRULE: return mOnVehicleHandlingRule; @@ -721,7 +721,7 @@ Function & Core::GetVehicleEvent(Int32 id, Int32 evid) case EVT_VEHICLEWORLD: return inst.mOnWorld; case EVT_VEHICLEIMMUNITY: return inst.mOnImmunity; case EVT_VEHICLEPARTSTATUS: return inst.mOnPartStatus; - case EVT_VEHICLETIRESTATUS: return inst.mOnTireStatus; + case EVT_VEHICLETYRESTATUS: return inst.mOnTyreStatus; case EVT_VEHICLEDAMAGEDATA: return inst.mOnDamageData; case EVT_VEHICLERADIO: return inst.mOnRadio; case EVT_VEHICLEHANDLINGRULE: return inst.mOnHandlingRule; diff --git a/source/Entity/Vehicle.cpp b/source/Entity/Vehicle.cpp index 664bd302..82851f3d 100644 --- a/source/Entity/Vehicle.cpp +++ b/source/Entity/Vehicle.cpp @@ -889,35 +889,35 @@ void CVehicle::SetPartStatus(Int32 part, Int32 status) } // ------------------------------------------------------------------------------------------------ -Int32 CVehicle::GetTireStatus(Int32 tire) const +Int32 CVehicle::GetTyreStatus(Int32 tyre) const { // Validate the managed identifier Validate(); // Return the requested information - return _Func->GetVehicleTireStatus(m_ID, tire); + return _Func->GetVehicleTyreStatus(m_ID, tyre); } // ------------------------------------------------------------------------------------------------ -void CVehicle::SetTireStatus(Int32 tire, Int32 status) +void CVehicle::SetTyreStatus(Int32 tyre, Int32 status) { // Validate the managed identifier Validate(); // Grab the current value for this property - const Int32 current = _Func->GetVehicleTireStatus(m_ID, tire); + const Int32 current = _Func->GetVehicleTyreStatus(m_ID, tyre); // Don't even bother if it's the same value if (current == status) { return; } // Avoid property unwind from a recursive call - _Func->SetVehicleTireStatus(m_ID, tire, status); + _Func->SetVehicleTyreStatus(m_ID, tyre, status); // Avoid infinite recursive event loops - if (!(m_CircularLocks & VEHICLECL_EMIT_VEHICLE_TIRESTATUS)) + if (!(m_CircularLocks & VEHICLECL_EMIT_VEHICLE_TYRESTATUS)) { // Prevent this event from triggering while executed - BitGuardU32 bg(m_CircularLocks, VEHICLECL_EMIT_VEHICLE_TIRESTATUS); + BitGuardU32 bg(m_CircularLocks, VEHICLECL_EMIT_VEHICLE_TYRESTATUS); // Now forward the event call - Core::Get().EmitVehicleTireStatus(m_ID, tire, current, status); + Core::Get().EmitVehicleTyreStatus(m_ID, tyre, current, status); } } @@ -1876,8 +1876,8 @@ void Register_CVehicle(HSQUIRRELVM vm) .Func(_SC("SetColors"), &CVehicle::SetColors) .Func(_SC("GetPartStatus"), &CVehicle::GetPartStatus) .Func(_SC("SetPartStatus"), &CVehicle::SetPartStatus) - .Func(_SC("GetTireStatus"), &CVehicle::GetTireStatus) - .Func(_SC("SetTireStatus"), &CVehicle::SetTireStatus) + .Func(_SC("GetTyreStatus"), &CVehicle::GetTyreStatus) + .Func(_SC("SetTyreStatus"), &CVehicle::SetTyreStatus) .Func(_SC("ExistsHandlingRule"), &CVehicle::ExistsHandlingRule) .Func(_SC("GetHandlingRule"), &CVehicle::GetHandlingRule) .Func(_SC("SetHandlingRule"), &CVehicle::SetHandlingRule) diff --git a/source/Entity/Vehicle.hpp b/source/Entity/Vehicle.hpp index 42452a08..916ee985 100644 --- a/source/Entity/Vehicle.hpp +++ b/source/Entity/Vehicle.hpp @@ -16,7 +16,7 @@ enum VehicleCircularLocks VEHICLECL_EMIT_VEHICLE_WORLD = (2 << 0), VEHICLECL_EMIT_VEHICLE_IMMUNITY = (3 << 0), VEHICLECL_EMIT_VEHICLE_PARTSTATUS = (4 << 0), - VEHICLECL_EMIT_VEHICLE_TIRESTATUS = (5 << 0), + VEHICLECL_EMIT_VEHICLE_TYRESTATUS = (5 << 0), VEHICLECL_EMIT_VEHICLE_DAMAGEDATA = (6 << 0), VEHICLECL_EMIT_VEHICLE_RADIO = (7 << 0), VEHICLECL_EMIT_VEHICLE_HANDLINGRULE = (8 << 0) @@ -538,14 +538,14 @@ public: void SetPartStatus(Int32 part, Int32 status); /* -------------------------------------------------------------------------------------------- - * Retrieve the tire status of the managed vehicle entity. + * Retrieve the tyre status of the managed vehicle entity. */ - Int32 GetTireStatus(Int32 tire) const; + Int32 GetTyreStatus(Int32 tyre) const; /* -------------------------------------------------------------------------------------------- - * Modify the tire status of the managed vehicle entity. + * Modify the tyre status of the managed vehicle entity. */ - void SetTireStatus(Int32 tire, Int32 status); + void SetTyreStatus(Int32 tyre, Int32 status); /* -------------------------------------------------------------------------------------------- * Retrieve the damage data of the managed vehicle entity. diff --git a/source/SqBase.hpp b/source/SqBase.hpp index 42f275df..51a48b99 100644 --- a/source/SqBase.hpp +++ b/source/SqBase.hpp @@ -402,7 +402,7 @@ enum EventType EVT_VEHICLEWORLD, EVT_VEHICLEIMMUNITY, EVT_VEHICLEPARTSTATUS, - EVT_VEHICLETIRESTATUS, + EVT_VEHICLETYRESTATUS, EVT_VEHICLEDAMAGEDATA, EVT_VEHICLERADIO, EVT_VEHICLEHANDLINGRULE,