Index: binaries/data/mods/public/art/actors/fauna/crocodile.xml
===================================================================
--- binaries/data/mods/public/art/actors/fauna/crocodile.xml
+++ binaries/data/mods/public/art/actors/fauna/crocodile.xml
@@ -10,6 +10,7 @@
         <animation file="quadraped/Croc_idle3.dae" name="idle" speed="20"/>
         <animation file="quadraped/Croc_walk.dae" name="Walk" speed="20"/>
         <animation file="quadraped/Croc_run.dae" name="Run" speed="15"/>
+        <animation file="quadraped/Croc_swim.dae" name="Swim" speed="20"/>
         <animation event="0.47" file="quadraped/Croc_attack.dae" name="attack_melee" speed="80"/>
         <animation file="quadraped/Croc_death.dae" name="Death" speed="120"/>
       </animations>
Index: binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/UnitAI.js
+++ binaries/data/mods/public/simulation/components/UnitAI.js
@@ -3140,7 +3140,7 @@
 		"ROAMING": {
 			"enter": function() {
 				// Walk in a random direction
-				this.SelectAnimation("walk", false, this.GetWalkSpeed());
+				this.SelectAnimation("move");
 				this.SetFacePointAfterMove(false);
 				this.MoveRandomly(+this.template.RoamDistance);
 				// Set a random timer to switch to feeding state
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
@@ -21,6 +21,8 @@
   </Identity>
   <Position>
     <Anchor>pitch-roll</Anchor>
+    <Floating>true</Floating>
+    <FloatDepth>1.0</FloatDepth>
   </Position>
   <Selectable>
     <Overlay>
Index: source/simulation2/components/CCmpPosition.cpp
===================================================================
--- source/simulation2/components/CCmpPosition.cpp
+++ source/simulation2/components/CCmpPosition.cpp
@@ -467,6 +467,19 @@
 		AdvertiseInterpolatedPositionChanges();
 	}
 
+	virtual bool IsCurrentlyFloating() const
+	{
+		if (!m_Floating)
+			return false;
+
+		CmpPtr<ICmpTerrain> cmpTerrain(GetSystemEntity());
+		CmpPtr<ICmpWaterManager> cmpWaterManager(GetSystemEntity());
+		if (!cmpTerrain || !cmpWaterManager)
+			return false;
+
+		return cmpTerrain->GetGroundLevel(m_X, m_Z) < cmpWaterManager->GetWaterLevel(m_X, m_Z) - m_FloatDepth;
+	}
+
 	virtual bool CanFloat() const
 	{
 		return m_Floating;
@@ -942,7 +955,7 @@
 			return;
 		}
 
-		if (m_AnchorType == UPRIGHT || !m_RotZ.IsZero() || !m_RotX.IsZero())
+		if (m_AnchorType == UPRIGHT || !m_RotZ.IsZero() || !m_RotX.IsZero() || IsCurrentlyFloating())
 		{
 			// set the visual rotations to the ones fixed by the interface
 			m_InterpolatedRotX = m_RotX.ToFloat();
Index: source/simulation2/components/CCmpVisualActor.cpp
===================================================================
--- source/simulation2/components/CCmpVisualActor.cpp
+++ source/simulation2/components/CCmpVisualActor.cpp
@@ -781,7 +781,9 @@
 	fixed speed = cmpUnitMotion->GetCurrentSpeed();
 	std::string name;
 
-	if (speed.IsZero())
+	if (cmpPosition->IsCurrentlyFloating())
+		name = "swim";
+	else if (speed.IsZero())
 	{
 		speed = fixed::FromFloat(1.f);
 		name = "idle";
Index: source/simulation2/components/ICmpPosition.h
===================================================================
--- source/simulation2/components/ICmpPosition.h
+++ source/simulation2/components/ICmpPosition.h
@@ -137,6 +137,11 @@
 	virtual void SetHeightRelative(bool flag) = 0;
 
 	/**
+	 * Returns whether the entity is currently floating on water.
+	 */
+	virtual bool IsCurrentlyFloating() const = 0;
+
+	/**
 	 * Returns whether the entity can float on water.
 	 */
 	virtual bool CanFloat() const = 0;
Index: source/simulation2/components/ICmpPosition.cpp
===================================================================
--- source/simulation2/components/ICmpPosition.cpp
+++ source/simulation2/components/ICmpPosition.cpp
@@ -35,6 +35,7 @@
 DEFINE_INTERFACE_METHOD_CONST_0("GetHeightFixed", entity_pos_t, ICmpPosition, GetHeightFixed)
 DEFINE_INTERFACE_METHOD_CONST_0("IsHeightRelative", bool, ICmpPosition, IsHeightRelative)
 DEFINE_INTERFACE_METHOD_1("SetHeightRelative", void, ICmpPosition, SetHeightRelative, bool)
+DEFINE_INTERFACE_METHOD_CONST_0("IsCurrentlyFloating", bool, ICmpPosition, IsCurrentlyFloating)
 DEFINE_INTERFACE_METHOD_CONST_0("CanFloat", bool, ICmpPosition, CanFloat)
 DEFINE_INTERFACE_METHOD_1("SetFloating", void, ICmpPosition, SetFloating, bool)
 DEFINE_INTERFACE_METHOD_1("SetConstructionProgress", void, ICmpPosition, SetConstructionProgress, fixed)
Index: source/simulation2/components/tests/test_RangeManager.h
===================================================================
--- source/simulation2/components/tests/test_RangeManager.h
+++ source/simulation2/components/tests/test_RangeManager.h
@@ -54,6 +54,7 @@
 	virtual entity_pos_t GetHeightFixed() const { return entity_pos_t::Zero(); }
 	virtual bool IsHeightRelative() const { return true; }
 	virtual void SetHeightRelative(bool UNUSED(relative)) { }
+	virtual bool IsCurrentlyFloating() const { return false; }
 	virtual bool CanFloat() const { return false; }
 	virtual void SetFloating(bool UNUSED(flag)) { }
 	virtual void SetActorFloating(bool UNUSED(flag)) { }