Merge pull request #1676 from mouzedrift/beta

fix BirdPortal not appearing in E2P02C02

Author: mouzedrift

.github/workflows/ci.yml

@@ -23,9 +23,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: windows-2019
+          - os: windows-latest
             name: Windows32
-          - os: windows-2019
+          - os: windows-latest
             name: Windows64
           - os: ubuntu-latest
             name: Linux
@@ -60,7 +60,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -G"Visual Studio 16 2019" -DSDL2_DIR="$env:GITHUB_WORKSPACE\SDL2-2.0.22" -DCMAKE_PREFIX_PATH="$env:QT_ROOT_DIR" -A Win32 -DCI_PROVIDER="GitHub" -DBUILD_NUMBER="$env:GITHUB_RUN_NUMBER"
+        cmake .. -G"Visual Studio 17 2022" -DSDL2_DIR="$env:GITHUB_WORKSPACE\SDL2-2.0.22" -DCMAKE_PREFIX_PATH="$env:QT_ROOT_DIR" -A Win32 -DCI_PROVIDER="GitHub" -DBUILD_NUMBER="$env:GITHUB_RUN_NUMBER"
         cmake --build . --config $env:CONFIGURATION
         cpack -G ZIP -C $env:CONFIGURATION
 
@@ -80,7 +80,7 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake .. -G"Visual Studio 16 2019" -DSDL2_DIR="$env:GITHUB_WORKSPACE\SDL2-2.0.22" -DCMAKE_PREFIX_PATH="$env:QT_ROOT_DIR" -A x64 -DCI_PROVIDER="GitHub" -DBUILD_NUMBER="$env:GITHUB_RUN_NUMBER"
+        cmake .. -G"Visual Studio 17 2022" -DSDL2_DIR="$env:GITHUB_WORKSPACE\SDL2-2.0.22" -DCMAKE_PREFIX_PATH="$env:QT_ROOT_DIR" -A x64 -DCI_PROVIDER="GitHub" -DBUILD_NUMBER="$env:GITHUB_RUN_NUMBER"
         cmake --build . --config $env:CONFIGURATION
         cpack -G ZIP -C $env:CONFIGURATION
         

Source/AliveLibAE/FlyingSlig.cpp

@@ -2104,7 +2104,7 @@ bool FlyingSlig::IsWallBetween(BaseAliveGameObject* pThis, BaseAliveGameObject*
                &pLine,
                &hitX,
                &hitY,
-               pThis->GetScale() == Scale::Fg ? kFgFloorWallOrCeiling : kBgFloorWallOrCeiling)
+               pThis->GetScale() == Scale::Fg ? kFgFloorCeilingOrWalls : kBgFloorCeilingOrWalls)
         != 1;
 }
 

Source/AliveLibAE/Glukkon.cpp

@@ -2908,8 +2908,8 @@ bool Glukkon::IsLineOfSightBetween(Glukkon* pGlukkon, BaseAliveGameObject* pOthe
                &pathLine,
                &hitX,
                &hitY,
-               pGlukkon->GetScale() == Scale::Fg ? kFgFloorWallOrCeiling
-               : kBgFloorWallOrCeiling)
+               pGlukkon->GetScale() == Scale::Fg ? kFgFloorCeilingOrWalls
+                                                 : kBgFloorCeilingOrWalls)
         != 1;
 }
 

Source/AliveLibAE/Scrab.cpp

@@ -4081,8 +4081,8 @@ bool Scrab::LineOfSightTo(Scrab* pThis, BaseAliveGameObject* pObj)
                &pLine,
                &hitX,
                &hitY,
-               pThis->GetScale() == Scale::Fg ? kFgFloorWallOrCeiling
-               : kBgFloorWallOrCeiling)
+               pThis->GetScale() == Scale::Fg ? kFgFloorCeilingOrWalls
+                                              : kBgFloorCeilingOrWalls)
         != 1;
 } 
 

Source/AliveLibAO/BirdPortal.cpp

@@ -56,6 +56,9 @@ BirdPortal::BirdPortal(relive::Path_BirdPortal* pTlv, const Guid& tlvId)
 
     PathLine* pLine = nullptr;
     FP hitX = {};
+
+    // IMPORTANT: In AO we need to include all masks otherwise the BirdPortal in E2P02C02 won't detect a collision.
+    // This is because the BirdPortal object does not touch the floor but still collides with the right wall.
     gCollisions->Raycast(
         FP_FromInteger(pTlv->mTopLeftX),
         FP_FromInteger(pTlv->mTopLeftY),
@@ -64,7 +67,7 @@ BirdPortal::BirdPortal(relive::Path_BirdPortal* pTlv, const Guid& tlvId)
         &pLine,
         &hitX,
         &mHitY,
-        mSpriteScale > FP_FromDouble(0.5) ? kFgFloor : kBgFloor);
+        mSpriteScale > FP_FromDouble(0.5) ? kFgFloorCeilingOrWalls : kBgFloorCeilingOrWalls);
 
     mXPos = FP_FromInteger(pTlv->mTopLeftX);
     mYPos = mHitY - (FP_FromInteger(55) * mSpriteScale);

Source/relive_lib/Collisions.hpp

@@ -134,10 +134,6 @@ inline constexpr CollisionMask kBgCeiling(eBackgroundCeiling_7);
 inline constexpr CollisionMask kFgFloorOrCeiling(eFloor_0, eDynamicCollision_32, eCeiling_3);
 inline constexpr CollisionMask kBgFloorOrCeiling(eBackgroundFloor_4, eBackgroundDynamicCollision_36, eBackgroundCeiling_7);
 
-
-inline constexpr CollisionMask kFgFloorWallOrCeiling(eFloor_0, eDynamicCollision_32, eWallLeft_1, eWallRight_2, eCeiling_3);
-inline constexpr CollisionMask kBgFloorWallOrCeiling(eBackgroundFloor_4, eBackgroundDynamicCollision_36, eBackgroundWallLeft_5, eBackgroundWallRight_6, eBackgroundCeiling_7);
-
 inline constexpr CollisionMask kFgWallsOrFloor(eFloor_0, eDynamicCollision_32, eWallLeft_1, eWallRight_2);
 inline constexpr CollisionMask kBgWallsOrFloor(eBackgroundFloor_4, eBackgroundDynamicCollision_36, eBackgroundWallLeft_5, eBackgroundWallRight_6);