Mercurial > hg > openttd
comparison src/viewport.cpp @ 6853:735550a14c63 draft
(svn r10093) -Revert: removed 16x zoom-out as it is broken beyond repair
author | truelight <truelight@openttd.org> |
---|---|
date | Mon, 11 Jun 2007 11:59:36 +0000 |
parents | 5b13b47b071c |
children | 0005a9ed1903 |
comparison
equal
deleted
inserted
replaced
6852:31184effcea5 | 6853:735550a14c63 |
---|---|
856 AddStringToDraw(t->sign.left + 1, t->sign.top - 3, STR_TOWN_LABEL_TINY_WHITE, t->index, 0); | 856 AddStringToDraw(t->sign.left + 1, t->sign.top - 3, STR_TOWN_LABEL_TINY_WHITE, t->index, 0); |
857 } | 857 } |
858 } | 858 } |
859 break; | 859 break; |
860 | 860 |
861 case ZOOM_LVL_OUT_16X: | |
862 break; | |
863 | |
864 default: NOT_REACHED(); | 861 default: NOT_REACHED(); |
865 } | 862 } |
866 } | 863 } |
867 | 864 |
868 | 865 |
929 AddStation(st, STR_STATION_SIGN_TINY, st->sign.width_2 | 0x8000); | 926 AddStation(st, STR_STATION_SIGN_TINY, st->sign.width_2 | 0x8000); |
930 } | 927 } |
931 } | 928 } |
932 break; | 929 break; |
933 | 930 |
934 case ZOOM_LVL_OUT_16X: | |
935 break; | |
936 | |
937 default: NOT_REACHED(); | 931 default: NOT_REACHED(); |
938 } | 932 } |
939 } | 933 } |
940 | 934 |
941 | 935 |
1002 AddSign(si, STR_2002, si->sign.width_2 | 0x8000); | 996 AddSign(si, STR_2002, si->sign.width_2 | 0x8000); |
1003 } | 997 } |
1004 } | 998 } |
1005 break; | 999 break; |
1006 | 1000 |
1007 case ZOOM_LVL_OUT_16X: | |
1008 break; | |
1009 | |
1010 default: NOT_REACHED(); | 1001 default: NOT_REACHED(); |
1011 } | 1002 } |
1012 } | 1003 } |
1013 | 1004 |
1014 | 1005 |
1073 right > wp->sign.left && | 1064 right > wp->sign.left && |
1074 left < wp->sign.left + ScaleByZoom(wp->sign.width_2, dpi->zoom)) { | 1065 left < wp->sign.left + ScaleByZoom(wp->sign.width_2, dpi->zoom)) { |
1075 AddWaypoint(wp, STR_WAYPOINT_VIEWPORT_TINY, wp->sign.width_2 | 0x8000); | 1066 AddWaypoint(wp, STR_WAYPOINT_VIEWPORT_TINY, wp->sign.width_2 | 0x8000); |
1076 } | 1067 } |
1077 } | 1068 } |
1078 break; | |
1079 | |
1080 case ZOOM_LVL_OUT_16X: | |
1081 break; | 1069 break; |
1082 | 1070 |
1083 default: NOT_REACHED(); | 1071 default: NOT_REACHED(); |
1084 } | 1072 } |
1085 } | 1073 } |
1579 return true; | 1567 return true; |
1580 } | 1568 } |
1581 } | 1569 } |
1582 break; | 1570 break; |
1583 | 1571 |
1584 case ZOOM_LVL_OUT_16X: | |
1585 break; | |
1586 | |
1587 default: NOT_REACHED(); | 1572 default: NOT_REACHED(); |
1588 } | 1573 } |
1589 | 1574 |
1590 return false; | 1575 return false; |
1591 } | 1576 } |
1640 return true; | 1625 return true; |
1641 } | 1626 } |
1642 } | 1627 } |
1643 break; | 1628 break; |
1644 | 1629 |
1645 case ZOOM_LVL_OUT_16X: | |
1646 break; | |
1647 | |
1648 default: NOT_REACHED(); | 1630 default: NOT_REACHED(); |
1649 } | 1631 } |
1650 | 1632 |
1651 return false; | 1633 return false; |
1652 } | 1634 } |
1701 return true; | 1683 return true; |
1702 } | 1684 } |
1703 } | 1685 } |
1704 break; | 1686 break; |
1705 | 1687 |
1706 case ZOOM_LVL_OUT_16X: | |
1707 break; | |
1708 | |
1709 default: NOT_REACHED(); | 1688 default: NOT_REACHED(); |
1710 } | 1689 } |
1711 | 1690 |
1712 return false; | 1691 return false; |
1713 } | 1692 } |
1760 x < wp->sign.left + ScaleByZoom(wp->sign.width_2, vp->zoom)) { | 1739 x < wp->sign.left + ScaleByZoom(wp->sign.width_2, vp->zoom)) { |
1761 ShowRenameWaypointWindow(wp); | 1740 ShowRenameWaypointWindow(wp); |
1762 return true; | 1741 return true; |
1763 } | 1742 } |
1764 } | 1743 } |
1765 break; | |
1766 | |
1767 case ZOOM_LVL_OUT_16X: | |
1768 break; | 1744 break; |
1769 | 1745 |
1770 default: NOT_REACHED(); | 1746 default: NOT_REACHED(); |
1771 } | 1747 } |
1772 | 1748 |