cleanup manual value clamping: cursor.cpp CheckCursMove() (#2563)

5 years ago · b1d9bfdbf8
1 changed files with 2 additions and 12 deletions
--- a/Source/cursor.cpp
+++ b/Source/cursor.cpp
@ -360,18 +360,8 @@ void CheckCursMove()
 		mx++;
 	}

-	if (mx < 0) {
-		mx = 0;
-	}
-	if (mx >= MAXDUNX) {
-		mx = MAXDUNX - 1;
-	}
-	if (my < 0) {
-		my = 0;
-	}
-	if (my >= MAXDUNY) {
-		my = MAXDUNY - 1;
-	}
+	mx = clamp(mx, 0, MAXDUNX - 1);
+	my = clamp(my, 0, MAXDUNY - 1);

 	// While holding the button down we should retain target (but potentially lose it if it dies, goes out of view, etc)
 	if (sgbMouseDown != CLICK_NONE && pcursinvitem == -1) {