Merge branch 'main' of https://github.com/TwilitRealm/dusk into randomizer

include/d/actor/d_a_horse.h

@@ -196,6 +196,9 @@ public:
     void copyReinPos();
     void setReinPosHandSubstance(int);
     void setReinPosNormalSubstance();
+#if TARGET_PC
+    void lerpControlPoints(f32 alpha);
+#endif
     void bgCheck();
     bool checkSpecialWallHitSubstance(cXyz const&) const;
     void setServiceWaitTimer();

include/d/d_com_inf_game.h

@@ -4848,8 +4848,8 @@ inline void dComIfGd_drawXluListDark() {
 inline void dComIfGd_drawXluListInvisible() {
     ZoneScoped;
 #ifdef TARGET_PC
-    // FIXME: Water rendering hack for frame interpolation
-    if (!dusk::getSettings().game.enableFrameInterpolation) {
+    if (dusk::getSettings().game.enableWaterRefraction &&
+        !dusk::getSettings().game.enableFrameInterpolation) {
 #endif
         g_dComIfG_gameInfo.drawlist.drawXluListInvisible();
 #ifdef TARGET_PC
@@ -4859,7 +4859,14 @@ inline void dComIfGd_drawXluListInvisible() {
 
 inline void dComIfGd_drawOpaListInvisible() {
     ZoneScoped;
-    g_dComIfG_gameInfo.drawlist.drawOpaListInvisible();
+#ifdef TARGET_PC
+    if (dusk::getSettings().game.enableWaterRefraction &&
+        !dusk::getSettings().game.enableFrameInterpolation) {
+#endif
+        g_dComIfG_gameInfo.drawlist.drawOpaListInvisible();
+#ifdef TARGET_PC
+        }
+#endif
 }
 
 inline void dComIfGd_drawXluListZxlu() {

include/d/d_drawlist.h

@@ -435,6 +435,10 @@ public:
         m3DLineMatSortPacket[param_1->getMaterialID()].setMatDark(param_1);
     }
 
+#if TARGET_PC
+    void refresh3DlineMats(const cXyz& eye);
+#endif
+
     void peekZdata() { mPeekZ.peekData(); }
     void entryZSortListZxlu(J3DPacket* i_packet, cXyz& param_1) {
         entryZSortXluDrawList(mDrawBuffers[DB_LIST_Z_XLU], i_packet, param_1);

include/d/d_menu_fmap2D.h

@@ -152,6 +152,9 @@ public:
     void setRegionCursor(u8 i_value) { mRegionCursor = i_value; }
     void setMapDrawFlag(bool i_flag) { mMapDrawFlag = i_flag; }
     void resetDrug() { field_0x1238 = 0; }
+#if TARGET_PC
+    void resetScrollArrowMask() { field_0x122d = 0; }
+#endif
 
     void offArrowDrawFlag() { mArrowDrawFlag = false; }
     void onArrowDrawFlag() { mArrowDrawFlag = true; }