Merge branch 'master' into newrenderer

ZDoom · Apr 19, 2021 · 2f696e1 · 2f696e1
2 parents de06030 + c8e466c
commit 2f696e1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/source/common/menu/savegamemanager.cpp b/source/common/menu/savegamemanager.cpp
@@ -232,6 +232,7 @@ DEFINE_ACTION_FUNCTION(FSavegameManager, LoadSavegame)
 
 void FSavegameManagerBase::DoSave(int Selected, const char *savegamestring)
 {
+	RemoveNewSaveNode();
 	if (Selected != 0)
 	{
 		auto node = SaveGames[Selected];

diff --git a/source/games/duke/src/input.cpp b/source/games/duke/src/input.cpp
@@ -755,7 +755,7 @@ static void processVehicleInput(player_struct *p, ControlInfo* const hidInput, I
 		input.avel = boatApplyTurn(p, hidInput, kbdLeft, kbdRight, scaleAdjust);
 	}
 
-	input.fvel = clamp(xs_CRoundToInt(p->MotoSpeed), -(MAXVELMOTO >> 3), MAXVELMOTO);
+	loc.fvel = clamp(xs_CRoundToInt(p->MotoSpeed), -(MAXVELMOTO >> 3), MAXVELMOTO);
 	input.avel *= BAngToDegree;
 	loc.avel += input.avel;
 }

diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp
@@ -2638,27 +2638,21 @@ void FuncPlayer(int a, int nDamage, int nRun)
 
                 Player* pPlayer = &PlayerList[nPlayer];
 
-                if (actions & (SB_LOOK_UP | SB_LOOK_DOWN))
-                {
-                    pPlayer->nDestVertPan = pPlayer->horizon.horiz;
-                    pPlayer->bPlayerPan = pPlayer->bLockPan = true;
-                }
-                else if (actions & (SB_AIM_UP | SB_AIM_DOWN | SB_CENTERVIEW))
-                {
-                    pPlayer->nDestVertPan = pPlayer->horizon.horiz;
-                    pPlayer->bPlayerPan = pPlayer->bLockPan = false;
-                }
-
                 if (SyncInput())
                 {
                     pPlayer->horizon.sethorizon(sPlayerInput[nPlayer].pan, &sPlayerInput[nLocalPlayer].actions);
                 }
 
-                if (sPlayerInput[nPlayer].pan)
+                if (actions & (SB_LOOK_UP | SB_LOOK_DOWN) || sPlayerInput[nPlayer].pan)
                 {
                     pPlayer->nDestVertPan = pPlayer->horizon.horiz;
                     pPlayer->bPlayerPan = pPlayer->bLockPan = true;
                 }
+                else if (actions & (SB_AIM_UP | SB_AIM_DOWN | SB_CENTERVIEW))
+                {
+                    pPlayer->nDestVertPan = pPlayer->horizon.horiz;
+                    pPlayer->bPlayerPan = pPlayer->bLockPan = false;
+                }
 
                 if (totalvel[nPlayer] > 20)
                 {