mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues
30,661 Commits
23 Branches
218 Tags
624 MiB
Commit Graph

390 Commits (ee45c8ec1d75e67466cf70e9d732eea8841f9c75)

Author SHA1 Message Date
SamuXarick ed51fba7ed Change: Dark Blue company and water were indistinguishable in small map. (#7436) 2019-03-29 19:00:43 +00:00
peter1138 317f69c152 Codechange: Use override specifier in Window-derived classes. 2019-03-24 16:10:04 +01:00
PeterN 87ebfe1227
Fix #7004: Mark linkgraph dirty to be rebuilt on next draw call. (#7265) 
Previously the linkgraph was rebuilt before the viewport extents were finalized.
 2019-02-23 19:19:41 +00:00
Peter Nelson 6733b71300 Change: Make mini-map widget capture mouse when left-click dragging. 
This allows the mini-map to be dragged when the cursor has left the widget.
 2019-02-21 08:11:35 +00:00
Johannes E. Krause f0290d5de7 Codechange: Add InverseRemapCoords2 function for remapping viewport coordinates to underlying tile coordinates (Patch by adf88, #6583) 2019-01-24 21:17:17 +01:00
Peter Nelson 806e7d25dd Change: Use GUITimer class instead of bare int/uints. 2019-01-11 11:56:21 +00:00
Peter Nelson 2a8fa5fef9 Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks. 2019-01-11 11:56:21 +00:00
Charles Pigott f5b1115039 Doc: Lots and lots of doxymentation fixes 2018-10-31 12:35:54 +01:00
Alexander Weiss e1a164b531 Change: [OSX] Setting mouse-wheel to scroll the map does not disable pinch to zoom 2018-05-24 21:31:37 +02:00
PeterN 4cebebcf68
Change: Add CargoTypes type for cargo masks. (#6790) 2018-05-21 22:08:39 +01:00
PeterN cfe6a8ea4f
Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. (#6756) 2018-04-28 22:27:14 +01:00
adf88 74e1fe130c (svn r27905) -Fix [FS#6585]: Keep the "link" between industry chain and smallmap windows whenever possible 2017-08-31 06:48:55 +00:00
frosch b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch e56707bd4e (svn r27622) -Change: In industry map view, give visible industry types the highest tile priority, and hidden industry types a lower one. This way filtered and highlighted industries are not hidden by overlapping tiles in zoomed-out smallmap. (adf88) 2016-07-22 21:44:54 +00:00
frosch a5b7800aca (svn r27621) -Fix (r27620): Committed too early. 2016-07-22 21:38:49 +00:00
frosch ed27cec094 (svn r27620) -Codechange: Inline GetEffectiveTileType (adf88) 2016-07-22 21:29:04 +00:00
michi_cc 2b8bb12d62 (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
frosch 5e47c27550 (svn r27277) -Codechange: Make _displayed_industries a std::bitset. 2015-05-09 09:24:19 +00:00
frosch cfac8dbbc6 (svn r27160) -Fix: Division of signed values by TILE_SIZE requires cast to stay signed. 2015-02-22 14:14:30 +00:00
frosch fc72d3dc8f (svn r27159) -Codechange: Simplify mapping from smallmap to viewport coordinates by duplicating less code. 2015-02-22 14:12:34 +00:00
frosch 06d1d50884 (svn r27158) -Codechange: Simplify mapping from viewport to smallmap coordinates by duplicating less code. 2015-02-22 14:10:44 +00:00
rubidium 1d27ae9bda (svn r27036) -Fix [FS#6148] (r26928): crash when changing smallmap colour when the smallmap window has not been opened yet 2014-10-23 10:50:34 +00:00
rubidium 9627eb6e17 (svn r26929) -Change: accounts for maximum height when filling the height legend of the smallmap 2014-09-27 14:49:37 +00:00
rubidium 0176ef274f (svn r26928) -Change: scale the heightmap colours over the whole range of heights (based on patch by ic111) 2014-09-27 11:17:54 +00:00
rubidium f192045796 (svn r26927) -Codechange: split the heightmap colour tables into their own file in the table folder 2014-09-27 10:43:59 +00:00
rubidium 03b731f929 (svn r26904) -Fix: account for the height level for showing the seen area in the viewport (ic111) 2014-09-21 18:07:54 +00:00
peter1138 e353ef5908 (svn r26858) -Codechange: Rearrange smallmap filter and settings expand/collapse buttons to fix frame borders and allow buttons to fit height of resize button. 2014-09-20 10:23:38 +00:00
rubidium 0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
fonsinchen b158c7d0fa (svn r26266) -Fix [FS#5860]: Update smallmap overlay if player joins different company and make sure company masks are valid 2014-01-19 09:26:56 +00:00
fonsinchen be62387e44 (svn r26265) -Fix: Don't rebuild the link graph overlay cache twice in a row 2014-01-19 09:26:17 +00:00
fonsinchen 014813141d (svn r26228) -Fix: missing variable initialization 2014-01-05 11:28:31 +00:00
rubidium 2618d960e3 (svn r26209) -Codechange: remove some template magic and simplify some code 2014-01-02 22:41:58 +00:00
rubidium 50fdf5e30c (svn r26121) -Codechange: add some asserts after dynamic casts to show they shouldn't return NULL ever 2013-11-26 13:21:25 +00:00
rubidium 78a316d349 (svn r26061) -Fix: negative result of ftell wasn't handled correctly in some cases 2013-11-23 13:17:45 +00:00
frosch 103b6fffbb (svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000) 2013-10-27 15:09:41 +00:00
rubidium f292a87dc4 (svn r25312) -Fix-ish: missing spaces after comma + realignment of tables; quite boring with -x -w 2013-06-01 07:44:53 +00:00
frosch 4e4e635916 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 2013-05-26 19:30:07 +00:00
frosch 8157a8afd8 (svn r25290) -Add: Assign string names to notable windows. 2013-05-26 19:25:01 +00:00
frosch 56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 2013-05-26 19:23:42 +00:00
rubidium 163dfdd34a (svn r25262) -Feature: linkgraph overlay for smallmap 2013-05-19 14:36:35 +00:00
rubidium 52aeef1a79 (svn r25020) -Codechange: refactor SmallMapWindow to make adding map types easier and unduplicate some code (fonsinchen) 2013-02-17 20:51:55 +00:00
rubidium dfdced2239 (svn r25019) -Fix: GCC doesn't seem to care if one does Class::Class::Function (thinks it is a function), whereas MSVC thinks it is the constructor 2013-02-17 20:48:52 +00:00
rubidium 6b68956969 (svn r25018) -Codechange: Move SmallMapWindow declaration to header (fonsinchen) 2013-02-17 20:38:35 +00:00
rubidium a6ae4ea8a2 (svn r24958) -Fix [FS#5458]: refering to non-existent method 2013-02-02 19:52:56 +00:00
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
frosch 3ce8d2ce70 (svn r24846) -Add: Advanced settings to disable certain sound effects. 2012-12-23 21:09:09 +00:00
frosch 03736af2ae (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 2012-11-11 16:10:43 +00:00
frosch 89988c6163 (svn r24534) -Feature: Highlight industries on the smallmap when the mouse is over an entry in the legend. 2012-09-19 22:11:26 +00:00
frosch a4f22a2de1 (svn r24533) -Codechange: Move position determination on minimap legend to separate function. 2012-09-19 22:10:48 +00:00
rubidium 41e5c839e0 (svn r24179) -Codechange: move some variables of Town to TownCache 2012-04-25 20:50:13 +00:00
alberth 4af8c2d5e1 (svn r23704) -Doc: Doxygen comment fixes and additions. 2012-01-01 17:22:32 +00:00
truebrain 1c9bec1999 (svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC) 2011-12-20 17:57:56 +00:00
truebrain 9266bde593 (svn r23546) -Codechange: document and rename widgets to be consistent and understandable 2011-12-16 18:14:11 +00:00
truebrain 2aa774e831 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 2011-12-15 22:22:55 +00:00
peter1138 81598273e9 (svn r23316) -Feature: Add ability to zoom in to 2x and 4x level. 2011-11-24 12:38:48 +00:00
frosch 3eddb9c23f (svn r23049) -Fix [FS#4810]: Use the same forest-check for the vegetation-map colour as for nearby station names. 2011-10-21 19:10:35 +00:00
frosch 83c5f77810 (svn r22433) -Add/Fix: Add constants for the palette colours used in the smallmap and fix some windows palette indices. 2011-05-07 00:22:46 +00:00
frosch c2be206cd9 (svn r22432) -Codechange: Simplify smallmap colour constants using some more specialised macros. 2011-05-07 00:15:46 +00:00
frosch 5e449b8fae (svn r22429) -Add: some constants for specific palette colours used in the GUI. 2011-05-06 21:13:29 +00:00
michi_cc 4b0a2fbe29 (svn r22428) -Codechange: Reduce code duplication in the smallmap legend. 2011-05-06 20:57:02 +00:00
frosch 22286bd7b6 (svn r22421) -Fix: Replace various references to Windows palette greyscale indices with the DOS palette indices. 2011-05-04 17:45:16 +00:00
rubidium 5a620d1c65 (svn r22406) -Document: some more "random-ish" tidbits 2011-05-01 19:51:52 +00:00
frosch ec9540a12a (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 2011-03-13 21:31:29 +00:00
terkhen 4860eff98c (svn r22127) -Fix: Canals would get drawn as land in the smallmap when using the owner window. 2011-02-22 14:23:38 +00:00
frosch 9e1695aa1e (svn r21977) -Codechange: Always cal Window::OnMouseWheel(), independent of viewport scroll/zoom settings. 2011-02-05 16:36:37 +00:00
terkhen ff6aeb8791 (svn r21830) -Fix: Deunionize a union which was not initialized correctly. 2011-01-17 19:40:06 +00:00
terkhen 4d8a93c870 (svn r21813) -Fix [FS#4411](r21720): Prevent crash when displaying the owner view. 2011-01-15 20:23:15 +00:00
terkhen 03088dadda (svn r21733) -Codechange: Clarify the update owner legend code. 
-Fix: Prevent crashes caused by deleted companies.
 2011-01-05 11:04:29 +00:00
terkhen 0b27228d9a (svn r21729) -Fix (r21718, r21720): In some cases clicking on a industry/company legend entry would not work. 2011-01-04 22:56:56 +00:00
terkhen ace917f872 (svn r21726) -Add: Allow to toggle height visualization in the owner view of the smallmap. 2011-01-04 21:03:57 +00:00
terkhen 995e80ba57 (svn r21725) -Cleanup: Remove unused owner code. 2011-01-04 21:03:01 +00:00
terkhen aac2289bf8 (svn r21724) -Change: Do not reset the "Show height" state after closing the smallmap window. 2011-01-04 21:02:10 +00:00
terkhen 38ed740e80 (svn r21723) -Add: Enable/Disable all buttons to the owner view of the smallmap. 2011-01-04 21:01:29 +00:00
terkhen 7e6e7a6737 (svn r21721) -Codechange: Rename the smallmap button panel and its strings. 2011-01-04 20:59:41 +00:00
terkhen b621e4545c (svn r21720) -Feature: Allow to toggle visualization of company property in the owner view of the smallmap. 2011-01-04 20:58:42 +00:00
terkhen 4f1e96acf1 (svn r21719) -Doc: Correct a doxygen comment. 2011-01-04 20:58:07 +00:00
terkhen 2103f7e91a (svn r21718) -Feature: Show a list of companies in the owner legend. 2011-01-04 20:57:11 +00:00
terkhen e4b8a4e3bf (svn r21717) -Codechange: Unify smallmap functions for getting the legend height. 2011-01-04 20:56:00 +00:00
terkhen ebb360f48c (svn r21716) -Add: Tooltip for the industry legend at the smallmap. 2011-01-04 20:54:36 +00:00
terkhen 5268d03abd (svn r21715) -Fix: Use the correct land colour in the owner legend. 2011-01-04 20:53:57 +00:00
alberth f5c6fd1a25 (svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint(). 2010-11-26 15:22:18 +00:00
rubidium 30637a8340 (svn r21157) -Codechange: remove information about the text direction out of the language "list" 2010-11-13 09:56:25 +00:00
alberth c57653e8e3 (svn r20851) -Fix: Smallmap legend buttons must all be equal in size, even if their contents is not. 2010-09-26 11:28:03 +00:00
frosch e9cd81953a (svn r20741) -Cleanup: Use IsTileOnWater() in more places. 2010-09-05 13:18:54 +00:00
rubidium 30f2afac9b (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 2010-08-26 22:01:16 +00:00
alberth 7ad1f5ccef (svn r20415) -Add: Clicking at the smallmap disables updates from the industry chain window. 2010-08-08 11:21:24 +00:00
alberth 2fa665114e (svn r20414) -Feature: Enable industries in the smallmap displayed in the industry chain window. 2010-08-08 11:17:14 +00:00
rubidium 3da3d131c6 (svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable. 2010-08-08 10:59:30 +00:00
alberth abc14d8fbf (svn r20410) -Codechange: Move smallmap map-type switching to a function. 2010-08-08 10:47:09 +00:00
frosch 4bd32799f1 (svn r20286) -Codechange: Unify end of doxygen comments. 2010-08-01 19:44:49 +00:00
frosch ed4f806f1d (svn r20283) -Codechange: Unify start of doygen comments. 2010-08-01 19:22:34 +00:00
rubidium e356cb9405 (svn r20281) -Codechange: unify case scope closure + break coding style 2010-08-01 18:53:30 +00:00
rubidium 0e078670b7 (svn r20145) -Codechange: keep original RMB->tooltip behaviour when hovering is disabled and there is no handled right click event for the widget, i.e. if a widget would handle the right click you won't see the tooltip anymore by right clicking; by enabling hovering you would get access to that tooltip again. 2010-07-14 17:36:27 +00:00
alberth 270b5fdaaf (svn r19821) -Fix (r19816): Minimap displayed a black screen instead of the upper edge of the map (reported by IPG). 2010-05-14 17:49:55 +00:00
rubidium 548dd91ef0 (svn r19816) -Codechange: use static const uint for the unnamed 'tile consts' enum as well 2010-05-13 11:19:30 +00:00
frosch 9ff8032c94 (svn r19770) -Feature: Hide all other industries when ctrl+clicking an industry type in smallmap legend. 2010-05-08 17:33:04 +00:00
alberth 8d1d4267af (svn r19767) -Fix [FS#3808]: Height in smallmap was different from measured heights (ChillCore). 2010-05-07 20:39:00 +00:00
alberth d822b2969b (svn r19766) -Codechange: Store tile height of smallmap contour legend in the LegendAndColour struct. 2010-05-07 20:27:22 +00:00
rubidium d031034789 (svn r19760) -Change: use the {HEIGHT} command for the smallmap legend 2010-05-04 22:12:09 +00:00
frosch 2e90f7f8b9 (svn r19670) -Codechange: Add CeilDiv() and RoundDiv() to simplify integer divisions with rounding. 2010-04-18 14:56:05 +00:00
smatz 941f0c7056 (svn r19580) -Codechange: auto-raise 'Enable/Disable all' buttons in the Smallmap window 2010-04-07 21:24:27 +00:00
terkhen fe0d4253b8 (svn r19523) -Fix: Prevent drawing industries disabled at the smallmap as land tiles when they are built on water. 2010-03-28 15:14:25 +00:00
terkhen 217a98e69b (svn r19521) -Codechange: Use a IndustryType array to sort industries by name instead of a LegendAndColour array. 2010-03-28 12:25:09 +00:00
terkhen 87e7c01343 (svn r19503) -Feature: Sort industries alphabetically at the smallmap legend. 2010-03-23 17:53:33 +00:00
frosch 116a5f56a4 (svn r19481) -Codechange: Turn _industry_counts into a static member of Industry. 2010-03-20 14:30:16 +00:00
peter1138 1025d003b3 (svn r19307) -Add: Let railtypes specify their own smallmap colour. No legend support yet. 2010-03-03 19:07:34 +00:00
alberth dd1c72d39a (svn r19104) -Fix (r19039): Stablize main view centering in smallmap. 2010-02-12 13:46:41 +00:00
alberth 47295bb8b9 (svn r19103) -Codechange: Use px/py for pixel coordinates in PixelToTile(), as promised by the documentation. 2010-02-12 12:14:21 +00:00
alberth 464ad6b951 (svn r19101) -Fix (r19039): Click sound was not played when pressing zoom in/out buttons. 2010-02-12 10:40:29 +00:00
terkhen 52312ea17f (svn r19064) -Feature: Allow to select different land colours for the smallmap (reworked by Alberth). 2010-02-08 23:46:35 +00:00
alberth 76dbdca2f8 (svn r19052) -Codechange: Remove the _smallmap_draw_procs array. 2010-02-07 11:58:35 +00:00
alberth ec436a7615 (svn r19048) -Codechange: Pass the already queried effective tile type to the GetSmallMapPixels routines. 2010-02-06 19:24:51 +00:00
alberth 0e97146d4d (svn r19047) -Codechange: Use GetEffectiveTileType() in all GetSmallMapPixels routines. 2010-02-06 19:22:29 +00:00
alberth 5cd81526d8 (svn r19046) -Codechange: Move retrieval of tile colour data in smallmap. 2010-02-06 19:18:09 +00:00
alberth da2722da36 (svn r19043) -Doc: Dcoumenting the GetSmallMapPixels typedef. 2010-02-06 15:10:12 +00:00
alberth 4cf65e6e81 (svn r19042) -Add: Allow mousewheel zooming in smallmap. 2010-02-06 13:22:04 +00:00
alberth a6e8c747c9 (svn r19041) -Codechange: Improve selection of tile to draw in zoomed-out smallmaps. 2010-02-06 13:19:46 +00:00
alberth 21589daea9 (svn r19040) -Codechange: Introduce inverse function of RemapCoords. 2010-02-06 13:14:40 +00:00
alberth db6e077c8a (svn r19039) -Feature: Add zoom-out to smallmap. 2010-02-06 13:12:59 +00:00
alberth 3f2c4d744a (svn r19026) -Codechange: Move a constant computation out of the loop. 2010-02-06 09:27:04 +00:00
alberth 32db019d9e (svn r19025) -Codechange: Rename DrawSmallMapStuff() to DrawSmallMapColumn(). 2010-02-06 09:25:02 +00:00
frosch 88019e64e1 (svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick(). 2010-01-30 18:34:48 +00:00
alberth 815eede0be (svn r18962) -Fix (r18958, r18961): Code-style, use this explicitly. 2010-01-30 15:29:35 +00:00
alberth cdc6f5ddc1 (svn r18961) -Codechange: Simplifying and unduplicating code in smallmap. 2010-01-30 13:11:26 +00:00
alberth 5c9cb9648b (svn r18958) -Codechange: Merge smallmap remap functions. 2010-01-30 09:54:58 +00:00
alberth ab4072ba8d (svn r18957) -Doc: Documenting the scroll_x, scroll_y, and subscroll variables of SmallMapWindow. 2010-01-30 09:32:48 +00:00
alberth d2fc24d61c (svn r18906) -Codechange: Use start and end column position instead of a mask for drawing a column in the smallmap. 2010-01-23 22:32:30 +00:00
alberth ff11095916 (svn r18827) -Fix: Center main window using smallmap widget edge coordinates. 2010-01-16 15:24:00 +00:00
rubidium 82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +00:00
yexo b378e82676 (svn r18719) -Feature: don't delete the rough/rocky status of a tile when it's covered by snow, this allows rocky tiles under snow if you have a variable snowline 2010-01-04 18:33:43 +00:00
alberth ab26bfd6a0 (svn r18693) -Doc: Add some doxygen comments to smallmap code. 2010-01-02 18:29:51 +00:00
alberth 4801b17837 (svn r18666) -Codechange: Add tooltips to enable/disable all buttons in smallmap. 2009-12-30 17:58:19 +00:00
alberth 0a7fc9e4ea (svn r18665) -Feature [FS#567]: Allow contour-map to be shown with coloured industries in smallmap. 2009-12-30 17:44:38 +00:00
alberth 2ab3e5ab40 (svn r18663) -Codechange (r1): Remove unused _smallmap_vegetation_andor colour masks. 2009-12-30 08:01:54 +00:00
alberth 91872aca48 (svn r18588) -Feature [FS#2943]: Add shading and unshading of windows. 2009-12-21 16:24:29 +00:00
alberth 7c4eaf73a7 (svn r18489) -Codechange: Introduce a custom container widget for a resizing legend bar in the smallmap. 2009-12-13 20:37:32 +00:00
alberth dd12391f10 (svn r18488) -Codechange: Make number of rows for displaying industries in smallmap legend dynamic. 2009-12-13 20:27:53 +00:00
alberth d6aae1a84d (svn r18487) -Codechange: Move row height and column counting to OnInit in the smallmap window as well. 2009-12-13 20:19:08 +00:00
alberth 3cfcae07e2 (svn r18480) -Codechange: Moved column width computation of smallmap legends to OnInit(), added a few doxy comments. 2009-12-13 10:25:37 +00:00
rubidium 5c1fdfdd03 (svn r18389) -Fix: some minor documentation alignment issues 2009-12-03 00:05:51 +00:00
rubidium 736e0c18cc (svn r18332) -Fix: the MSVC compile warnings 2009-11-29 01:00:03 +00:00
rubidium 293dfd7c3e (svn r18322) -Codechange: remove the WDP duplication; no need to tell the same twice. 2009-11-28 14:42:35 +00:00
rubidium 8d6e323ef8 (svn r18280) -Codechange: remove widget indices that are not needed for custom drawing/handling input 2009-11-24 21:13:36 +00:00
rubidium 14300d309c (svn r18277) -Codechange: remove unneeded widget indices for close, resize and sticky boxes and for window captions 2009-11-24 18:05:55 +00:00
rubidium 69b6d9309a (svn r18274) -Codechange: remove the unused WDF flags 2009-11-24 17:28:29 +00:00
alberth 450e40b997 (svn r18230) -Codechange: Allow fill stepsize to be set from Window::UpdateWidgetSize(). 2009-11-22 18:28:14 +00:00
alberth 2b6f792513 (svn r18229) -Codechange: Make fill_x, fill_y a number instead of a bool. 2009-11-22 18:26:01 +00:00
alberth bf93372ca2 (svn r18220) -Codechange: Reduce number of nested widget dynamic casts. 2009-11-22 13:22:53 +00:00
rubidium e9b6e73333 (svn r18211) -Cleanup: remove unneeded tooltip, size and fill 'parameters' from WWT_RESIZEBOX instances 2009-11-22 11:10:17 +00:00
rubidium 5a15fbde11 (svn r18173) -Codechange: make the smallmap RTL aware 2009-11-18 21:18:51 +00:00