From ffa4baa5023130b867991d87d752d642f7c02793 Mon Sep 17 00:00:00 2001 From: Marcus Hutchings Date: Sun, 28 Jan 2024 10:25:26 +0000 Subject: [PATCH] Set default waterline for hoevrcraft. --- rts/Sim/MoveTypes/MoveDefHandler.cpp | 2 ++ rts/Sim/MoveTypes/MoveMath/MoveMath.h | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rts/Sim/MoveTypes/MoveDefHandler.cpp b/rts/Sim/MoveTypes/MoveDefHandler.cpp index a67427440a..b453760924 100644 --- a/rts/Sim/MoveTypes/MoveDefHandler.cpp +++ b/rts/Sim/MoveTypes/MoveDefHandler.cpp @@ -300,6 +300,8 @@ MoveDef::MoveDef(const LuaTable& moveDefTable): MoveDef() { defaultWaterline = xsize * SQUARE_SIZE; } else if (speedModClass == MoveDef::Ship) { defaultWaterline = 1; + } else if (speedModClass == MoveDef::Hover) { + defaultWaterline = 0; } height = std::max(1, moveDefTable.GetInt("height", defaultHeight)); diff --git a/rts/Sim/MoveTypes/MoveMath/MoveMath.h b/rts/Sim/MoveTypes/MoveMath/MoveMath.h index 680306cc56..a197290fa4 100644 --- a/rts/Sim/MoveTypes/MoveMath/MoveMath.h +++ b/rts/Sim/MoveTypes/MoveMath/MoveMath.h @@ -23,8 +23,7 @@ namespace MoveTypes { {} CheckCollisionQuery(const MoveDef* refMoveDef) - : unit(nullptr) - , moveDef(refMoveDef) + : moveDef(refMoveDef) {} bool HasPhysicalStateBit(unsigned int bit) const { return ((physicalState & bit) != 0); }