aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStormBytePP <stormbyte@gmail.com>2015-08-29 01:10:35 +0200
committerStormBytePP <stormbyte@gmail.com>2015-08-29 01:10:35 +0200
commitf96c08d27edc907f1ddf3fdd1fb63c5dfe656512 (patch)
treee37395601720bae498036a1788c8e02c442d87e4 /src
parentdd90e51028b92cfe65abef72f599f32bc896a810 (diff)
Core/Vehicles: Fix CanEnterOrExit by implying that if a vehicle seat have anim for enter/ride means it can be entered/exited even in cases where it lacks VEHICLE_SEAT_FLAG_CAN_ENTER_OR_EXIT flag
Diffstat (limited to 'src')
-rw-r--r--src/server/game/DataStores/DBCStructure.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index 774e20bb16d..16311e8e037 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -1550,7 +1550,12 @@ struct VehicleSeatEntry
uint32 FlagsC; // 64
uint32 UISkinFileDataID; // 65
- bool CanEnterOrExit() const { return (Flags & VEHICLE_SEAT_FLAG_CAN_ENTER_OR_EXIT) != 0; }
+ bool CanEnterOrExit() const
+ {
+ return ((Flags & VEHICLE_SEAT_FLAG_CAN_ENTER_OR_EXIT) != 0 ||
+ //If it has anmation for enter/ride, means it can be entered/exited by logic
+ (Flags & (VEHICLE_SEAT_FLAG_HAS_LOWER_ANIM_FOR_ENTER | VEHICLE_SEAT_FLAG_HAS_LOWER_ANIM_FOR_RIDE)) != 0);
+ }
bool CanSwitchFromSeat() const { return (Flags & VEHICLE_SEAT_FLAG_CAN_SWITCH) != 0; }
bool IsUsableByOverride() const { return (Flags & (VEHICLE_SEAT_FLAG_UNCONTROLLED | VEHICLE_SEAT_FLAG_UNK18)
|| (FlagsB & (VEHICLE_SEAT_FLAG_B_USABLE_FORCED | VEHICLE_SEAT_FLAG_B_USABLE_FORCED_2 |