Commit Graph

335 Commits

Author SHA1 Message Date
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
rubidium 5f2ddfbc5a (svn r18152) -Codechange: remove the 'minimum window size' from the WindowDesc; it's determined from the (nested) widgets 2009-11-17 19:16:48 +00:00
rubidium 9396a701fe (svn r18087) -Codechange: remove NWID_LAYERED 2009-11-15 10:30:32 +00:00
rubidium 3d2d7af88f (svn r18086) -Codechange: remove 'widget' from WindowDesc 2009-11-15 10:26:01 +00:00
rubidium 125d369c4e (svn r18083) -Codechange: make the small map GUI nested. 2009-11-14 20:56:25 +00:00
rubidium 517162cc45 (svn r18082) -Codechange: make it visually easier to see where the different legenda 'tables' are split + some typos 2009-11-14 20:34:46 +00:00
rubidium 66e1aafe5b (svn r18080) -Codechange: add some const to the smallmap 2009-11-14 17:47:05 +00:00
rubidium cbf4b80b86 (svn r18030) -Fix: screen jumped a bit for at least SDL and Allegro when right-click-dragging 2009-11-09 16:05:24 +00:00
smatz 18d67f6442 (svn r17881) -Codechange: unify comment style in smallmap_gui.cpp a bit 2009-10-26 20:32:28 +00:00
smatz 5b8863ea57 (svn r17880) -Codechange: pass 'blitter' as parameter instead of determining it again in DrawSmallMapStuff() 2009-10-26 20:26:34 +00:00
rubidium ca0521f89f (svn r17853) -Codechange: remove the 'delta' parameter from OnResize; it was used in ways that aren't always wanted, causing bugs and the like. Also with nested widgets most reasons for handling OnResize have gone. 2009-10-24 14:53:55 +00:00
rubidium 2f41c0411c (svn r17850) -Codechange: remove most usage of delta on OnResize 2009-10-24 09:47:02 +00:00
smatz 79906f7ffe (svn r17835) -Codechange: constify few variables 2009-10-20 22:17:39 +00:00
smatz 396d16e2ec (svn r17832) -Codechange: make Alberth happier 2009-10-20 21:27:44 +00:00
smatz 232d7bc4f4 (svn r17831) -Codechange: move code used for adding map indicators of the smallmap to separate functions 2009-10-20 21:26:56 +00:00
smatz b06da82c62 (svn r17829) -Codechange: move code used for adding vehicles and town names to minimap to separate functions 2009-10-20 20:57:30 +00:00
smatz 30ebe379c7 (svn r17825) -Change: 'animate' the 'center to current position' button in SmallMapWindow when pressed 2009-10-20 19:38:51 +00:00
smatz bfedac1166 (svn r17822) -Codechange: move 'extra viewport' code from smallmap_gui.cpp to viewport_gui.cpp 2009-10-20 18:38:38 +00:00
smatz cfbf57a54f (svn r17821) -Codechange: make more mathods of SmallMapWindow private 2009-10-20 18:15:42 +00:00
smatz 49d0db19a4 (svn r17819) -Codechange: replace magic constant by symbolic constant 2009-10-20 17:36:06 +00:00
rubidium 5028e3536b (svn r17665) -Codechange: make the extra viewport window nested 2009-09-29 20:16:03 +00:00
smatz 114d48e492 (svn r17596) -Codechange: constify some tables 2009-09-20 23:11:01 +00:00
rubidium ca91a97826 (svn r17579) -Fix: remove doxygen docs for removed parameters, or change @param to @tparam if necessary 2009-09-19 15:17:47 +00:00
rubidium 1dc2284e0c (svn r17506) -Fix [FS#3191]: signs partly drawn out of the rectangle in 4/8x zoom out. 2009-09-11 22:21:54 +00:00
smatz ee685c8287 (svn r17316) -Codechange: use Industry::GetByTile() instead of GetIndustryByTile() 2009-08-30 11:47:41 +00:00
rubidium aca7ba714a (svn r17271) -Fix: SetFill sometimes used 1/0 when it should be using true/false 2009-08-23 19:03:09 +00:00
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium 1fe3ad3288 (svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives 2009-08-05 17:59:21 +00:00
rubidium 3fb1506d6d (svn r16765) -Codechange: give ViewportSign's width_1 and width_2 more self explaining names 2009-07-08 08:50:20 +00:00
rubidium 20f73b2f50 (svn r16579) -Codechange: rework smallmap code a bit; remove goto, remove some unneeded variables, return value directly instead of writing it to a variable to later return that 2009-06-16 10:46:11 +00:00
smatz 34f6b8614e (svn r16473) -Fix [FS#2934](r16442): show all non-effect vehicles in the minimap, not only effect vehicles 2009-05-30 20:44:34 +00:00
smatz 5a463c8347 (svn r16442) -Codechange: use new Vehicle accessors at more places 2009-05-26 22:45:48 +00:00
alberth dfbf698392 (svn r16193) -Codechange: Added nested widgets for smallmap and extra viewport windows. 2009-05-01 08:50:07 +00:00
alberth b1de51b8d6 (svn r16192) -Codechange: Moving smallmap and extra viewport widget enums out of the window structs, completing smallmap enum. 2009-05-01 08:48:07 +00:00
rubidium 7dd677ced2 (svn r16162) -Codechange: remove needless TC_ colours from DrawString when they are part of strings and add some colours to a few strings. 2009-04-26 15:26:19 +00:00
rubidium 53887e07bb (svn r16160) -Codechange: remove the need for explicit TC_FROMSTRING for DrawString. 2009-04-26 14:52:56 +00:00
rubidium 59d45a04d6 (svn r16118) -Change/cleanup: remove the hexadecimal 'in TTD the string had this ID' from 'some' strings and replace the string name with something more sensible. 2009-04-21 23:40:56 +00:00
alberth 9d2738b9c4 (svn r15885) -Codechange: Removed new_size parameter of Window::OnResize() callback 2009-03-29 09:49:11 +00:00
rubidium e75e1e62cb (svn r15813) -Codechange: remove the last remnants of the old text drawing API. 2009-03-22 14:55:49 +00:00
smatz af293142fe (svn r15725) -Fix: centering on a vehicle didn't respect its z coordinate 2009-03-15 15:25:18 +00:00
rubidium f9def73be6 (svn r15723) -Codechange: use a constructor for WindowDescs as that makes expanding them much easier (Alberth) 2009-03-15 15:12:06 +00:00
rubidium b25a4f8231 (svn r15718) -Cleanup: apply some comment coding style on the rest of the sources too 2009-03-15 00:32:18 +00:00
rubidium 9d018723b7 (svn r15711) -Codechange: lots of whitespace cleanup/fixes 2009-03-14 18:16:29 +00:00
rubidium b1c105e77e (svn r15598) -Fix [FS#2695]: crash when opening viewport while scrolling the map and the mouse 'lands' on the window decoration of the viewport. 2009-03-02 18:01:33 +00:00
rubidium c0a8d09ca7 (svn r15428) -Codechange: consistently use colour instead of having both color and colour. 2009-02-09 02:57:15 +00:00
smatz 0d3f5e6e74 (svn r15299) -Cleanup: remove many redundant includes 2009-01-31 20:16:06 +00:00
Yexo 01cc5234dc (svn r15201) -Fix [FS#2565] (r15190): The smallmap tried to get the owner of invalid tiles. 2009-01-21 23:49:59 +00:00
rubidium 61f19b6e3e (svn r14946) -Fix: copying a location from the extra viewport to the main viewport did not cancel vehicle following 2009-01-09 23:28:28 +00:00
rubidium cda853872a (svn r14944) -Cleanup: add spaces around some operators 2009-01-09 22:56:28 +00:00
rubidium 13ee151a69 (svn r14567) -Revert (part of 14566): don't commit testing stuff... 2008-11-07 18:02:46 +00:00
rubidium c7f3935506 (svn r14566) -Fix [FS#2397]: RV's go via order would reserve a slot at the 'via' station which it never uses, which makes it unlikely that it reserves a slot for the next station and that makes queueing fail (Aali) 2008-11-07 17:59:51 +00:00
rubidium b650a86e58 (svn r14422) -Codechange: also reflect the changes of r14421 in the filenames. 2008-09-30 20:51:04 +00:00
rubidium 3b798599b6 (svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with. 2008-09-30 20:39:50 +00:00
rubidium 236c613365 (svn r14243) -Fix [FS#2269]: clicking on the smallmap didn't break the "follow vehicle in main viewport". 2008-09-04 19:09:31 +00:00
peter1138 ddd8b73f0a (svn r14000) -Codechange: Missing enum entries kind of defeat the point of the enum 2008-08-05 00:17:56 +00:00
peter1138 a822e259c5 (svn r13987) -Codechange: Resize small map legend dynamically on window resize and when switching small map types, so that the legend is taller only on the industry type and only when the legend will not fit in the available space. 2008-08-04 05:59:28 +00:00