mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-06 14:27:16 +00:00
(svn r10093) -Revert: removed 16x zoom-out as it is broken beyond repair
This commit is contained in:
parent
6b101cc177
commit
a391f03ae2
@ -152,7 +152,7 @@ static void StartSound(uint sound, int panning, uint volume)
|
||||
}
|
||||
|
||||
|
||||
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[] = {
|
||||
|
@ -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();
|
||||
|
@ -858,9 +858,6 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi)
|
||||
}
|
||||
break;
|
||||
|
||||
case ZOOM_LVL_OUT_16X:
|
||||
break;
|
||||
|
||||
default: NOT_REACHED();
|
||||
}
|
||||
}
|
||||
@ -931,9 +928,6 @@ static void ViewportAddStationNames(DrawPixelInfo *dpi)
|
||||
}
|
||||
break;
|
||||
|
||||
case ZOOM_LVL_OUT_16X:
|
||||
break;
|
||||
|
||||
default: NOT_REACHED();
|
||||
}
|
||||
}
|
||||
@ -1004,9 +998,6 @@ static void ViewportAddSigns(DrawPixelInfo *dpi)
|
||||
}
|
||||
break;
|
||||
|
||||
case ZOOM_LVL_OUT_16X:
|
||||
break;
|
||||
|
||||
default: NOT_REACHED();
|
||||
}
|
||||
}
|
||||
@ -1077,9 +1068,6 @@ static void ViewportAddWaypoints(DrawPixelInfo *dpi)
|
||||
}
|
||||
break;
|
||||
|
||||
case ZOOM_LVL_OUT_16X:
|
||||
break;
|
||||
|
||||
default: NOT_REACHED();
|
||||
}
|
||||
}
|
||||
@ -1581,9 +1569,6 @@ static bool CheckClickOnTown(const ViewPort *vp, int x, int y)
|
||||
}
|
||||
break;
|
||||
|
||||
case ZOOM_LVL_OUT_16X:
|
||||
break;
|
||||
|
||||
default: NOT_REACHED();
|
||||
}
|
||||
|
||||
@ -1642,9 +1627,6 @@ static bool CheckClickOnStation(const ViewPort *vp, int x, int y)
|
||||
}
|
||||
break;
|
||||
|
||||
case ZOOM_LVL_OUT_16X:
|
||||
break;
|
||||
|
||||
default: NOT_REACHED();
|
||||
}
|
||||
|
||||
@ -1703,9 +1685,6 @@ static bool CheckClickOnSign(const ViewPort *vp, int x, int y)
|
||||
}
|
||||
break;
|
||||
|
||||
case ZOOM_LVL_OUT_16X:
|
||||
break;
|
||||
|
||||
default: NOT_REACHED();
|
||||
}
|
||||
|
||||
@ -1764,9 +1743,6 @@ static bool CheckClickOnWaypoint(const ViewPort *vp, int x, int y)
|
||||
}
|
||||
break;
|
||||
|
||||
case ZOOM_LVL_OUT_16X:
|
||||
break;
|
||||
|
||||
default: NOT_REACHED();
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user