cpp/openttd-patchpack/source Changeset - r6853:39397cc729b3

Changeset - r6853:39397cc729b3

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

truelight - 17 years ago 2007-06-11 11:59:36
truelight@openttd.org

(svn r10093) -Revert: removed 16x zoom-out as it is broken beyond repair

4 files changed with 2 insertions and 28 deletions:

src/sound.cpp

src/texteff.cpp

src/viewport.cpp

src/zoom.hpp

0 comments (0 inline, 0 general)

src/sound.cpp

➞

Show inline comments

@@ @@ -152,7 +152,7 @@ static void StartSound(uint sound, int p @@
+}
-static const byte _vol_factor_by_zoom[] = {255, 190, 134, 87, 49};
 static const byte _vol_factor_by_zoom[] = {255, 190, 134, 87};
 assert_compile(lengthof(_vol_factor_by_zoom) == ZOOM_LVL_END);
 static const byte _sound_base_vol[] = {

src/texteff.cpp

➞

Show inline comments

@@ @@ -353,7 +353,6 @@ void DrawTextEffects(DrawPixelInfo *dpi) @@
 		case ZOOM_LVL_OUT_4X:
 		case ZOOM_LVL_OUT_8X:
 		case ZOOM_LVL_OUT_16X:
 			break;
 		default: NOT_REACHED();

src/viewport.cpp

➞

Show inline comments

@@ @@ -858,9 +858,6 @@ static void ViewportAddTownNames(DrawPix @@
+			}
 			break;
 		case ZOOM_LVL_OUT_16X:
 			break;
 		default: NOT_REACHED();
+	}
+}
@@ @@ -931,9 +928,6 @@ static void ViewportAddStationNames(Draw @@
+			}
 			break;
 		case ZOOM_LVL_OUT_16X:
 			break;
 		default: NOT_REACHED();
+	}
+}
@@ @@ -1004,9 +998,6 @@ static void ViewportAddSigns(DrawPixelIn @@
+			}
 			break;
 		case ZOOM_LVL_OUT_16X:
 			break;
 		default: NOT_REACHED();
+	}
+}
@@ @@ -1077,9 +1068,6 @@ static void ViewportAddWaypoints(DrawPix @@
+			}
 			break;
 		case ZOOM_LVL_OUT_16X:
 			break;
 		default: NOT_REACHED();
+	}
+}
@@ @@ -1581,9 +1569,6 @@ static bool CheckClickOnTown(const ViewP @@
+			}
 			break;
 		case ZOOM_LVL_OUT_16X:
 			break;
 		default: NOT_REACHED();
+	}
@@ @@ -1642,9 +1627,6 @@ static bool CheckClickOnStation(const Vi @@
+			}
 			break;
 		case ZOOM_LVL_OUT_16X:
 			break;
 		default: NOT_REACHED();
+	}
@@ @@ -1703,9 +1685,6 @@ static bool CheckClickOnSign(const ViewP @@
+			}
 			break;
 		case ZOOM_LVL_OUT_16X:
 			break;
 		default: NOT_REACHED();
+	}
@@ @@ -1764,9 +1743,6 @@ static bool CheckClickOnWaypoint(const V @@
+			}
 			break;
 		case ZOOM_LVL_OUT_16X:
 			break;
 		default: NOT_REACHED();
+	}

src/zoom.hpp

➞

Show inline comments

@@ @@ -11,7 +11,6 @@ enum ZoomLevel { @@
 	ZOOM_LVL_OUT_2X,
 	ZOOM_LVL_OUT_4X,
 	ZOOM_LVL_OUT_8X,
 	ZOOM_LVL_OUT_16X,
 	ZOOM_LVL_END,
 	/* Here we define in which zoom viewports are */
@@ @@ -28,7 +27,7 @@ enum ZoomLevel { @@
 	ZOOM_LVL_DETAIL   = ZOOM_LVL_OUT_2X, ///< All zoomlevels below or equal to this, will result in details on the screen, like road-work, ...
 	ZOOM_LVL_MIN      = ZOOM_LVL_NORMAL,
-	ZOOM_LVL_MAX      = ZOOM_LVL_OUT_16X,
+	ZOOM_LVL_MAX      = ZOOM_LVL_OUT_8X,
 };
 extern ZoomLevel _saved_scrollpos_zoom;

0 comments (0 inline, 0 general)