author | rubidium |
Wed, 07 May 2008 21:45:27 +0000 | |
changeset 10457 | ea18877d8eba |
parent 10435 | 0e2b98df9707 |
child 10462 | 416b62f5ee6f |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
10429
1b99254f9607
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
rubidium
parents:
10411
diff
changeset
|
3 |
/** @file smallmap_gui.cpp GUI that shows a small map of the world with metadata like owner or height. */ |
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
1891
92a3b0aa0946
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1815
diff
changeset
|
6 |
#include "openttd.h" |
3234
986c30171e92
(svn r3907) Replace many bridge related direct map accesses with calls to shiny new functions and mark some strange constructs with XXX
tron
parents:
3184
diff
changeset
|
7 |
#include "bridge_map.h" |
3144
426b825578f9
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents:
2989
diff
changeset
|
8 |
#include "clear_map.h" |
3391
c3747f4b259b
(svn r4199) - Codechange: Use industry map accessors to get industry graphics type.
peter1138
parents:
3338
diff
changeset
|
9 |
#include "industry_map.h" |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
10 |
#include "industry.h" |
3338
2c60ed0dcce3
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
11 |
#include "station_map.h" |
6949
72d11a1e1e60
(svn r9609) -Codechange: Move some function prototypes out of functions.h and into landscape.h, and add a few where they didn't exist.
maedhros
parents:
6937
diff
changeset
|
12 |
#include "landscape.h" |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
13 |
#include "gui.h" |
8603
88c5ce6a5215
(svn r11668) -Codechange: more refactoring aimed at reducing compile time and making it more logic where function definitions can be found.
rubidium
parents:
8602
diff
changeset
|
14 |
#include "window_gui.h" |
3144
426b825578f9
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents:
2989
diff
changeset
|
15 |
#include "tree_map.h" |
3180
2123f8062a2d
(svn r3820) Be a bit more strict with types: use special types instead of generic byte and don't fill arbitrary data into inappropriate types
tron
parents:
3144
diff
changeset
|
16 |
#include "tunnel_map.h" |
8720
4e60c30e2006
(svn r11787) -Codechange: more header rewrites. This time related to viewport.h.
rubidium
parents:
8653
diff
changeset
|
17 |
#include "viewport_func.h" |
4e60c30e2006
(svn r11787) -Codechange: more header rewrites. This time related to viewport.h.
rubidium
parents:
8653
diff
changeset
|
18 |
#include "gfx_func.h" |
8750
fdd6054e7bae
(svn r11818) -Codechange: split player.h into smaller pieces.
rubidium
parents:
8720
diff
changeset
|
19 |
#include "player_base.h" |
0 | 20 |
#include "town.h" |
2159
3b634157c3b2
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2062
diff
changeset
|
21 |
#include "variables.h" |
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7374
diff
changeset
|
22 |
#include "blitter/factory.hpp" |
8579
3efbb430092e
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
8578
diff
changeset
|
23 |
#include "tunnelbridge_map.h" |
8610
17cc343a23dd
(svn r11675) -Codechange: split the string types from the string functions.
rubidium
parents:
8604
diff
changeset
|
24 |
#include "strings_func.h" |
8619
c2434269c3eb
(svn r11684) -Codechange: split gfx.h in a type and functional header.
rubidium
parents:
8617
diff
changeset
|
25 |
#include "zoom_func.h" |
8628
4e316518420a
(svn r11694) -Codechange: move more endianness related stuff to endian_func.hpp.
rubidium
parents:
8627
diff
changeset
|
26 |
#include "core/endian_func.hpp" |
8640
1e93b81e96d2
(svn r11706) -Codechange: split vehicle.h and remove another bunch of useless includes.
rubidium
parents:
8635
diff
changeset
|
27 |
#include "vehicle_base.h" |
8653
a83f7a536919
(svn r11719) -Codechange: split sound.h in a header with types and one with functions.
rubidium
parents:
8640
diff
changeset
|
28 |
#include "sound_func.h" |
8766
c86cfa3a7580
(svn r11834) -Codechange: only include settings_type.h if needed.
rubidium
parents:
8760
diff
changeset
|
29 |
#include "settings_type.h" |
10435
0e2b98df9707
(svn r12977) -Codechange: remove quite some redundant (duplicate) function declarations.
rubidium
parents:
10434
diff
changeset
|
30 |
#include "window_func.h" |
8579
3efbb430092e
(svn r11644) -Codechange: merge some functions from tunnel_map.h and bridge_map.h into tunnelbridge_map.h
smatz
parents:
8578
diff
changeset
|
31 |
|
8760
ce0891c412ce
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8750
diff
changeset
|
32 |
#include "table/strings.h" |
ce0891c412ce
(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.
rubidium
parents:
8750
diff
changeset
|
33 |
#include "table/sprites.h" |
0 | 34 |
|
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
35 |
static const Widget _smallmap_widgets[] = { |
2725
5c632bc5be28
(svn r3270) Correct all (mis)uses of WWT_CLOSEBOX / WWT_TEXTBTN to reflect their actual use, and add "Close Window" tooltip where missing.
peter1138
parents:
2635
diff
changeset
|
36 |
{ WWT_CLOSEBOX, RESIZE_NONE, 13, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
7841
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
37 |
{ WWT_CAPTION, RESIZE_RIGHT, 13, 11, 337, 0, 13, STR_00B0_MAP, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
38 |
{ WWT_STICKYBOX, RESIZE_LR, 13, 338, 349, 0, 13, 0x0, STR_STICKY_BUTTON}, |
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
39 |
{ WWT_PANEL, RESIZE_RB, 13, 0, 349, 14, 157, 0x0, STR_NULL}, |
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
40 |
{ WWT_INSET, RESIZE_RB, 13, 2, 347, 16, 155, 0x0, STR_NULL}, |
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
41 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 284, 305, 158, 179, SPR_IMG_SHOW_COUNTOURS, STR_0191_SHOW_LAND_CONTOURS_ON_MAP}, |
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
42 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 306, 327, 158, 179, SPR_IMG_SHOW_VEHICLES, STR_0192_SHOW_VEHICLES_ON_MAP}, |
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
43 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 328, 349, 158, 179, SPR_IMG_INDUSTRY, STR_0193_SHOW_INDUSTRIES_ON_MAP}, |
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
44 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 284, 307, 180, 201, SPR_IMG_SHOW_ROUTES, STR_0194_SHOW_TRANSPORT_ROUTES_ON}, |
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
45 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 306, 327, 180, 201, SPR_IMG_PLANTTREES, STR_0195_SHOW_VEGETATION_ON_MAP}, |
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
46 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 328, 349, 180, 201, SPR_IMG_COMPANY_GENERAL, STR_0196_SHOW_LAND_OWNERS_ON_MAP}, |
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
47 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 262, 283, 158, 179, SPR_IMG_SMALLMAP, STR_SMALLMAP_CENTER}, |
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
48 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 262, 283, 180, 201, SPR_IMG_TOWN, STR_0197_TOGGLE_TOWN_NAMES_ON_OFF}, |
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
49 |
{ WWT_PANEL, RESIZE_RTB, 13, 0, 261, 158, 201, 0x0, STR_NULL}, |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
50 |
{ WWT_PANEL, RESIZE_LRTB, 13, 262, 349, 202, 202, 0x0, STR_NULL}, |
7841
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
51 |
{ WWT_PANEL, RESIZE_RTB, 13, 0, 337, 202, 213, 0x0, STR_NULL}, |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
52 |
{ WWT_TEXTBTN, RESIZE_TB, 13, 0, 99, 202, 213, STR_MESSAGES_ENABLE_ALL, STR_NULL}, |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
53 |
{ WWT_TEXTBTN, RESIZE_TB, 13, 100, 201, 202, 213, STR_MESSAGES_DISABLE_ALL,STR_NULL}, |
7841
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
54 |
{ WWT_RESIZEBOX, RESIZE_LRTB, 13, 338, 349, 202, 213, 0x0, STR_RESIZE_BUTTON}, |
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
55 |
{ WIDGETS_END}, |
0 | 56 |
}; |
57 |
||
58 |
static int _smallmap_type; |
|
59 |
static bool _smallmap_show_towns = true; |
|
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
60 |
/* number of used industries */ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
61 |
static int _smallmap_industry_count; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
62 |
/* number of industries per column*/ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
63 |
static uint _industries_per_column; |
0 | 64 |
|
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
65 |
/** Macro for ordinary entry of LegendAndColor */ |
8429
106d74abf37a
(svn r11486) -Fix [FS#1457]: industry count was wrong in smallmap
glx
parents:
8417
diff
changeset
|
66 |
#define MK(a,b) {a, b, INVALID_INDUSTRYTYPE, true, false, false} |
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
67 |
/** Macro for end of list marker in arrays of LegendAndColor */ |
8429
106d74abf37a
(svn r11486) -Fix [FS#1457]: industry count was wrong in smallmap
glx
parents:
8417
diff
changeset
|
68 |
#define MKEND() {0, STR_NULL, INVALID_INDUSTRYTYPE, true, true, false} |
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
69 |
/** Macro for break marker in arrays of LegendAndColor. |
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
70 |
* It will have valid data, though */ |
8429
106d74abf37a
(svn r11486) -Fix [FS#1457]: industry count was wrong in smallmap
glx
parents:
8417
diff
changeset
|
71 |
#define MS(a,b) {a, b, INVALID_INDUSTRYTYPE, true, false, true} |
0 | 72 |
|
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
73 |
/** Structure for holding relevant data for legends in small map */ |
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
74 |
struct LegendAndColour { |
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
75 |
uint16 colour; ///< color of the item on the map |
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
76 |
StringID legend; ///< string corresponding to the colored item |
8429
106d74abf37a
(svn r11486) -Fix [FS#1457]: industry count was wrong in smallmap
glx
parents:
8417
diff
changeset
|
77 |
IndustryType type; ///< type of industry |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
78 |
bool show_on_map; ///< for filtering industries, if true is shown on map in color |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
79 |
bool end; ///< this is the end of the list |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
80 |
bool col_break; ///< perform a break and go one collumn further |
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
81 |
}; |
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
82 |
|
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
83 |
/** Legend text giving the colours to look for on the minimap */ |
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
84 |
static const LegendAndColour _legend_land_contours[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
85 |
MK(0x5A, STR_00F0_100M), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
86 |
MK(0x5C, STR_00F1_200M), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
87 |
MK(0x5E, STR_00F2_300M), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
88 |
MK(0x1F, STR_00F3_400M), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
89 |
MK(0x27, STR_00F4_500M), |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
90 |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
91 |
MS(0xD7, STR_00EB_ROADS), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
92 |
MK(0x0A, STR_00EC_RAILROADS), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
93 |
MK(0x98, STR_00ED_STATIONS_AIRPORTS_DOCKS), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
94 |
MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
95 |
MK(0x0F, STR_00EF_VEHICLES), |
0 | 96 |
MKEND() |
97 |
}; |
|
98 |
||
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
99 |
static const LegendAndColour _legend_vehicles[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
100 |
MK(0xB8, STR_00F5_TRAINS), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
101 |
MK(0xBF, STR_00F6_ROAD_VEHICLES), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
102 |
MK(0x98, STR_00F7_SHIPS), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
103 |
MK(0x0F, STR_00F8_AIRCRAFT), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
104 |
MS(0xD7, STR_00F9_TRANSPORT_ROUTES), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
105 |
MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES), |
0 | 106 |
MKEND() |
107 |
}; |
|
108 |
||
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
109 |
static const LegendAndColour _legend_routes[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
110 |
MK(0xD7, STR_00EB_ROADS), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
111 |
MK(0x0A, STR_00EC_RAILROADS), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
112 |
MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
113 |
MS(0x56, STR_011B_RAILROAD_STATION), |
0 | 114 |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
115 |
MK(0xC2, STR_011C_TRUCK_LOADING_BAY), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
116 |
MK(0xBF, STR_011D_BUS_STATION), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
117 |
MK(0xB8, STR_011E_AIRPORT_HELIPORT), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
118 |
MK(0x98, STR_011F_DOCK), |
0 | 119 |
MKEND() |
120 |
}; |
|
121 |
||
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
122 |
static const LegendAndColour _legend_vegetation[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
123 |
MK(0x52, STR_0120_ROUGH_LAND), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
124 |
MK(0x54, STR_0121_GRASS_LAND), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
125 |
MK(0x37, STR_0122_BARE_LAND), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
126 |
MK(0x25, STR_0123_FIELDS), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
127 |
MK(0x57, STR_0124_TREES), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
128 |
MK(0xD0, STR_00FC_FOREST), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
129 |
MS(0x0A, STR_0125_ROCKS), |
0 | 130 |
|
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
131 |
MK(0xC2, STR_012A_DESERT), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
132 |
MK(0x98, STR_012B_SNOW), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
133 |
MK(0xD7, STR_00F9_TRANSPORT_ROUTES), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
134 |
MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES), |
0 | 135 |
MKEND() |
136 |
}; |
|
137 |
||
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
138 |
static const LegendAndColour _legend_land_owners[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
139 |
MK(0xCA, STR_0126_WATER), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
140 |
MK(0x54, STR_0127_NO_OWNER), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
141 |
MK(0xB4, STR_0128_TOWNS), |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
142 |
MK(0x20, STR_0129_INDUSTRIES), |
0 | 143 |
MKEND() |
144 |
}; |
|
145 |
#undef MK |
|
146 |
#undef MS |
|
147 |
#undef MKEND |
|
148 |
||
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
149 |
/** Allow room for all industries, plus a terminator entry |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
150 |
* This is required in order to have the indutry slots all filled up */ |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
151 |
static LegendAndColour _legend_from_industries[NUM_INDUSTRYTYPES+1]; |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
152 |
/* For connecting industry type to position in industries list(small map legend) */ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
153 |
static uint _industry_to_list_pos[NUM_INDUSTRYTYPES]; |
0 | 154 |
|
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
155 |
/** |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
156 |
* Fills an array for the industries legends. |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
157 |
*/ |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
158 |
void BuildIndustriesLegend() |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
159 |
{ |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
160 |
const IndustrySpec *indsp; |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
161 |
uint j = 0; |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
162 |
uint free_slot, diff; |
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
163 |
|
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
164 |
/* Add each name */ |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
165 |
for (IndustryType i = 0; i < NUM_INDUSTRYTYPES; i++) { |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
166 |
indsp = GetIndustrySpec(i); |
7244
7baac45a972c
(svn r9983) -Codechange: Use the "enabled" property of the industry spec.
belugas
parents:
7226
diff
changeset
|
167 |
if (indsp->enabled) { |
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
168 |
_legend_from_industries[j].legend = indsp->name; |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
169 |
_legend_from_industries[j].colour = indsp->map_colour; |
8429
106d74abf37a
(svn r11486) -Fix [FS#1457]: industry count was wrong in smallmap
glx
parents:
8417
diff
changeset
|
170 |
_legend_from_industries[j].type = i; |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
171 |
_legend_from_industries[j].show_on_map = true; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
172 |
_legend_from_industries[j].col_break = false; |
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
173 |
_legend_from_industries[j].end = false; |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
174 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
175 |
/* Store widget number for this industry type */ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
176 |
_industry_to_list_pos[i] = j; |
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
177 |
j++; |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
178 |
} |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
179 |
} |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
180 |
/* Terminate the list */ |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
181 |
_legend_from_industries[j].end = true; |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
182 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
183 |
/* Store number of enabled industries */ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
184 |
_smallmap_industry_count = j; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
185 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
186 |
_industries_per_column = _smallmap_industry_count / 3; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
187 |
free_slot = _smallmap_industry_count % 3; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
188 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
189 |
/* recalculate column break for first two columns(i) */ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
190 |
diff = 0; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
191 |
for (int i = 1; i <= 2; i++) { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
192 |
if (free_slot > 0) diff = diff + 1; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
193 |
_legend_from_industries[i * _industries_per_column + diff].col_break = true; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
194 |
if (free_slot > 0) free_slot--; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
195 |
} |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
196 |
|
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
197 |
} |
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
198 |
|
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
199 |
static const LegendAndColour * const _legend_table[] = { |
0 | 200 |
_legend_land_contours, |
201 |
_legend_vehicles, |
|
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
202 |
_legend_from_industries, |
0 | 203 |
_legend_routes, |
204 |
_legend_vegetation, |
|
205 |
_legend_land_owners, |
|
206 |
}; |
|
207 |
||
2984
225bffc79071
(svn r3559) - CodeChange: simplify MKCOLOR(x) macro for smallmap_gui.c by adding a TO_LE32X() macro next to TO_BE32X(). The 'X' signifies them as macros and not-inline functions so they can be used in variable declarations.
Darkvater
parents:
2981
diff
changeset
|
208 |
#define MKCOLOR(x) TO_LE32X(x) |
0 | 209 |
|
7809
40156c450f13
(svn r10665) -Codechange: replace magic 15 with MAX_TILE_HEIGHT (bilbo)
truelight
parents:
7762
diff
changeset
|
210 |
/** |
40156c450f13
(svn r10665) -Codechange: replace magic 15 with MAX_TILE_HEIGHT (bilbo)
truelight
parents:
7762
diff
changeset
|
211 |
* Height encodings; MAX_TILE_HEIGHT + 1 levels, from 0 to MAX_TILE_HEIGHT |
40156c450f13
(svn r10665) -Codechange: replace magic 15 with MAX_TILE_HEIGHT (bilbo)
truelight
parents:
7762
diff
changeset
|
212 |
*/ |
40156c450f13
(svn r10665) -Codechange: replace magic 15 with MAX_TILE_HEIGHT (bilbo)
truelight
parents:
7762
diff
changeset
|
213 |
static const uint32 _map_height_bits[] = { |
0 | 214 |
MKCOLOR(0x5A5A5A5A), |
215 |
MKCOLOR(0x5A5B5A5B), |
|
216 |
MKCOLOR(0x5B5B5B5B), |
|
217 |
MKCOLOR(0x5B5C5B5C), |
|
218 |
MKCOLOR(0x5C5C5C5C), |
|
219 |
MKCOLOR(0x5C5D5C5D), |
|
220 |
MKCOLOR(0x5D5D5D5D), |
|
221 |
MKCOLOR(0x5D5E5D5E), |
|
222 |
MKCOLOR(0x5E5E5E5E), |
|
223 |
MKCOLOR(0x5E5F5E5F), |
|
224 |
MKCOLOR(0x5F5F5F5F), |
|
225 |
MKCOLOR(0x5F1F5F1F), |
|
226 |
MKCOLOR(0x1F1F1F1F), |
|
227 |
MKCOLOR(0x1F271F27), |
|
228 |
MKCOLOR(0x27272727), |
|
229 |
MKCOLOR(0x27272727), |
|
230 |
}; |
|
7809
40156c450f13
(svn r10665) -Codechange: replace magic 15 with MAX_TILE_HEIGHT (bilbo)
truelight
parents:
7762
diff
changeset
|
231 |
assert_compile(lengthof(_map_height_bits) == MAX_TILE_HEIGHT + 1); |
0 | 232 |
|
6574
e1d1a12faaf7
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6573
diff
changeset
|
233 |
struct AndOr { |
1511
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
234 |
uint32 mor; |
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
235 |
uint32 mand; |
6574
e1d1a12faaf7
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6573
diff
changeset
|
236 |
}; |
1511
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
237 |
|
4171 | 238 |
static inline uint32 ApplyMask(uint32 colour, const AndOr *mask) |
1511
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
239 |
{ |
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
240 |
return (colour & mask->mand) | mask->mor; |
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
241 |
} |
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
242 |
|
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
243 |
|
1511
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
244 |
static const AndOr _smallmap_contours_andor[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
245 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
246 |
{MKCOLOR(0x000A0A00), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
247 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
248 |
{MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
249 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
250 |
{MKCOLOR(0x98989898), MKCOLOR(0x00000000)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
251 |
{MKCOLOR(0xCACACACA), MKCOLOR(0x00000000)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
252 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
253 |
{MKCOLOR(0xB5B5B5B5), MKCOLOR(0x00000000)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
254 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
255 |
{MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
256 |
{MKCOLOR(0x000A0A00), MKCOLOR(0xFF0000FF)}, |
0 | 257 |
}; |
258 |
||
1511
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
259 |
static const AndOr _smallmap_vehicles_andor[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
260 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
261 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
262 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
263 |
{MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
264 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
265 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
266 |
{MKCOLOR(0xCACACACA), MKCOLOR(0x00000000)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
267 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
268 |
{MKCOLOR(0xB5B5B5B5), MKCOLOR(0x00000000)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
269 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
270 |
{MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
271 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
0 | 272 |
}; |
273 |
||
1511
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
274 |
static const AndOr _smallmap_vegetation_andor[] = { |
4344
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
275 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
276 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
277 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
278 |
{MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
279 |
{MKCOLOR(0x00575700), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
280 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
281 |
{MKCOLOR(0xCACACACA), MKCOLOR(0x00000000)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
282 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
283 |
{MKCOLOR(0xB5B5B5B5), MKCOLOR(0x00000000)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
284 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
285 |
{MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)}, |
5d0e40cd67b9
(svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct.
rubidium
parents:
4339
diff
changeset
|
286 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
0 | 287 |
}; |
288 |
||
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
289 |
typedef uint32 GetSmallMapPixels(TileIndex tile); // typedef callthrough function |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
290 |
|
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
291 |
/** |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
292 |
* Draws one column of the small map in a certain mode onto the screen buffer. This |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
293 |
* function looks exactly the same for all types |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
294 |
* |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
295 |
* @param dst Pointer to a part of the screen buffer to write to. |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
296 |
* @param xc The X coordinate of the first tile in the column. |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
297 |
* @param yc The Y coordinate of the first tile in the column |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
298 |
* @param pitch Number of pixels to advance in the screen buffer each time a pixel is written. |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
299 |
* @param reps Number of lines to draw |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
300 |
* @param mask ? |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
301 |
* @param proc Pointer to the colour function |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
302 |
* @see GetSmallMapPixels(TileIndex) |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
303 |
*/ |
7374
54c06f06ecc8
(svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents:
7253
diff
changeset
|
304 |
static void DrawSmallMapStuff(void *dst, uint xc, uint yc, int pitch, int reps, uint32 mask, GetSmallMapPixels *proc) |
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
305 |
{ |
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7374
diff
changeset
|
306 |
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); |
7985
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
307 |
void *dst_ptr_abs_end = blitter->MoveTo(_screen.dst_ptr, 0, _screen.height); |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
308 |
void *dst_ptr_end = blitter->MoveTo(dst_ptr_abs_end, -4, 0); |
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
309 |
|
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
310 |
do { |
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
311 |
/* check if the tile (xc,yc) is within the map range */ |
1919
0ad642b26ff2
(svn r2425) - Fix (regression): wrong sprite for level-land cursor (thx Tron)
Darkvater
parents:
1918
diff
changeset
|
312 |
if (xc < MapMaxX() && yc < MapMaxY()) { |
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
313 |
/* check if the dst pointer points to a pixel inside the screen buffer */ |
7985
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
314 |
if (dst < _screen.dst_ptr) continue; |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
315 |
if (dst >= dst_ptr_abs_end) continue; |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
316 |
|
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
317 |
uint32 val = proc(TileXY(xc, yc)) & mask; |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
318 |
uint8 *val8 = (uint8 *)&val; |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
319 |
|
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
320 |
if (dst <= dst_ptr_end) { |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
321 |
blitter->SetPixelIfEmpty(dst, 0, 0, val8[0]); |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
322 |
blitter->SetPixelIfEmpty(dst, 1, 0, val8[1]); |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
323 |
blitter->SetPixelIfEmpty(dst, 2, 0, val8[2]); |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
324 |
blitter->SetPixelIfEmpty(dst, 3, 0, val8[3]); |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
325 |
} else { |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
326 |
/* It happens that there are only 1, 2 or 3 pixels left to fill, so in that special case, write till the end of the video-buffer */ |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
327 |
int i = 0; |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
328 |
do { |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
329 |
blitter->SetPixelIfEmpty(dst, 0, 0, val8[i]); |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
330 |
} while (i++, dst = blitter->MoveTo(dst, 1, 0), dst < dst_ptr_abs_end); |
c7b966f7592e
(svn r11000) -Fix r10121: when introducing the new blitter system, smallmap regained an old bug: buffer-overflow when moving window to far bottom-right.
truelight
parents:
7866
diff
changeset
|
331 |
} |
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
332 |
} |
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
333 |
/* switch to next tile in the column */ |
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7374
diff
changeset
|
334 |
} while (xc++, yc++, dst = blitter->MoveTo(dst, pitch, 0), --reps != 0); |
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
335 |
} |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
336 |
|
1516
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
337 |
|
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
338 |
static inline TileType GetEffectiveTileType(TileIndex tile) |
0 | 339 |
{ |
1516
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
340 |
TileType t = GetTileType(tile); |
0 | 341 |
|
342 |
if (t == MP_TUNNELBRIDGE) { |
|
8584
a8b6dffead63
(svn r11649) -Codechange: some code can be simplified thanks to changes in r11642
smatz
parents:
8579
diff
changeset
|
343 |
TransportType tt = GetTunnelBridgeTransportType(tile); |
3180
2123f8062a2d
(svn r3820) Be a bit more strict with types: use special types instead of generic byte and don't fill arbitrary data into inappropriate types
tron
parents:
3144
diff
changeset
|
344 |
|
2123f8062a2d
(svn r3820) Be a bit more strict with types: use special types instead of generic byte and don't fill arbitrary data into inappropriate types
tron
parents:
3144
diff
changeset
|
345 |
switch (tt) { |
2123f8062a2d
(svn r3820) Be a bit more strict with types: use special types instead of generic byte and don't fill arbitrary data into inappropriate types
tron
parents:
3144
diff
changeset
|
346 |
case TRANSPORT_RAIL: t = MP_RAILWAY; break; |
7866
e19fda04e8d3
(svn r10733) -Codechange: change MP_STREET into MP_ROAD as we use the word "road" everywhere except in the tile type.
rubidium
parents:
7865
diff
changeset
|
347 |
case TRANSPORT_ROAD: t = MP_ROAD; break; |
3180
2123f8062a2d
(svn r3820) Be a bit more strict with types: use special types instead of generic byte and don't fill arbitrary data into inappropriate types
tron
parents:
3144
diff
changeset
|
348 |
default: t = MP_WATER; break; |
0 | 349 |
} |
350 |
} |
|
1516
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
351 |
return t; |
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
352 |
} |
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
353 |
|
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
354 |
/** |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
355 |
* Return the color a tile would be displayed with in the small map in mode "Contour". |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
356 |
* @param tile The tile of which we would like to get the color. |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
357 |
* @return The color of tile in the small map in mode "Contour" |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
358 |
*/ |
1516
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
359 |
static inline uint32 GetSmallMapContoursPixels(TileIndex tile) |
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
360 |
{ |
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
361 |
TileType t = GetEffectiveTileType(tile); |
0 | 362 |
|
1511
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
363 |
return |
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
364 |
ApplyMask(_map_height_bits[TileHeight(tile)], &_smallmap_contours_andor[t]); |
0 | 365 |
} |
366 |
||
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
367 |
/** |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
368 |
* Return the color a tile would be displayed with in the small map in mode "Vehicles". |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
369 |
* |
6979
d194d25020e7
(svn r9664) -Documentation: Doxygen corrections,errors and omissions
belugas
parents:
6972
diff
changeset
|
370 |
* @param tile The tile of which we would like to get the color. |
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
371 |
* @return The color of tile in the small map in mode "Vehicles" |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
372 |
*/ |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
373 |
static inline uint32 GetSmallMapVehiclesPixels(TileIndex tile) |
0 | 374 |
{ |
1516
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
375 |
TileType t = GetEffectiveTileType(tile); |
0 | 376 |
|
1511
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
377 |
return ApplyMask(MKCOLOR(0x54545454), &_smallmap_vehicles_andor[t]); |
0 | 378 |
} |
379 |
||
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
380 |
/** |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
381 |
* Return the color a tile would be displayed with in the small map in mode "Industries". |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
382 |
* |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
383 |
* @param tile The tile of which we would like to get the color. |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
384 |
* @return The color of tile in the small map in mode "Industries" |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
385 |
*/ |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
386 |
static inline uint32 GetSmallMapIndustriesPixels(TileIndex tile) |
0 | 387 |
{ |
1516
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
388 |
TileType t = GetEffectiveTileType(tile); |
0 | 389 |
|
390 |
if (t == MP_INDUSTRY) { |
|
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
391 |
/* If industry is allowed to be seen, use its color on the map */ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
392 |
if (_legend_from_industries[_industry_to_list_pos[GetIndustryByTile(tile)->type]].show_on_map) { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
393 |
return GetIndustrySpec(GetIndustryByTile(tile)->type)->map_colour * 0x01010101; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
394 |
} else { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
395 |
/* otherwise, return the color of the clear tiles, which will make it disappear */ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
396 |
return ApplyMask(MKCOLOR(0x54545454), &_smallmap_vehicles_andor[MP_CLEAR]); |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
397 |
} |
0 | 398 |
} |
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
399 |
|
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
400 |
return ApplyMask(MKCOLOR(0x54545454), &_smallmap_vehicles_andor[t]); |
0 | 401 |
} |
402 |
||
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
403 |
/** |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
404 |
* Return the color a tile would be displayed with in the small map in mode "Routes". |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
405 |
* |
6979
d194d25020e7
(svn r9664) -Documentation: Doxygen corrections,errors and omissions
belugas
parents:
6972
diff
changeset
|
406 |
* @param tile The tile of which we would like to get the color. |
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
407 |
* @return The color of tile in the small map in mode "Routes" |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
408 |
*/ |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
409 |
static inline uint32 GetSmallMapRoutesPixels(TileIndex tile) |
0 | 410 |
{ |
1516
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
411 |
TileType t = GetEffectiveTileType(tile); |
0 | 412 |
uint32 bits; |
413 |
||
414 |
if (t == MP_STATION) { |
|
3338
2c60ed0dcce3
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
415 |
switch (GetStationType(tile)) { |
2c60ed0dcce3
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
416 |
case STATION_RAIL: bits = MKCOLOR(0x56565656); break; |
2c60ed0dcce3
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
417 |
case STATION_AIRPORT: bits = MKCOLOR(0xB8B8B8B8); break; |
2c60ed0dcce3
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
418 |
case STATION_TRUCK: bits = MKCOLOR(0xC2C2C2C2); break; |
2c60ed0dcce3
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
419 |
case STATION_BUS: bits = MKCOLOR(0xBFBFBFBF); break; |
2c60ed0dcce3
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
420 |
case STATION_DOCK: bits = MKCOLOR(0x98989898); break; |
2c60ed0dcce3
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
421 |
default: bits = MKCOLOR(0xFFFFFFFF); break; |
2c60ed0dcce3
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
422 |
} |
0 | 423 |
} else { |
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
424 |
/* ground color */ |
1511
32b095e3da76
(svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit
tron
parents:
1350
diff
changeset
|
425 |
bits = ApplyMask(MKCOLOR(0x54545454), &_smallmap_contours_andor[t]); |
0 | 426 |
} |
427 |
return bits; |
|
428 |
} |
|
429 |
||
430 |
||
2955
27221592ebbc
(svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors.
tron
parents:
2952
diff
changeset
|
431 |
static const uint32 _vegetation_clear_bits[] = { |
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
432 |
MKCOLOR(0x54545454), ///< full grass |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
433 |
MKCOLOR(0x52525252), ///< rough land |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
434 |
MKCOLOR(0x0A0A0A0A), ///< rocks |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
435 |
MKCOLOR(0x25252525), ///< fields |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
436 |
MKCOLOR(0x98989898), ///< snow |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
437 |
MKCOLOR(0xC2C2C2C2), ///< desert |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
438 |
MKCOLOR(0x54545454), ///< unused |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
439 |
MKCOLOR(0x54545454), ///< unused |
0 | 440 |
}; |
441 |
||
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
442 |
static inline uint32 GetSmallMapVegetationPixels(TileIndex tile) |
0 | 443 |
{ |
1516
997a23b8b16c
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
444 |
TileType t = GetEffectiveTileType(tile); |
0 | 445 |
uint32 bits; |
446 |
||
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
447 |
switch (t) { |
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
448 |
case MP_CLEAR: |
3447 | 449 |
if (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) < 3) { |
2955
27221592ebbc
(svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors.
tron
parents:
2952
diff
changeset
|
450 |
bits = MKCOLOR(0x37373737); |
27221592ebbc
(svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors.
tron
parents:
2952
diff
changeset
|
451 |
} else { |
27221592ebbc
(svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors.
tron
parents:
2952
diff
changeset
|
452 |
bits = _vegetation_clear_bits[GetClearGround(tile)]; |
27221592ebbc
(svn r3514) -Codechange: Replace direct fiddling of bits for the ground type and density of clear tiles with symbolic names and accessors.
tron
parents:
2952
diff
changeset
|
453 |
} |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
454 |
break; |
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
455 |
|
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
456 |
case MP_INDUSTRY: |
7253
18dca03d0c67
(svn r9992) -Codechange: Remove some hardcoded references to Industry IDs.
belugas
parents:
7244
diff
changeset
|
457 |
bits = GetIndustrySpec(GetIndustryByTile(tile)->type)->check_proc == CHECK_FOREST ? MKCOLOR(0xD0D0D0D0) : MKCOLOR(0xB5B5B5B5); |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
458 |
break; |
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
459 |
|
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
460 |
case MP_TREES: |
3441
d1cef7047cd4
(svn r4271) s/\<TR_/TREE_/ resp. s/\<TR_/TREE_GROUND/
tron
parents:
3421
diff
changeset
|
461 |
if (GetTreeGround(tile) == TREE_GROUND_SNOW_DESERT) { |
6683
7ec558346172
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6585
diff
changeset
|
462 |
bits = (_opt.landscape == LT_ARCTIC) ? MKCOLOR(0x98575798) : MKCOLOR(0xC25757C2); |
2951 | 463 |
} else { |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
464 |
bits = MKCOLOR(0x54575754); |
2951 | 465 |
} |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
466 |
break; |
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
467 |
|
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
468 |
default: |
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
469 |
bits = ApplyMask(MKCOLOR(0x54545454), &_smallmap_vehicles_andor[t]); |
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
470 |
break; |
0 | 471 |
} |
472 |
||
473 |
return bits; |
|
474 |
} |
|
475 |
||
476 |
||
4846
a6c472d934c0
(svn r6772) -Codechange: Do not abuse OWNER_SPECTATOR as the "owner" of the industry for
Darkvater
parents:
4727
diff
changeset
|
477 |
static uint32 _owner_colors[OWNER_END + 1]; |
0 | 478 |
|
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
479 |
/** |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
480 |
* Return the color a tile would be displayed with in the small map in mode "Owner". |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
481 |
* |
6979
d194d25020e7
(svn r9664) -Documentation: Doxygen corrections,errors and omissions
belugas
parents:
6972
diff
changeset
|
482 |
* @param tile The tile of which we would like to get the color. |
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
483 |
* @return The color of tile in the small map in mode "Owner" |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
484 |
*/ |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
485 |
static inline uint32 GetSmallMapOwnerPixels(TileIndex tile) |
0 | 486 |
{ |
2368
d5a31a409219
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
tron
parents:
2332
diff
changeset
|
487 |
Owner o; |
0 | 488 |
|
2368
d5a31a409219
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
tron
parents:
2332
diff
changeset
|
489 |
switch (GetTileType(tile)) { |
4846
a6c472d934c0
(svn r6772) -Codechange: Do not abuse OWNER_SPECTATOR as the "owner" of the industry for
Darkvater
parents:
4727
diff
changeset
|
490 |
case MP_INDUSTRY: o = OWNER_END; break; |
2368
d5a31a409219
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
tron
parents:
2332
diff
changeset
|
491 |
case MP_HOUSE: o = OWNER_TOWN; break; |
d5a31a409219
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
tron
parents:
2332
diff
changeset
|
492 |
default: o = GetTileOwner(tile); break; |
0 | 493 |
} |
494 |
||
2368
d5a31a409219
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
tron
parents:
2332
diff
changeset
|
495 |
return _owner_colors[o]; |
0 | 496 |
} |
497 |
||
498 |
||
499 |
static const uint32 _smallmap_mask_left[3] = { |
|
500 |
MKCOLOR(0xFF000000), |
|
501 |
MKCOLOR(0xFFFF0000), |
|
502 |
MKCOLOR(0xFFFFFF00), |
|
503 |
}; |
|
504 |
||
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
505 |
static const uint32 _smallmap_mask_right[] = { |
0 | 506 |
MKCOLOR(0x000000FF), |
507 |
MKCOLOR(0x0000FFFF), |
|
508 |
MKCOLOR(0x00FFFFFF), |
|
509 |
}; |
|
510 |
||
511 |
/* each tile has 4 x pixels and 1 y pixel */ |
|
512 |
||
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
513 |
static GetSmallMapPixels *_smallmap_draw_procs[] = { |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
514 |
GetSmallMapContoursPixels, |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
515 |
GetSmallMapVehiclesPixels, |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
516 |
GetSmallMapIndustriesPixels, |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
517 |
GetSmallMapRoutesPixels, |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
518 |
GetSmallMapVegetationPixels, |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
519 |
GetSmallMapOwnerPixels, |
0 | 520 |
}; |
521 |
||
522 |
static const byte _vehicle_type_colors[6] = { |
|
523 |
184, 191, 152, 15, 215, 184 |
|
524 |
}; |
|
525 |
||
526 |
||
527 |
static void DrawVertMapIndicator(int x, int y, int x2, int y2) |
|
528 |
{ |
|
2951 | 529 |
GfxFillRect(x, y, x2, y + 3, 69); |
530 |
GfxFillRect(x, y2 - 3, x2, y2, 69); |
|
0 | 531 |
} |
532 |
||
533 |
static void DrawHorizMapIndicator(int x, int y, int x2, int y2) |
|
534 |
{ |
|
2951 | 535 |
GfxFillRect(x, y, x + 3, y2, 69); |
536 |
GfxFillRect(x2 - 3, y, x2, y2, 69); |
|
0 | 537 |
} |
538 |
||
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
539 |
enum SmallMapWindowWidgets { |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
540 |
SM_WIDGET_MAP = 4, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
541 |
SM_WIDGET_CONTOUR, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
542 |
SM_WIDGET_VEHICLES, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
543 |
SM_WIDGET_INDUSTRIES, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
544 |
SM_WIDGET_ROUTES, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
545 |
SM_WIDGET_VEGETATION, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
546 |
SM_WIDGET_OWNERS, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
547 |
SM_WIDGET_CENTERMAP, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
548 |
SM_WIDGET_TOGGLETOWNNAME, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
549 |
SM_WIDGET_LEGEND, |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
550 |
SM_WIDGET_BUTTONSPANEL, |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
551 |
SM_WIDGET_BOTTOMPANEL, |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
552 |
SM_WIDGET_ENABLEINDUSTRIES, |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
553 |
SM_WIDGET_DISABLEINDUSTRIES, |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
554 |
SM_WIDGET_RESIZEBOX, |
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
555 |
}; |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
556 |
|
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
557 |
enum SmallMapType { |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
558 |
SMT_CONTOUR, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
559 |
SMT_VEHICLES, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
560 |
SMT_INDUSTRY, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
561 |
SMT_OWNER = 5, |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
562 |
}; |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
563 |
|
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
564 |
/** |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
565 |
* Draws the small map. |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
566 |
* |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
567 |
* Basically, the small map is draw column of pixels by column of pixels. The pixels |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
568 |
* are drawn directly into the screen buffer. The final map is drawn in multiple passes. |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
569 |
* The passes are: |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
570 |
* <ol><li>The colors of tiles in the different modes.</li> |
6984
045168d13eef
(svn r9669) -Documentation: some more doxygen fixes
belugas
parents:
6981
diff
changeset
|
571 |
* <li>Town names (optional)</li></ol> |
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
572 |
* |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
573 |
* @param dpi pointer to pixel to write onto |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
574 |
* @param w pointer to Window struct |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
575 |
* @param type type of map requested (vegetation, owners, routes, etc) |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
576 |
* @param show_towns true if the town names should be displayed, false if not. |
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
577 |
*/ |
0 | 578 |
static void DrawSmallMap(DrawPixelInfo *dpi, Window *w, int type, bool show_towns) |
579 |
{ |
|
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7374
diff
changeset
|
580 |
Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter(); |
0 | 581 |
DrawPixelInfo *old_dpi; |
582 |
int dx,dy, x, y, x2, y2; |
|
7374
54c06f06ecc8
(svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents:
7253
diff
changeset
|
583 |
void *ptr; |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
584 |
int tile_x; |
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
585 |
int tile_y; |
0 | 586 |
ViewPort *vp; |
587 |
||
588 |
old_dpi = _cur_dpi; |
|
589 |
_cur_dpi = dpi; |
|
590 |
||
591 |
/* clear it */ |
|
592 |
GfxFillRect(dpi->left, dpi->top, dpi->left + dpi->width - 1, dpi->top + dpi->height - 1, 0); |
|
593 |
||
594 |
/* setup owner table */ |
|
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
595 |
if (type == SMT_OWNER) { |
4171 | 596 |
const Player *p; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
597 |
|
0 | 598 |
/* fill with some special colors */ |
2368
d5a31a409219
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
tron
parents:
2332
diff
changeset
|
599 |
_owner_colors[OWNER_TOWN] = MKCOLOR(0xB4B4B4B4); |
2332
fa9dc1350e22
(svn r2858) -Codechange: resolved some magic numbers (_Luca_)
truelight
parents:
2186
diff
changeset
|
600 |
_owner_colors[OWNER_NONE] = MKCOLOR(0x54545454); |
fa9dc1350e22
(svn r2858) -Codechange: resolved some magic numbers (_Luca_)
truelight
parents:
2186
diff
changeset
|
601 |
_owner_colors[OWNER_WATER] = MKCOLOR(0xCACACACA); |
4847
bd9e07155a34
(svn r6773) -eh...I had to test it didn't i, just forgot to save
Darkvater
parents:
4846
diff
changeset
|
602 |
_owner_colors[OWNER_END] = MKCOLOR(0x20202020); /* industry */ |
0 | 603 |
|
604 |
/* now fill with the player colors */ |
|
605 |
FOR_ALL_PLAYERS(p) { |
|
2951 | 606 |
if (p->is_active) { |
1092 | 607 |
_owner_colors[p->index] = |
4455
fed147abf037
(svn r6238) Use the colour stored in _colour_gradient[] instead of explicitly retrieving it with GetNonSprite()
tron
parents:
4435
diff
changeset
|
608 |
_colour_gradient[p->player_color][5] * 0x01010101; |
2951 | 609 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
610 |
} |
0 | 611 |
} |
612 |
||
8578
55218950ce2d
(svn r11643) -Codechange: conform with the coding style for the WP macro uses.
rubidium
parents:
8493
diff
changeset
|
613 |
tile_x = WP(w, smallmap_d).scroll_x / TILE_SIZE; |
55218950ce2d
(svn r11643) -Codechange: conform with the coding style for the WP macro uses.
rubidium
parents:
8493
diff
changeset
|
614 |
tile_y = WP(w, smallmap_d).scroll_y / TILE_SIZE; |
0 | 615 |
|
8578
55218950ce2d
(svn r11643) -Codechange: conform with the coding style for the WP macro uses.
rubidium
parents:
8493
diff
changeset
|
616 |
dx = dpi->left + WP(w, smallmap_d).subscroll; |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
617 |
tile_x -= dx / 4; |
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
618 |
tile_y += dx / 4; |
0 | 619 |
dx &= 3; |
620 |
||
621 |
dy = dpi->top; |
|
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
622 |
tile_x += dy / 2; |
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
623 |
tile_y += dy / 2; |
0 | 624 |
|
625 |
if (dy & 1) { |
|
626 |
tile_x++; |
|
627 |
dx += 2; |
|
628 |
if (dx > 3) { |
|
629 |
dx -= 4; |
|
630 |
tile_x--; |
|
631 |
tile_y++; |
|
632 |
} |
|
633 |
} |
|
634 |
||
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7374
diff
changeset
|
635 |
ptr = blitter->MoveTo(dpi->dst_ptr, -dx - 4, 0); |
0 | 636 |
x = - dx - 4; |
637 |
y = 0; |
|
638 |
||
2952 | 639 |
for (;;) { |
2989 | 640 |
uint32 mask = 0xFFFFFFFF; |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
641 |
int reps; |
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
642 |
int t; |
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
643 |
|
0 | 644 |
/* distance from left edge */ |
645 |
if (x < 0) { |
|
646 |
if (x < -3) goto skip_column; |
|
647 |
/* mask to use at the left edge */ |
|
648 |
mask = _smallmap_mask_left[x + 3]; |
|
649 |
} |
|
650 |
||
651 |
/* distance from right edge */ |
|
652 |
t = dpi->width - x; |
|
653 |
if (t < 4) { |
|
2951 | 654 |
if (t <= 0) break; /* exit loop */ |
0 | 655 |
/* mask to use at the right edge */ |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
656 |
mask &= _smallmap_mask_right[t - 1]; |
0 | 657 |
} |
658 |
||
659 |
/* number of lines */ |
|
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
660 |
reps = (dpi->height - y + 1) / 2; |
0 | 661 |
if (reps > 0) { |
4171 | 662 |
DrawSmallMapStuff(ptr, tile_x, tile_y, dpi->pitch * 2, reps, mask, _smallmap_draw_procs[type]); |
0 | 663 |
} |
664 |
||
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
665 |
skip_column: |
0 | 666 |
if (y == 0) { |
667 |
tile_y++; |
|
668 |
y++; |
|
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7374
diff
changeset
|
669 |
ptr = blitter->MoveTo(ptr, 0, 1); |
0 | 670 |
} else { |
671 |
tile_x--; |
|
672 |
y--; |
|
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7374
diff
changeset
|
673 |
ptr = blitter->MoveTo(ptr, 0, -1); |
0 | 674 |
} |
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7374
diff
changeset
|
675 |
ptr = blitter->MoveTo(ptr, 2, 0); |
0 | 676 |
x += 2; |
677 |
} |
|
678 |
||
679 |
/* draw vehicles? */ |
|
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
680 |
if (type == SMT_CONTOUR || type == SMT_VEHICLES) { |
0 | 681 |
Vehicle *v; |
682 |
bool skip; |
|
683 |
byte color; |
|
684 |
||
685 |
FOR_ALL_VEHICLES(v) { |
|
10271
a20997d33fe8
(svn r12803) -Cleanup: rename SpecialVehicle to EffectVehicle to have a uniform naming of the thing instead of using both names for the same thing.
rubidium
parents:
10257
diff
changeset
|
686 |
if (v->type != VEH_EFFECT && |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
687 |
(v->vehstatus & (VS_HIDDEN | VS_UNCLICKABLE)) == 0) { |
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
688 |
/* Remap into flat coordinates. */ |
0 | 689 |
Point pt = RemapCoords( |
8578
55218950ce2d
(svn r11643) -Codechange: conform with the coding style for the WP macro uses.
rubidium
parents:
8493
diff
changeset
|
690 |
v->x_pos / TILE_SIZE - WP(w, smallmap_d).scroll_x / TILE_SIZE, // divide each one separately because (a-b)/c != a/c-b/c in integer world |
55218950ce2d
(svn r11643) -Codechange: conform with the coding style for the WP macro uses.
rubidium
parents:
8493
diff
changeset
|
691 |
v->y_pos / TILE_SIZE - WP(w, smallmap_d).scroll_y / TILE_SIZE, // dtto |
0 | 692 |
0); |
693 |
x = pt.x; |
|
694 |
y = pt.y; |
|
695 |
||
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
696 |
/* Check if y is out of bounds? */ |
0 | 697 |
y -= dpi->top; |
8450
dce58137301f
(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
skidd13
parents:
8429
diff
changeset
|
698 |
if (!IsInsideMM(y, 0, dpi->height)) continue; |
0 | 699 |
|
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
700 |
/* Default is to draw both pixels. */ |
0 | 701 |
skip = false; |
702 |
||
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
703 |
/* Offset X coordinate */ |
8578
55218950ce2d
(svn r11643) -Codechange: conform with the coding style for the WP macro uses.
rubidium
parents:
8493
diff
changeset
|
704 |
x -= WP(w, smallmap_d).subscroll + 3 + dpi->left; |
0 | 705 |
|
706 |
if (x < 0) { |
|
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
707 |
/* if x+1 is 0, that means we're on the very left edge, |
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
708 |
* and should thus only draw a single pixel */ |
2951 | 709 |
if (++x != 0) continue; |
0 | 710 |
skip = true; |
711 |
} else if (x >= dpi->width - 1) { |
|
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
712 |
/* Check if we're at the very right edge, and if so draw only a single pixel */ |
2951 | 713 |
if (x != dpi->width - 1) continue; |
0 | 714 |
skip = true; |
715 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
716 |
|
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
717 |
/* Calculate pointer to pixel and the color */ |
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
718 |
color = (type == SMT_VEHICLES) ? _vehicle_type_colors[v->type] : 0xF; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
719 |
|
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
720 |
/* And draw either one or two pixels depending on clipping */ |
7433
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7374
diff
changeset
|
721 |
blitter->SetPixel(dpi->dst_ptr, x, y, color); |
8e410e7ec0d7
(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents:
7374
diff
changeset
|
722 |
if (!skip) blitter->SetPixel(dpi->dst_ptr, x + 1, y, color); |
0 | 723 |
} |
724 |
} |
|
725 |
} |
|
726 |
||
727 |
if (show_towns) { |
|
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
728 |
const Town *t; |
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
729 |
|
0 | 730 |
FOR_ALL_TOWNS(t) { |
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
731 |
/* Remap the town coordinate */ |
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
732 |
Point pt = RemapCoords( |
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
733 |
(int)(TileX(t->xy) * TILE_SIZE - WP(w, smallmap_d).scroll_x) / TILE_SIZE, |
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
734 |
(int)(TileY(t->xy) * TILE_SIZE - WP(w, smallmap_d).scroll_y) / TILE_SIZE, |
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
735 |
0); |
8578
55218950ce2d
(svn r11643) -Codechange: conform with the coding style for the WP macro uses.
rubidium
parents:
8493
diff
changeset
|
736 |
x = pt.x - WP(w, smallmap_d).subscroll + 3 - (t->sign.width_2 >> 1); |
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
737 |
y = pt.y; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
738 |
|
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
739 |
/* Check if the town sign is within bounds */ |
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
740 |
if (x + t->sign.width_2 > dpi->left && |
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
741 |
x < dpi->left + dpi->width && |
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
742 |
y + 6 > dpi->top && |
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
743 |
y < dpi->top + dpi->height) { |
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
744 |
/* And draw it. */ |
4346
3f00094f2670
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
745 |
SetDParam(0, t->index); |
8320
6ffad7a5d242
(svn r11374) -Codechange: Give meaning to the magical number that specifies the color of the text in a DrawString call.
belugas
parents:
7985
diff
changeset
|
746 |
DrawString(x, y, STR_2056, TC_WHITE); |
0 | 747 |
} |
748 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
749 |
} |
0 | 750 |
|
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
751 |
/* Draw map indicators */ |
0 | 752 |
{ |
753 |
Point pt; |
|
754 |
||
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
755 |
/* Find main viewport. */ |
0 | 756 |
vp = FindWindowById(WC_MAIN_WINDOW,0)->viewport; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
757 |
|
1515
f466d02bd936
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
758 |
pt = RemapCoords(WP(w, smallmap_d).scroll_x, WP(w, smallmap_d).scroll_y, 0); |
0 | 759 |
|
760 |
x = vp->virtual_left - pt.x; |
|
761 |
y = vp->virtual_top - pt.y; |
|
3421
8ab76c47c72c
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3391
diff
changeset
|
762 |
x2 = (x + vp->virtual_width) / TILE_SIZE; |
8ab76c47c72c
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3391
diff
changeset
|
763 |
y2 = (y + vp->virtual_height) / TILE_SIZE; |
8ab76c47c72c
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3391
diff
changeset
|
764 |
x /= TILE_SIZE; |
8ab76c47c72c
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3391
diff
changeset
|
765 |
y /= TILE_SIZE; |
0 | 766 |
|
8578
55218950ce2d
(svn r11643) -Codechange: conform with the coding style for the WP macro uses.
rubidium
parents:
8493
diff
changeset
|
767 |
x -= WP(w, smallmap_d).subscroll; |
55218950ce2d
(svn r11643) -Codechange: conform with the coding style for the WP macro uses.
rubidium
parents:
8493
diff
changeset
|
768 |
x2 -= WP(w, smallmap_d).subscroll; |
0 | 769 |
|
770 |
DrawVertMapIndicator(x, y, x, y2); |
|
771 |
DrawVertMapIndicator(x2, y, x2, y2); |
|
772 |
||
773 |
DrawHorizMapIndicator(x, y, x2, y); |
|
774 |
DrawHorizMapIndicator(x, y2, x2, y2); |
|
775 |
} |
|
776 |
_cur_dpi = old_dpi; |
|
777 |
} |
|
778 |
||
4339
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
779 |
void SmallMapCenterOnCurrentPos(Window *w) |
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
780 |
{ |
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
781 |
int x, y; |
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
782 |
ViewPort *vp; |
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
783 |
vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport; |
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
784 |
|
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
785 |
x = ((vp->virtual_width - (w->widget[SM_WIDGET_MAP].right - w->widget[SM_WIDGET_MAP].left) * TILE_SIZE) / 2 + vp->virtual_left) / 4; |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
786 |
y = ((vp->virtual_height - (w->widget[SM_WIDGET_MAP].bottom - w->widget[SM_WIDGET_MAP].top ) * TILE_SIZE) / 2 + vp->virtual_top ) / 2 - TILE_SIZE * 2; |
4339
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
787 |
WP(w, smallmap_d).scroll_x = (y - x) & ~0xF; |
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
788 |
WP(w, smallmap_d).scroll_y = (x + y) & ~0xF; |
10434
d6accd017341
(svn r12976) -Codechange: use w->SetDirty() instead of SetWindowDirty(w) when it's certain that w != NULL.
rubidium
parents:
10429
diff
changeset
|
789 |
w->SetDirty(); |
4339
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
790 |
} |
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
791 |
|
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
792 |
enum { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
793 |
BASE_NB_PER_COLUMN = 6, |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
794 |
}; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
795 |
|
0 | 796 |
static void SmallMapWindowProc(Window *w, WindowEvent *e) |
797 |
{ |
|
1918
68d78ef6833d
(svn r2424) - Fix: backport the smallmap_gui.c changes from the map/ branch into trunk. This also implicitely fixes the bug where the game would crash in certain resolutions with certain minimap masks when dragged partly outside the game-area.
Darkvater
parents:
1901
diff
changeset
|
798 |
switch (e->event) { |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
799 |
case WE_PAINT: { |
6972
13887863c3f1
(svn r9652) -Fix(r9651): "const" keyword forgotten. Spotted by glx.
belugas
parents:
6971
diff
changeset
|
800 |
const LegendAndColour *tbl; |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
801 |
int x, y, y_org; |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
802 |
uint diff; |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
803 |
DrawPixelInfo new_dpi; |
0 | 804 |
|
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
805 |
/* Hide Enable all/Disable all buttons if is not industry type small map*/ |
8493
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
806 |
w->SetWidgetHiddenState(SM_WIDGET_ENABLEINDUSTRIES, _smallmap_type != SMT_INDUSTRY); |
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
807 |
w->SetWidgetHiddenState(SM_WIDGET_DISABLEINDUSTRIES, _smallmap_type != SMT_INDUSTRY); |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
808 |
|
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
809 |
/* draw the window */ |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
810 |
SetDParam(0, STR_00E5_CONTOURS + _smallmap_type); |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
811 |
DrawWindowWidgets(w); |
0 | 812 |
|
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
813 |
tbl = _legend_table[_smallmap_type]; |
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
814 |
|
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
815 |
/* difference in window size */ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
816 |
diff = (_industries_per_column > BASE_NB_PER_COLUMN) ? ((_industries_per_column - BASE_NB_PER_COLUMN) * BASE_NB_PER_COLUMN) + 1 : 0; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
817 |
|
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
818 |
x = 4; |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
819 |
y_org = w->height - 44 - 11 - diff; |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
820 |
y = y_org; |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
821 |
|
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
822 |
for (;;) { |
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
823 |
|
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
824 |
if (_smallmap_type == SMT_INDUSTRY) { |
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
825 |
/* Industry name must be formated, since it's not in tiny font in the specs. |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
826 |
* So, draw with a parameter and use the STR_SMALLMAP_INDUSTRY string, which is tiny font.*/ |
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
827 |
SetDParam(0, tbl->legend); |
8429
106d74abf37a
(svn r11486) -Fix [FS#1457]: industry count was wrong in smallmap
glx
parents:
8417
diff
changeset
|
828 |
assert(tbl->type < NUM_INDUSTRYTYPES); |
106d74abf37a
(svn r11486) -Fix [FS#1457]: industry count was wrong in smallmap
glx
parents:
8417
diff
changeset
|
829 |
SetDParam(1, _industry_counts[tbl->type]); |
106d74abf37a
(svn r11486) -Fix [FS#1457]: industry count was wrong in smallmap
glx
parents:
8417
diff
changeset
|
830 |
if (!tbl->show_on_map) { |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
831 |
/* Simply draw the string, not the black border of the legend color. |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
832 |
* This will enforce the idea of the disabled item */ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
833 |
DrawString(x + 11, y, STR_SMALLMAP_INDUSTRY, TC_GREY); |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
834 |
} else { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
835 |
DrawString(x + 11, y, STR_SMALLMAP_INDUSTRY, TC_BLACK); |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
836 |
GfxFillRect(x, y + 1, x + 8, y + 5, 0); // outer border of the legend color |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
837 |
} |
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
838 |
} else { |
8429
106d74abf37a
(svn r11486) -Fix [FS#1457]: industry count was wrong in smallmap
glx
parents:
8417
diff
changeset
|
839 |
/* Anything that is not an industry is using normal process */ |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
840 |
GfxFillRect(x, y + 1, x + 8, y + 5, 0); |
8320
6ffad7a5d242
(svn r11374) -Codechange: Give meaning to the magical number that specifies the color of the text in a DrawString call.
belugas
parents:
7985
diff
changeset
|
841 |
DrawString(x + 11, y, tbl->legend, TC_FROMSTRING); |
7029
209e4b2e1180
(svn r9721) -Codechange: -Codechange: Cleanup of industry_cmd (Step-12). Dynamically build the legends (name and color) for industries in the smallmap_gui.
belugas
parents:
6984
diff
changeset
|
842 |
} |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
843 |
GfxFillRect(x + 1, y + 2, x + 7, y + 4, tbl->colour); // legend color |
0 | 844 |
|
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
845 |
tbl += 1; |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
846 |
y += 6; |
4339
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
847 |
|
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
848 |
if (tbl->end) { // end of the list |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
849 |
break; |
6971
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
850 |
} else if (tbl->col_break) { |
ecd31bf08a31
(svn r9651) -Codechange: make legend system of smallmap a little bit less magic with the help of a struct and not an array of bytes
belugas
parents:
6949
diff
changeset
|
851 |
/* break asked, continue at top, 123 pixels (one "row") to the right */ |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
852 |
x += 123; |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
853 |
y = y_org; |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
854 |
} |
4339
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
855 |
} |
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
856 |
|
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
857 |
if (!FillDrawPixelInfo(&new_dpi, 3, 17, w->width - 28 + 22, w->height - 64 - 11 - diff)) |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
858 |
return; |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
859 |
|
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
860 |
DrawSmallMap(&new_dpi, w, _smallmap_type, _smallmap_show_towns); |
0 | 861 |
} break; |
862 |
||
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
863 |
case WE_CLICK: |
4634
897461a3e9ca
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
864 |
switch (e->we.click.widget) { |
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
865 |
case SM_WIDGET_MAP: { // Map window |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
866 |
Window *w2 = FindWindowById(WC_MAIN_WINDOW, 0); |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
867 |
Point pt; |
5127
ed0ecbd3db0a
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
868 |
|
ed0ecbd3db0a
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
869 |
/* |
ed0ecbd3db0a
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
870 |
* XXX: scrolling with the left mouse button is done by subsequently |
ed0ecbd3db0a
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
871 |
* clicking with the left mouse button; clicking once centers the |
ed0ecbd3db0a
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
872 |
* large map at the selected point. So by unclicking the left mouse |
ed0ecbd3db0a
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
873 |
* button here, it gets reclicked during the next inputloop, which |
ed0ecbd3db0a
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
874 |
* would make it look like the mouse is being dragged, while it is |
ed0ecbd3db0a
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
875 |
* actually being (virtually) clicked every inputloop. |
ed0ecbd3db0a
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
876 |
*/ |
ed0ecbd3db0a
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
877 |
_left_button_clicked = false; |
0 | 878 |
|
8578
55218950ce2d
(svn r11643) -Codechange: conform with the coding style for the WP macro uses.
rubidium
parents:
8493
diff
changeset
|
879 |
pt = RemapCoords(WP(w, smallmap_d).scroll_x, WP(w,smallmap_d).scroll_y, 0); |
7226
a8650d6ecb53
(svn r9962) -Feature: Add smooth viewport scrolling. This must be enabled with patch setting 'smooth_scroll'
peter1138
parents:
7122
diff
changeset
|
880 |
WP(w2, vp_d).dest_scrollpos_x = pt.x + ((_cursor.pos.x - w->left + 2) << 4) - (w2->viewport->virtual_width >> 1); |
a8650d6ecb53
(svn r9962) -Feature: Add smooth viewport scrolling. This must be enabled with patch setting 'smooth_scroll'
peter1138
parents:
7122
diff
changeset
|
881 |
WP(w2, vp_d).dest_scrollpos_y = pt.y + ((_cursor.pos.y - w->top - 16) << 4) - (w2->viewport->virtual_height >> 1); |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
882 |
|
10434
d6accd017341
(svn r12976) -Codechange: use w->SetDirty() instead of SetWindowDirty(w) when it's certain that w != NULL.
rubidium
parents:
10429
diff
changeset
|
883 |
w->SetDirty(); |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
884 |
} break; |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
885 |
|
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
886 |
case SM_WIDGET_CONTOUR: // Show land contours |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
887 |
case SM_WIDGET_VEHICLES: // Show vehicles |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
888 |
case SM_WIDGET_INDUSTRIES: // Show industries |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
889 |
case SM_WIDGET_ROUTES: // Show transport routes |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
890 |
case SM_WIDGET_VEGETATION: // Show vegetation |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
891 |
case SM_WIDGET_OWNERS: // Show land owners |
8493
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
892 |
w->RaiseWidget(_smallmap_type + SM_WIDGET_CONTOUR); |
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
893 |
_smallmap_type = e->we.click.widget - SM_WIDGET_CONTOUR; |
8493
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
894 |
w->LowerWidget(_smallmap_type + SM_WIDGET_CONTOUR); |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
895 |
|
10434
d6accd017341
(svn r12976) -Codechange: use w->SetDirty() instead of SetWindowDirty(w) when it's certain that w != NULL.
rubidium
parents:
10429
diff
changeset
|
896 |
w->SetDirty(); |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
897 |
SndPlayFx(SND_15_BEEP); |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
898 |
break; |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
899 |
|
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
900 |
case SM_WIDGET_CENTERMAP: // Center the smallmap again |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
901 |
SmallMapCenterOnCurrentPos(w); |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
902 |
|
10434
d6accd017341
(svn r12976) -Codechange: use w->SetDirty() instead of SetWindowDirty(w) when it's certain that w != NULL.
rubidium
parents:
10429
diff
changeset
|
903 |
w->SetDirty(); |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
904 |
SndPlayFx(SND_15_BEEP); |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
905 |
break; |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
906 |
|
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
907 |
case SM_WIDGET_TOGGLETOWNNAME: // Toggle town names |
8493
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
908 |
w->ToggleWidgetLoweredState(SM_WIDGET_TOGGLETOWNNAME); |
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
909 |
_smallmap_show_towns = w->IsWidgetLowered(SM_WIDGET_TOGGLETOWNNAME); |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
910 |
|
10434
d6accd017341
(svn r12976) -Codechange: use w->SetDirty() instead of SetWindowDirty(w) when it's certain that w != NULL.
rubidium
parents:
10429
diff
changeset
|
911 |
w->SetDirty(); |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
912 |
SndPlayFx(SND_15_BEEP); |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
913 |
break; |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
914 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
915 |
case SM_WIDGET_LEGEND: // Legend |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
916 |
/* if industry type small map*/ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
917 |
if (_smallmap_type == SMT_INDUSTRY) { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
918 |
/* if click on industries label, find right industry type and enable/disable it */ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
919 |
Widget *wi = &w->widget[SM_WIDGET_LEGEND]; // label panel |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
920 |
uint column = (e->we.click.pt.x - 4) / 123; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
921 |
uint line = (e->we.click.pt.y - wi->top - 2) / 6; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
922 |
uint free = _smallmap_industry_count % 3; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
923 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
924 |
if (column <= 3) { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
925 |
/* check if click is on industry label*/ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
926 |
uint industry_pos = 0; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
927 |
for (uint i = 0; i <= column; i++) { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
928 |
uint diff = (free > 0) ? 1 : 0; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
929 |
uint max_column_lines = _industries_per_column + diff; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
930 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
931 |
if (i < column) industry_pos = industry_pos + _industries_per_column + diff; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
932 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
933 |
if (i == column && line <= max_column_lines - 1) { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
934 |
industry_pos = industry_pos + line; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
935 |
_legend_from_industries[industry_pos].show_on_map = !_legend_from_industries[industry_pos].show_on_map; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
936 |
} |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
937 |
if( free > 0) free--; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
938 |
} |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
939 |
} |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
940 |
/* Raise the two buttons "all", as we have done a specific choice */ |
8493
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
941 |
w->RaiseWidget(SM_WIDGET_ENABLEINDUSTRIES); |
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
942 |
w->RaiseWidget(SM_WIDGET_DISABLEINDUSTRIES); |
10434
d6accd017341
(svn r12976) -Codechange: use w->SetDirty() instead of SetWindowDirty(w) when it's certain that w != NULL.
rubidium
parents:
10429
diff
changeset
|
943 |
w->SetDirty(); |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
944 |
} |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
945 |
break; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
946 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
947 |
case SM_WIDGET_ENABLEINDUSTRIES: // Enable all industries |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
948 |
for (int i = 0; i != _smallmap_industry_count; i++) { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
949 |
_legend_from_industries[i].show_on_map = true; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
950 |
} |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
951 |
/* toggle appeareance indicating the choice */ |
8493
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
952 |
w->LowerWidget(SM_WIDGET_ENABLEINDUSTRIES); |
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
953 |
w->RaiseWidget(SM_WIDGET_DISABLEINDUSTRIES); |
10434
d6accd017341
(svn r12976) -Codechange: use w->SetDirty() instead of SetWindowDirty(w) when it's certain that w != NULL.
rubidium
parents:
10429
diff
changeset
|
954 |
w->SetDirty(); |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
955 |
break; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
956 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
957 |
case SM_WIDGET_DISABLEINDUSTRIES: // disable all industries |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
958 |
for (int i = 0; i != _smallmap_industry_count; i++) { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
959 |
_legend_from_industries[i].show_on_map = false; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
960 |
} |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
961 |
/* toggle appeareance indicating the choice */ |
8493
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
962 |
w->RaiseWidget(SM_WIDGET_ENABLEINDUSTRIES); |
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
963 |
w->LowerWidget(SM_WIDGET_DISABLEINDUSTRIES); |
10434
d6accd017341
(svn r12976) -Codechange: use w->SetDirty() instead of SetWindowDirty(w) when it's certain that w != NULL.
rubidium
parents:
10429
diff
changeset
|
964 |
w->SetDirty(); |
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
965 |
break; |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
966 |
} |
0 | 967 |
break; |
968 |
||
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
969 |
case WE_RCLICK: |
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
970 |
if (e->we.click.widget == SM_WIDGET_MAP) { |
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
971 |
if (_scrolling_viewport) return; |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
972 |
_scrolling_viewport = true; |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
973 |
_cursor.delta.x = 0; |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
974 |
_cursor.delta.y = 0; |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
975 |
} |
4339
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
976 |
break; |
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
977 |
|
4435
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
978 |
case WE_MOUSELOOP: |
cde1d8fc5c8f
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
979 |
/* update the window every now and then */ |
10434
d6accd017341
(svn r12976) -Codechange: use w->SetDirty() instead of SetWindowDirty(w) when it's certain that w != NULL.
rubidium
parents:
10429
diff
changeset
|
980 |
if ((++w->vscroll.pos & 0x1F) == 0) w->SetDirty(); |
0 | 981 |
break; |
4335
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
982 |
|
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
983 |
case WE_SCROLL: { |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
984 |
int x; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
985 |
int y; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
986 |
int sub; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
987 |
int hx; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
988 |
int hy; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
989 |
int hvx; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
990 |
int hvy; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
991 |
|
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
992 |
_cursor.fix_at = true; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
993 |
|
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
994 |
x = WP(w, smallmap_d).scroll_x; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
995 |
y = WP(w, smallmap_d).scroll_y; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
996 |
|
4634
897461a3e9ca
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
997 |
sub = WP(w, smallmap_d).subscroll + e->we.scroll.delta.x; |
4335
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
998 |
|
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
999 |
x -= (sub >> 2) << 4; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1000 |
y += (sub >> 2) << 4; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1001 |
sub &= 3; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1002 |
|
4634
897461a3e9ca
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1003 |
x += (e->we.scroll.delta.y >> 1) << 4; |
897461a3e9ca
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1004 |
y += (e->we.scroll.delta.y >> 1) << 4; |
4335
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1005 |
|
4634
897461a3e9ca
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1006 |
if (e->we.scroll.delta.y & 1) { |
4335
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1007 |
x += TILE_SIZE; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1008 |
sub += 2; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1009 |
if (sub > 3) { |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1010 |
sub -= 4; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1011 |
x -= TILE_SIZE; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1012 |
y += TILE_SIZE; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1013 |
} |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1014 |
} |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1015 |
|
8415
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
1016 |
hx = (w->widget[SM_WIDGET_MAP].right - w->widget[SM_WIDGET_MAP].left) / 2; |
28add02ee99c
(svn r11472) -Codechange: Give enuma for both the widget numbers and the used smallmap currently used type
belugas
parents:
8320
diff
changeset
|
1017 |
hy = (w->widget[SM_WIDGET_MAP].bottom - w->widget[SM_WIDGET_MAP].top ) / 2; |
4335
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1018 |
hvx = hx * -4 + hy * 8; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1019 |
hvy = hx * 4 + hy * 8; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1020 |
if (x < -hvx) { |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1021 |
x = -hvx; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1022 |
sub = 0; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1023 |
} |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1024 |
if (x > (int)MapMaxX() * TILE_SIZE - hvx) { |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1025 |
x = MapMaxX() * TILE_SIZE - hvx; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1026 |
sub = 0; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1027 |
} |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1028 |
if (y < -hvy) { |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1029 |
y = -hvy; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1030 |
sub = 0; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1031 |
} |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1032 |
if (y > (int)MapMaxY() * TILE_SIZE - hvy) { |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1033 |
y = MapMaxY() * TILE_SIZE - hvy; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1034 |
sub = 0; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1035 |
} |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1036 |
|
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1037 |
WP(w, smallmap_d).scroll_x = x; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1038 |
WP(w, smallmap_d).scroll_y = y; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1039 |
WP(w, smallmap_d).subscroll = sub; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1040 |
|
10434
d6accd017341
(svn r12976) -Codechange: use w->SetDirty() instead of SetWindowDirty(w) when it's certain that w != NULL.
rubidium
parents:
10429
diff
changeset
|
1041 |
w->SetDirty(); |
4335
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1042 |
} break; |
0 | 1043 |
} |
1044 |
} |
|
1045 |
||
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
1046 |
static const WindowDesc _smallmap_desc = { |
7841
d8ff32f13b86
(svn r10708) -Codechange: allow automatic downsizing of the smallmap window in case of low resolutions; one could already make the window smaller, but the resize button was unreachable.
rubidium
parents:
7837
diff
changeset
|
1047 |
WDP_AUTO, WDP_AUTO, 350, 214, 446, 314, |
6144
5a0ffbf27ced
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
5835
diff
changeset
|
1048 |
WC_SMALLMAP, WC_NONE, |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
1049 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
1050 |
_smallmap_widgets, |
0 | 1051 |
SmallMapWindowProc |
1052 |
}; |
|
1053 |
||
6573 | 1054 |
void ShowSmallMap() |
0 | 1055 |
{ |
1056 |
Window *w; |
|
1057 |
||
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
1058 |
w = AllocateWindowDescFront(&_smallmap_desc, 0); |
4339
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
1059 |
if (w == NULL) return; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
1060 |
|
8417
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1061 |
/* Resize the window to fit industries list */ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1062 |
if (_industries_per_column > BASE_NB_PER_COLUMN) { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1063 |
uint diff = ((_industries_per_column - BASE_NB_PER_COLUMN) * BASE_NB_PER_COLUMN) + 1; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1064 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1065 |
w->height = w->height + diff; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1066 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1067 |
Widget *wi = &w->widget[SM_WIDGET_LEGEND]; // label panel |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1068 |
wi->bottom = wi->bottom + diff; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1069 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1070 |
wi = &w->widget[SM_WIDGET_BUTTONSPANEL]; // filler panel under smallmap buttons |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1071 |
wi->bottom = wi->bottom + diff - 1; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1072 |
|
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1073 |
/* Change widget position |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1074 |
* - footer panel |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1075 |
* - enable all industry |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1076 |
* - disable all industry |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1077 |
* - resize window button |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1078 |
*/ |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1079 |
for (uint i = SM_WIDGET_BOTTOMPANEL; i <= SM_WIDGET_RESIZEBOX; i++) { |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1080 |
wi = &w->widget[i]; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1081 |
wi->top = wi->top + diff; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1082 |
wi->bottom = wi->bottom + diff; |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1083 |
} |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1084 |
} |
9acf7ac0368a
(svn r11474) -Feature: Allow to resize on creation the smallmap gui in order to show all the types industry available.
belugas
parents:
8416
diff
changeset
|
1085 |
|
8493
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
1086 |
w->LowerWidget(_smallmap_type + SMT_OWNER); |
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
1087 |
w->SetWidgetLoweredState(SM_WIDGET_TOGGLETOWNNAME, _smallmap_show_towns); |
0 | 1088 |
|
4339
f5e99218131a
(svn r6040) -Add: when clicking twice on a Location Button, the SmallMap centers on your position (based on FS#54 by thomasdev)
truelight
parents:
4337
diff
changeset
|
1089 |
SmallMapCenterOnCurrentPos(w); |
0 | 1090 |
} |
1091 |
||
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1092 |
/* Extra ViewPort Window Stuff */ |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
1093 |
static const Widget _extra_view_port_widgets[] = { |
7865
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1094 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1095 |
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 287, 0, 13, STR_EXTRA_VIEW_PORT_TITLE, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1096 |
{ WWT_STICKYBOX, RESIZE_LR, 14, 288, 299, 0, 13, 0x0, STR_STICKY_BUTTON}, |
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1097 |
{ WWT_PANEL, RESIZE_RB, 14, 0, 299, 14, 33, 0x0, STR_NULL}, |
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1098 |
{ WWT_INSET, RESIZE_RB, 14, 2, 297, 16, 31, 0x0, STR_NULL}, |
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1099 |
{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 0, 21, 34, 55, SPR_IMG_ZOOMIN, STR_017F_ZOOM_THE_VIEW_IN}, |
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1100 |
{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 22, 43, 34, 55, SPR_IMG_ZOOMOUT, STR_0180_ZOOM_THE_VIEW_OUT}, |
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1101 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 44, 171, 34, 55, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT}, |
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1102 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 172, 298, 34, 55, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT}, |
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1103 |
{ WWT_PANEL, RESIZE_RTB, 14, 299, 299, 34, 55, 0x0, STR_NULL}, |
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1104 |
{ WWT_PANEL, RESIZE_RTB, 14, 0, 287, 56, 67, 0x0, STR_NULL}, |
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1105 |
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 288, 299, 56, 67, 0x0, STR_RESIZE_BUTTON}, |
176
84990c4b9212
(svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron)
darkvater
parents:
154
diff
changeset
|
1106 |
{ WIDGETS_END}, |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1107 |
}; |
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1108 |
|
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1109 |
static void ExtraViewPortWndProc(Window *w, WindowEvent *e) |
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1110 |
{ |
1815
cfc1399ea8c9
(svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation.
Darkvater
parents:
1516
diff
changeset
|
1111 |
switch (e->event) { |
10255
5600b575e6e7
(svn r12787) -Documentation: add/fix documentation of some functions. Patch by Alberth.
rubidium
parents:
10213
diff
changeset
|
1112 |
case WE_CREATE: // Disable zoom in button |
7865
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1113 |
/* New viewport start at (zero,zero) */ |
10257
fe75471234f3
(svn r12789) -Codechange: rename AssignWindowViewport to InitializeWindowViewport because the viewport is now part of the window struct. Patch by Alberth.
rubidium
parents:
10255
diff
changeset
|
1114 |
InitializeWindowViewport(w, 3, 17, w->widget[4].right - w->widget[4].left - 1, w->widget[4].bottom - w->widget[4].top - 1, 0, ZOOM_LVL_VIEWPORT); |
7865
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1115 |
|
8493
3ab458f7cff4
(svn r11555) -Codechange: use the new members introduced in r11551.
rubidium
parents:
8450
diff
changeset
|
1116 |
w->DisableWidget(5); |
1815
cfc1399ea8c9
(svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation.
Darkvater
parents:
1516
diff
changeset
|
1117 |
break; |
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3882
diff
changeset
|
1118 |
|
1815
cfc1399ea8c9
(svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation.
Darkvater
parents:
1516
diff
changeset
|
1119 |
case WE_PAINT: |
10255
5600b575e6e7
(svn r12787) -Documentation: add/fix documentation of some functions. Patch by Alberth.
rubidium
parents:
10213
diff
changeset
|
1120 |
/* set the number in the title bar */ |
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3882
diff
changeset
|
1121 |
SetDParam(0, w->window_number + 1); |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1122 |
|
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1123 |
DrawWindowWidgets(w); |
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1124 |
DrawWindowViewport(w); |
1815
cfc1399ea8c9
(svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation.
Darkvater
parents:
1516
diff
changeset
|
1125 |
break; |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1126 |
|
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3882
diff
changeset
|
1127 |
case WE_CLICK: |
4634
897461a3e9ca
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1128 |
switch (e->we.click.widget) { |
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3882
diff
changeset
|
1129 |
case 5: DoZoomInOutWindow(ZOOM_IN, w); break; |
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3882
diff
changeset
|
1130 |
case 6: DoZoomInOutWindow(ZOOM_OUT, w); break; |
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3882
diff
changeset
|
1131 |
|
10255
5600b575e6e7
(svn r12787) -Documentation: add/fix documentation of some functions. Patch by Alberth.
rubidium
parents:
10213
diff
changeset
|
1132 |
case 7: { // location button (move main view to same spot as this view) 'Paste Location' |
1815
cfc1399ea8c9
(svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation.
Darkvater
parents:
1516
diff
changeset
|
1133 |
Window *w2 = FindWindowById(WC_MAIN_WINDOW, 0); |
cfc1399ea8c9
(svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation.
Darkvater
parents:
1516
diff
changeset
|
1134 |
int x = WP(w, vp_d).scrollpos_x; // Where is the main looking at |
cfc1399ea8c9
(svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation.
Darkvater
parents:
1516
diff
changeset
|
1135 |
int y = WP(w, vp_d).scrollpos_y; |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1136 |
|
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
1137 |
/* set this view to same location. Based on the center, adjusting for zoom */ |
7226
a8650d6ecb53
(svn r9962) -Feature: Add smooth viewport scrolling. This must be enabled with patch setting 'smooth_scroll'
peter1138
parents:
7122
diff
changeset
|
1138 |
WP(w2, vp_d).dest_scrollpos_x = x - (w2->viewport->virtual_width - w->viewport->virtual_width) / 2; |
a8650d6ecb53
(svn r9962) -Feature: Add smooth viewport scrolling. This must be enabled with patch setting 'smooth_scroll'
peter1138
parents:
7122
diff
changeset
|
1139 |
WP(w2, vp_d).dest_scrollpos_y = y - (w2->viewport->virtual_height - w->viewport->virtual_height) / 2; |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1140 |
} break; |
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3882
diff
changeset
|
1141 |
|
10255
5600b575e6e7
(svn r12787) -Documentation: add/fix documentation of some functions. Patch by Alberth.
rubidium
parents:
10213
diff
changeset
|
1142 |
case 8: { // inverse location button (move this view to same spot as main view) 'Copy Location' |
4171 | 1143 |
const Window *w2 = FindWindowById(WC_MAIN_WINDOW, 0); |
2548
97ada3bd2702
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2368
diff
changeset
|
1144 |
int x = WP(w2, const vp_d).scrollpos_x; |
97ada3bd2702
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2368
diff
changeset
|
1145 |
int y = WP(w2, const vp_d).scrollpos_y; |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1146 |
|
7226
a8650d6ecb53
(svn r9962) -Feature: Add smooth viewport scrolling. This must be enabled with patch setting 'smooth_scroll'
peter1138
parents:
7122
diff
changeset
|
1147 |
WP(w, vp_d).dest_scrollpos_x = x + (w2->viewport->virtual_width - w->viewport->virtual_width) / 2; |
a8650d6ecb53
(svn r9962) -Feature: Add smooth viewport scrolling. This must be enabled with patch setting 'smooth_scroll'
peter1138
parents:
7122
diff
changeset
|
1148 |
WP(w, vp_d).dest_scrollpos_y = y + (w2->viewport->virtual_height - w->viewport->virtual_height) / 2; |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1149 |
} break; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
1150 |
} |
4000
bab1ebc37da0
(svn r5210) Many small changes which piled up: const, unsigned, variable scope, CSE for readability, DeMorgan, if cascades -> switch, whitespace, parentheses, bracing, misc.
tron
parents:
3882
diff
changeset
|
1151 |
break; |
1815
cfc1399ea8c9
(svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation.
Darkvater
parents:
1516
diff
changeset
|
1152 |
|
cfc1399ea8c9
(svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation.
Darkvater
parents:
1516
diff
changeset
|
1153 |
case WE_RESIZE: |
4634
897461a3e9ca
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1154 |
w->viewport->width += e->we.sizing.diff.x; |
897461a3e9ca
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1155 |
w->viewport->height += e->we.sizing.diff.y; |
897461a3e9ca
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1156 |
w->viewport->virtual_width += e->we.sizing.diff.x; |
897461a3e9ca
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1157 |
w->viewport->virtual_height += e->we.sizing.diff.y; |
1815
cfc1399ea8c9
(svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation.
Darkvater
parents:
1516
diff
changeset
|
1158 |
break; |
4335
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1159 |
|
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1160 |
case WE_SCROLL: { |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1161 |
ViewPort *vp = IsPtInWindowViewport(w, _cursor.pos.x, _cursor.pos.y); |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1162 |
|
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1163 |
if (vp == NULL) { |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1164 |
_cursor.fix_at = false; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1165 |
_scrolling_viewport = false; |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1166 |
} |
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1167 |
|
7122
0607a15aedc0
(svn r9846) -Codechange: introduced ZOOM_LVL_MIN and ZOOM_LVL_MAX for the obvious reasons
truelight
parents:
7120
diff
changeset
|
1168 |
WP(w, vp_d).scrollpos_x += ScaleByZoom(e->we.scroll.delta.x, vp->zoom); |
0607a15aedc0
(svn r9846) -Codechange: introduced ZOOM_LVL_MIN and ZOOM_LVL_MAX for the obvious reasons
truelight
parents:
7120
diff
changeset
|
1169 |
WP(w, vp_d).scrollpos_y += ScaleByZoom(e->we.scroll.delta.y, vp->zoom); |
7226
a8650d6ecb53
(svn r9962) -Feature: Add smooth viewport scrolling. This must be enabled with patch setting 'smooth_scroll'
peter1138
parents:
7122
diff
changeset
|
1170 |
WP(w, vp_d).dest_scrollpos_x = WP(w, vp_d).scrollpos_x; |
a8650d6ecb53
(svn r9962) -Feature: Add smooth viewport scrolling. This must be enabled with patch setting 'smooth_scroll'
peter1138
parents:
7122
diff
changeset
|
1171 |
WP(w, vp_d).dest_scrollpos_y = WP(w, vp_d).scrollpos_y; |
4335
18bc63352a17
(svn r6036) -Codechange: do not handle SCROLL in a central function, but let windows handle them theirself. Added WE_SCROLL for this.
truelight
parents:
4171
diff
changeset
|
1172 |
} break; |
4337
f77887bd2634
(svn r6038) -Codechange: move mousewheel code to event WE_MOUSEWHEEL instead of a general function that handles that
truelight
parents:
4335
diff
changeset
|
1173 |
|
f77887bd2634
(svn r6038) -Codechange: move mousewheel code to event WE_MOUSEWHEEL instead of a general function that handles that
truelight
parents:
4335
diff
changeset
|
1174 |
case WE_MOUSEWHEEL: |
4634
897461a3e9ca
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1175 |
ZoomInOrOutToCursorWindow(e->we.wheel.wheel < 0, w); |
4337
f77887bd2634
(svn r6038) -Codechange: move mousewheel code to event WE_MOUSEWHEEL instead of a general function that handles that
truelight
parents:
4335
diff
changeset
|
1176 |
break; |
5045
3e734e178dae
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1177 |
|
3e734e178dae
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1178 |
|
3e734e178dae
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1179 |
case WE_MESSAGE: |
3e734e178dae
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1180 |
/* Only handle zoom message if intended for us (msg ZOOM_IN/ZOOM_OUT) */ |
3e734e178dae
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1181 |
if (e->we.message.wparam != w->window_number) break; |
3e734e178dae
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1182 |
HandleZoomMessage(w, w->viewport, 5, 6); |
3e734e178dae
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1183 |
break; |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1184 |
} |
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1185 |
} |
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1186 |
|
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1187 |
static const WindowDesc _extra_view_port_desc = { |
7865
b00756560b9d
(svn r10732) -Codechange: lower the minimum size for the extra viewport window.
rubidium
parents:
7841
diff
changeset
|
1188 |
WDP_AUTO, WDP_AUTO, 300, 68, 300, 268, |
6144
5a0ffbf27ced
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
5835
diff
changeset
|
1189 |
WC_EXTRA_VIEW_PORT, WC_NONE, |
867
581154a08a78
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
1190 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1191 |
_extra_view_port_widgets, |
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1192 |
ExtraViewPortWndProc |
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1193 |
}; |
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1194 |
|
10411
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1195 |
void ShowExtraViewPortWindow(TileIndex tile) |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1196 |
{ |
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1197 |
int i = 0; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
1198 |
|
6916
e87d54a598ea
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6683
diff
changeset
|
1199 |
/* find next free window number for extra viewport */ |
2989 | 1200 |
while (FindWindowById(WC_EXTRA_VIEW_PORT, i) != NULL) i++; |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1201 |
|
10411
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1202 |
Window *w = AllocateWindowDescFront(&_extra_view_port_desc, i); |
2989 | 1203 |
if (w != NULL) { |
10411
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1204 |
Point pt; |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1205 |
|
10411
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1206 |
if (tile == INVALID_TILE) { |
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1207 |
/* the main window with the main view */ |
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1208 |
const Window *v = FindWindowById(WC_MAIN_WINDOW, 0); |
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1209 |
|
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1210 |
/* center on same place as main window (zoom is maximum, no adjustment needed) */ |
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1211 |
pt.x = WP(v, vp_d).scrollpos_x + v->viewport->virtual_height / 2; |
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1212 |
pt.y = WP(v, vp_d).scrollpos_y + v->viewport->virtual_height / 2; |
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1213 |
} else { |
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1214 |
pt = RemapCoords(TileX(tile) * TILE_SIZE + TILE_SIZE / 2, TileY(tile) * TILE_SIZE + TILE_SIZE / 2, TileHeight(tile)); |
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1215 |
} |
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1216 |
|
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1217 |
WP(w, vp_d).scrollpos_x = pt.x - ((w->widget[4].right - w->widget[4].left) - 1) / 2; |
efe3b7a2746f
(svn r12953) -Feature: Open a new viewport when ctrl-clicking on a 'Location' button, a town/station/industry list, or some news items.
peter1138
parents:
10271
diff
changeset
|
1218 |
WP(w, vp_d).scrollpos_y = pt.y - ((w->widget[4].bottom - w->widget[4].top) - 1) / 2; |
7226
a8650d6ecb53
(svn r9962) -Feature: Add smooth viewport scrolling. This must be enabled with patch setting 'smooth_scroll'
peter1138
parents:
7122
diff
changeset
|
1219 |
WP(w, vp_d).dest_scrollpos_x = WP(w, vp_d).scrollpos_x; |
a8650d6ecb53
(svn r9962) -Feature: Add smooth viewport scrolling. This must be enabled with patch setting 'smooth_scroll'
peter1138
parents:
7122
diff
changeset
|
1220 |
WP(w, vp_d).dest_scrollpos_y = WP(w, vp_d).scrollpos_y; |
152
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1221 |
} |
c3964b43943e
(svn r153) -Feature: [1009710] Extra Viewport. In the minimap dropdown menu, open a new viewport to have a quick look at your favorite map-positions. Independent zoom and quick jump to/from viewport (Dribbel)
darkvater
parents:
12
diff
changeset
|
1222 |
} |