By TheDoctor: Fix out of water climbing

git-svn-id: https://smokinguns.svn.sourceforge.net/svnroot/smokinguns/trunk@658 07eb42f0-b032-4355-afd3-42b1f3832223
smokin-guns · Dec 15, 2012 · d2c5801 · d2c5801
1 parent ea44711
commit d2c5801
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/code/game/bg_pmove.c b/code/game/bg_pmove.c
@@ -3975,16 +3975,15 @@ void PmoveSingle (pmove_t *pmove) {
 		PM_AirMove();
 	} else if (pm->ps->pm_flags & PMF_TIME_WATERJUMP) {
 #else
-	if (pm->ps->pm_flags & PMF_TIME_WATERJUMP) {
+	// TheDoctor: Fix out of water climbing
+	if (pml.ladder) {
+		PM_LadderMove();
+	} else if (pm->ps->pm_flags & PMF_TIME_WATERJUMP) {
 #endif
 		PM_WaterJumpMove();
 	} else if ( pm->waterlevel > 1 ) {
 		// swimming
 		PM_WaterMove();
-#ifdef SMOKINGUNS
-	} else if (pml.ladder) {
-		PM_LadderMove();
-#endif
 	} else if ( pml.walking ) {
 		// walking on ground
 		PM_WalkMove();