author | KUDr |
Fri, 20 Apr 2007 19:43:06 +0000 | |
changeset 6513 | 454347ca3dfb |
parent 6488 | b6c42e91bb35 |
child 6533 | 8be3ef428116 |
permissions | -rw-r--r-- |
2186 | 1 |
/* $Id$ */ |
2 |
||
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
3 |
/** @file smallmap_gui.cpp */ |
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
4 |
|
0 | 5 |
#include "stdafx.h" |
1891
862800791170
(svn r2397) - CodeChange: rename all "ttd" files to "openttd" files.
Darkvater
parents:
1815
diff
changeset
|
6 |
#include "openttd.h" |
4356
ec4e13f21cd0
(svn r6057) -Codechange: made a function GetRandomXXX, that _always_ returns a valid XXX, unless there are none to pick from. Then NULL is returned.
truelight
parents:
4346
diff
changeset
|
7 |
#include "functions.h" |
3234
a2791a480b71
(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
|
8 |
#include "bridge_map.h" |
3144
33e42feae531
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents:
2989
diff
changeset
|
9 |
#include "clear_map.h" |
3391
3c8a6643ed15
(svn r4199) - Codechange: Use industry map accessors to get industry graphics type.
peter1138
parents:
3338
diff
changeset
|
10 |
#include "industry_map.h" |
3338
7cff208f0446
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
11 |
#include "station_map.h" |
507
04b5403aaf6b
(svn r815) Include strings.h only in the files which need it.
tron
parents:
500
diff
changeset
|
12 |
#include "table/strings.h" |
1918
fb72133270ac
(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
|
13 |
#include "table/sprites.h" |
6453
226bcddeba32
(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:
6441
diff
changeset
|
14 |
#include "landscape.h" |
679
04ca2cd69420
(svn r1117) Move map arrays and some related macros into their own files map.c and map.h
tron
parents:
541
diff
changeset
|
15 |
#include "map.h" |
1209
2e00193652b2
(svn r1713) Split off several functions which query/set information about a single tile from map.h and put them into a seperate file tile.h
tron
parents:
1093
diff
changeset
|
16 |
#include "tile.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
|
17 |
#include "gui.h" |
3144
33e42feae531
(svn r3763) Adapt to the new 'map accessors go in foo_map.h'-scheme
tron
parents:
2989
diff
changeset
|
18 |
#include "tree_map.h" |
3180
9c87ee130147
(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
|
19 |
#include "tunnel_map.h" |
0 | 20 |
#include "window.h" |
21 |
#include "gfx.h" |
|
22 |
#include "viewport.h" |
|
23 |
#include "player.h" |
|
24 |
#include "vehicle.h" |
|
25 |
#include "town.h" |
|
337
cbe0c766c947
(svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk
tron
parents:
193
diff
changeset
|
26 |
#include "sound.h" |
2159
f6284cf5fab0
(svn r2669) Shuffle some more stuff around to reduce dependencies
tron
parents:
2062
diff
changeset
|
27 |
#include "variables.h" |
0 | 28 |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
29 |
static const Widget _smallmap_widgets[] = { |
2725
775e3e14ca46
(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
|
30 |
{ WWT_CLOSEBOX, RESIZE_NONE, 13, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
1918
fb72133270ac
(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
|
31 |
{ WWT_CAPTION, RESIZE_RIGHT, 13, 11, 433, 0, 13, STR_00B0_MAP, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
fb72133270ac
(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
|
32 |
{ WWT_STICKYBOX, RESIZE_LR, 13, 434, 445, 0, 13, 0x0, STR_STICKY_BUTTON}, |
2907
8adea2bdec1d
(svn r3462) - Fix: a one-off pixel alignment in the minimap window that "overflowed" its panel in the tropical climate (qball should be satisfied now)
Darkvater
parents:
2725
diff
changeset
|
33 |
{ WWT_PANEL, RESIZE_RB, 13, 0, 445, 14, 257, 0x0, STR_NULL}, |
4939
bef7c24a6027
(svn r6926) -Codechange: Rename WWT_4 to WWT_TEXTBTN_2 and WWT_6 to WWT_INSET (credits to peter1138
Darkvater
parents:
4938
diff
changeset
|
34 |
{ WWT_INSET, RESIZE_RB, 13, 2, 443, 16, 255, 0x0, STR_NULL}, |
1918
fb72133270ac
(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
|
35 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 380, 401, 258, 279, SPR_IMG_SHOW_COUNTOURS, STR_0191_SHOW_LAND_CONTOURS_ON_MAP}, |
fb72133270ac
(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
|
36 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 402, 423, 258, 279, SPR_IMG_SHOW_VEHICLES, STR_0192_SHOW_VEHICLES_ON_MAP}, |
fb72133270ac
(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
|
37 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 424, 445, 258, 279, SPR_IMG_INDUSTRY, STR_0193_SHOW_INDUSTRIES_ON_MAP}, |
fb72133270ac
(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
|
38 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 380, 401, 280, 301, SPR_IMG_SHOW_ROUTES, STR_0194_SHOW_TRANSPORT_ROUTES_ON}, |
fb72133270ac
(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
|
39 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 402, 423, 280, 301, SPR_IMG_PLANTTREES, STR_0195_SHOW_VEGETATION_ON_MAP}, |
fb72133270ac
(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
|
40 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 424, 445, 280, 301, SPR_IMG_COMPANY_GENERAL, STR_0196_SHOW_LAND_OWNERS_ON_MAP}, |
4339
0b1c9f47e69b
(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
|
41 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 358, 379, 258, 279, SPR_IMG_SMALLMAP, STR_SMALLMAP_CENTER}, |
1918
fb72133270ac
(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
|
42 |
{ WWT_IMGBTN, RESIZE_LRTB, 13, 358, 379, 280, 301, SPR_IMG_TOWN, STR_0197_TOGGLE_TOWN_NAMES_ON_OFF}, |
4938
0447845fd1b3
(svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel,
Darkvater
parents:
4937
diff
changeset
|
43 |
{ WWT_PANEL, RESIZE_RTB, 13, 0, 357, 258, 301, 0x0, STR_NULL}, |
1918
fb72133270ac
(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
|
44 |
{ WWT_PANEL, RESIZE_RTB, 13, 0, 433, 302, 313, 0x0, STR_NULL}, |
fb72133270ac
(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
|
45 |
{ WWT_RESIZEBOX, RESIZE_LRTB, 13, 434, 445, 302, 313, 0x0, STR_RESIZE_BUTTON}, |
fb72133270ac
(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
|
46 |
{ WIDGETS_END}, |
0 | 47 |
}; |
48 |
||
49 |
static int _smallmap_type; |
|
50 |
static bool _smallmap_show_towns = true; |
|
51 |
||
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
52 |
/** Macro for ordinary entry of LegendAndColor */ |
b7dce828b7a1
(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:
6453
diff
changeset
|
53 |
#define MK(a,b) {a, b, false, false} |
b7dce828b7a1
(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:
6453
diff
changeset
|
54 |
/** Macro for end of list marker in arrays of LegendAndColor */ |
6485
2c310cd45776
(svn r9666) -Fix (r9651): end of data / column flags were reversed
peter1138
parents:
6483
diff
changeset
|
55 |
#define MKEND() {0, STR_NULL, true, false} |
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
56 |
/** Macro for break marker in arrays of LegendAndColor. |
b7dce828b7a1
(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:
6453
diff
changeset
|
57 |
* It will have valid data, though */ |
6485
2c310cd45776
(svn r9666) -Fix (r9651): end of data / column flags were reversed
peter1138
parents:
6483
diff
changeset
|
58 |
#define MS(a,b) {a, b, false, true} |
0 | 59 |
|
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
60 |
/** Structure for holding relevant data for legends in small map */ |
b7dce828b7a1
(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:
6453
diff
changeset
|
61 |
struct LegendAndColour { |
b7dce828b7a1
(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:
6453
diff
changeset
|
62 |
uint16 colour; ///< color of the item on the map |
b7dce828b7a1
(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:
6453
diff
changeset
|
63 |
StringID legend; ///< string corresponding to the colored item |
b7dce828b7a1
(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:
6453
diff
changeset
|
64 |
bool end; ///< this is the end of the list |
b7dce828b7a1
(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:
6453
diff
changeset
|
65 |
bool col_break; ///< perform a break and go one collumn further |
b7dce828b7a1
(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:
6453
diff
changeset
|
66 |
}; |
b7dce828b7a1
(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:
6453
diff
changeset
|
67 |
|
b7dce828b7a1
(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:
6453
diff
changeset
|
68 |
/** Legend text giving the colours to look for on the minimap */ |
b7dce828b7a1
(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:
6453
diff
changeset
|
69 |
static const LegendAndColour _legend_land_contours[] = { |
4344
7e123fec5b0b
(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
|
70 |
MK(0x5A, STR_00F0_100M), |
7e123fec5b0b
(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
|
71 |
MK(0x5C, STR_00F1_200M), |
7e123fec5b0b
(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
|
72 |
MK(0x5E, STR_00F2_300M), |
7e123fec5b0b
(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
|
73 |
MK(0x1F, STR_00F3_400M), |
7e123fec5b0b
(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
|
74 |
MK(0x27, STR_00F4_500M), |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
75 |
|
4344
7e123fec5b0b
(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
|
76 |
MS(0xD7, STR_00EB_ROADS), |
7e123fec5b0b
(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
|
77 |
MK(0x0A, STR_00EC_RAILROADS), |
7e123fec5b0b
(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
|
78 |
MK(0x98, STR_00ED_STATIONS_AIRPORTS_DOCKS), |
7e123fec5b0b
(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
|
79 |
MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES), |
7e123fec5b0b
(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
|
80 |
MK(0x0F, STR_00EF_VEHICLES), |
0 | 81 |
MKEND() |
82 |
}; |
|
83 |
||
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
84 |
static const LegendAndColour _legend_vehicles[] = { |
4344
7e123fec5b0b
(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(0xB8, STR_00F5_TRAINS), |
7e123fec5b0b
(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(0xBF, STR_00F6_ROAD_VEHICLES), |
7e123fec5b0b
(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(0x98, STR_00F7_SHIPS), |
7e123fec5b0b
(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(0x0F, STR_00F8_AIRCRAFT), |
7e123fec5b0b
(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 |
MS(0xD7, STR_00F9_TRANSPORT_ROUTES), |
7e123fec5b0b
(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
|
90 |
MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES), |
0 | 91 |
MKEND() |
92 |
}; |
|
93 |
||
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
94 |
static const LegendAndColour _legend_industries_normal[] = { |
4344
7e123fec5b0b
(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(0xD7, STR_00FA_COAL_MINE), |
7e123fec5b0b
(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
|
96 |
MK(0xB8, STR_00FB_POWER_STATION), |
7e123fec5b0b
(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
|
97 |
MK(0x56, STR_00FC_FOREST), |
7e123fec5b0b
(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
|
98 |
MK(0xC2, STR_00FD_SAWMILL), |
7e123fec5b0b
(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
|
99 |
MK(0xBF, STR_00FE_OIL_REFINERY), |
7e123fec5b0b
(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(0x0F, STR_0105_BANK), |
0 | 101 |
|
4344
7e123fec5b0b
(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 |
MS(0x30, STR_00FF_FARM), |
7e123fec5b0b
(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(0xAE, STR_0100_FACTORY), |
7e123fec5b0b
(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 |
MK(0x98, STR_0102_OIL_WELLS), |
7e123fec5b0b
(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(0x37, STR_0103_IRON_ORE_MINE), |
7e123fec5b0b
(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
|
106 |
MK(0x0A, STR_0104_STEEL_MILL), |
0 | 107 |
MKEND() |
108 |
}; |
|
109 |
||
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
110 |
static const LegendAndColour _legend_industries_hilly[] = { |
4344
7e123fec5b0b
(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(0xD7, STR_00FA_COAL_MINE), |
7e123fec5b0b
(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(0xB8, STR_00FB_POWER_STATION), |
7e123fec5b0b
(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 |
MK(0x56, STR_00FC_FOREST), |
7e123fec5b0b
(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
|
114 |
MK(0x0A, STR_0106_PAPER_MILL), |
7e123fec5b0b
(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(0xBF, STR_00FE_OIL_REFINERY), |
7e123fec5b0b
(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(0x37, STR_0108_FOOD_PROCESSING_PLANT), |
7e123fec5b0b
(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 |
MS(0x30, STR_00FF_FARM), |
0 | 118 |
|
4344
7e123fec5b0b
(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
|
119 |
MK(0xAE, STR_0101_PRINTING_WORKS), |
7e123fec5b0b
(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
|
120 |
MK(0x98, STR_0102_OIL_WELLS), |
7e123fec5b0b
(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
|
121 |
MK(0xC2, STR_0107_GOLD_MINE), |
7e123fec5b0b
(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
|
122 |
MK(0x0F, STR_0105_BANK), |
0 | 123 |
MKEND() |
124 |
}; |
|
125 |
||
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
126 |
static const LegendAndColour _legend_industries_desert[] = { |
4344
7e123fec5b0b
(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(0xBF, STR_00FE_OIL_REFINERY), |
7e123fec5b0b
(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(0x98, STR_0102_OIL_WELLS), |
7e123fec5b0b
(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 |
MK(0x0F, STR_0105_BANK), |
7e123fec5b0b
(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
|
130 |
MK(0xB8, STR_0109_DIAMOND_MINE), |
7e123fec5b0b
(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(0x37, STR_0108_FOOD_PROCESSING_PLANT), |
7e123fec5b0b
(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(0x0A, STR_010A_COPPER_ORE_MINE), |
7e123fec5b0b
(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(0x30, STR_00FF_FARM), |
7e123fec5b0b
(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 |
MS(0x56, STR_010B_FRUIT_PLANTATION), |
0 | 135 |
|
4344
7e123fec5b0b
(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
|
136 |
MK(0x27, STR_010C_RUBBER_PLANTATION), |
7e123fec5b0b
(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
|
137 |
MK(0x25, STR_010D_WATER_SUPPLY), |
7e123fec5b0b
(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
|
138 |
MK(0xD0, STR_010E_WATER_TOWER), |
7e123fec5b0b
(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(0xAE, STR_0100_FACTORY), |
7e123fec5b0b
(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(0xC2, STR_010F_LUMBER_MILL), |
0 | 141 |
MKEND() |
142 |
}; |
|
143 |
||
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
144 |
static const LegendAndColour _legend_industries_candy[] = { |
4344
7e123fec5b0b
(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
|
145 |
MK(0x30, STR_0110_COTTON_CANDY_FOREST), |
7e123fec5b0b
(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
|
146 |
MK(0xAE, STR_0111_CANDY_FACTORY), |
7e123fec5b0b
(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
|
147 |
MK(0x27, STR_0112_BATTERY_FARM), |
7e123fec5b0b
(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
|
148 |
MK(0x37, STR_0113_COLA_WELLS), |
7e123fec5b0b
(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
|
149 |
MK(0xD0, STR_0114_TOY_SHOP), |
7e123fec5b0b
(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
|
150 |
MK(0x0A, STR_0115_TOY_FACTORY), |
7e123fec5b0b
(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
|
151 |
MS(0x25, STR_0116_PLASTIC_FOUNTAINS), |
0 | 152 |
|
4344
7e123fec5b0b
(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
|
153 |
MK(0xB8, STR_0117_FIZZY_DRINK_FACTORY), |
7e123fec5b0b
(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
|
154 |
MK(0x98, STR_0118_BUBBLE_GENERATOR), |
7e123fec5b0b
(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
|
155 |
MK(0xC2, STR_0119_TOFFEE_QUARRY), |
7e123fec5b0b
(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
|
156 |
MK(0x0F, STR_011A_SUGAR_MINE), |
0 | 157 |
MKEND() |
158 |
}; |
|
159 |
||
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
160 |
static const LegendAndColour _legend_routes[] = { |
4344
7e123fec5b0b
(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
|
161 |
MK(0xD7, STR_00EB_ROADS), |
7e123fec5b0b
(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
|
162 |
MK(0x0A, STR_00EC_RAILROADS), |
7e123fec5b0b
(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
|
163 |
MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES), |
7e123fec5b0b
(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
|
164 |
MS(0x56, STR_011B_RAILROAD_STATION), |
0 | 165 |
|
4344
7e123fec5b0b
(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
|
166 |
MK(0xC2, STR_011C_TRUCK_LOADING_BAY), |
7e123fec5b0b
(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
|
167 |
MK(0xBF, STR_011D_BUS_STATION), |
7e123fec5b0b
(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
|
168 |
MK(0xB8, STR_011E_AIRPORT_HELIPORT), |
7e123fec5b0b
(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
|
169 |
MK(0x98, STR_011F_DOCK), |
0 | 170 |
MKEND() |
171 |
}; |
|
172 |
||
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
173 |
static const LegendAndColour _legend_vegetation[] = { |
4344
7e123fec5b0b
(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
|
174 |
MK(0x52, STR_0120_ROUGH_LAND), |
7e123fec5b0b
(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
|
175 |
MK(0x54, STR_0121_GRASS_LAND), |
7e123fec5b0b
(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
|
176 |
MK(0x37, STR_0122_BARE_LAND), |
7e123fec5b0b
(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
|
177 |
MK(0x25, STR_0123_FIELDS), |
7e123fec5b0b
(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
|
178 |
MK(0x57, STR_0124_TREES), |
7e123fec5b0b
(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
|
179 |
MK(0xD0, STR_00FC_FOREST), |
7e123fec5b0b
(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
|
180 |
MS(0x0A, STR_0125_ROCKS), |
0 | 181 |
|
4344
7e123fec5b0b
(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
|
182 |
MK(0xC2, STR_012A_DESERT), |
7e123fec5b0b
(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
|
183 |
MK(0x98, STR_012B_SNOW), |
7e123fec5b0b
(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
|
184 |
MK(0xD7, STR_00F9_TRANSPORT_ROUTES), |
7e123fec5b0b
(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
|
185 |
MK(0xB5, STR_00EE_BUILDINGS_INDUSTRIES), |
0 | 186 |
MKEND() |
187 |
}; |
|
188 |
||
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
189 |
static const LegendAndColour _legend_land_owners[] = { |
4344
7e123fec5b0b
(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
|
190 |
MK(0xCA, STR_0126_WATER), |
7e123fec5b0b
(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
|
191 |
MK(0x54, STR_0127_NO_OWNER), |
7e123fec5b0b
(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
|
192 |
MK(0xB4, STR_0128_TOWNS), |
7e123fec5b0b
(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
|
193 |
MK(0x20, STR_0129_INDUSTRIES), |
0 | 194 |
MKEND() |
195 |
}; |
|
196 |
#undef MK |
|
197 |
#undef MS |
|
198 |
#undef MKEND |
|
199 |
||
200 |
||
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
201 |
enum { IND_OFFS = 6 }; ///< allow to "jump" to the industries corresponding to the landscape |
b7dce828b7a1
(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:
6453
diff
changeset
|
202 |
|
b7dce828b7a1
(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:
6453
diff
changeset
|
203 |
static const LegendAndColour * const _legend_table[] = { |
0 | 204 |
_legend_land_contours, |
205 |
_legend_vehicles, |
|
206 |
NULL, |
|
207 |
_legend_routes, |
|
208 |
_legend_vegetation, |
|
209 |
_legend_land_owners, |
|
210 |
||
211 |
_legend_industries_normal, |
|
212 |
_legend_industries_hilly, |
|
213 |
_legend_industries_desert, |
|
214 |
_legend_industries_candy, |
|
215 |
}; |
|
216 |
||
2966
661554d683cd
(svn r3529) - Fix: [ 1415782 ] crash in string code with openbsd/zaurus; alignment issues (thanks Tron for the help)
Darkvater
parents:
2955
diff
changeset
|
217 |
#if defined(OTTD_ALIGNMENT) |
2062 | 218 |
static inline void WRITE_PIXELS(Pixel* d, uint32 val) |
0 | 219 |
{ |
220 |
# if defined(TTD_BIG_ENDIAN) |
|
2635 | 221 |
d[0] = GB(val, 24, 8); |
222 |
d[1] = GB(val, 16, 8); |
|
223 |
d[2] = GB(val, 8, 8); |
|
224 |
d[3] = GB(val, 0, 8); |
|
0 | 225 |
# elif defined(TTD_LITTLE_ENDIAN) |
2635 | 226 |
d[0] = GB(val, 0, 8); |
227 |
d[1] = GB(val, 8, 8); |
|
228 |
d[2] = GB(val, 16, 8); |
|
229 |
d[3] = GB(val, 24, 8); |
|
0 | 230 |
# endif |
231 |
} |
|
232 |
||
233 |
/* need to use OR, otherwise we will overwrite the wrong pixels at the edges :( */ |
|
4171 | 234 |
static inline void WRITE_PIXELS_OR(Pixel *d, uint32 val) |
0 | 235 |
{ |
236 |
# if defined(TTD_BIG_ENDIAN) |
|
2635 | 237 |
d[0] |= GB(val, 24, 8); |
238 |
d[1] |= GB(val, 16, 8); |
|
239 |
d[2] |= GB(val, 8, 8); |
|
240 |
d[3] |= GB(val, 0, 8); |
|
0 | 241 |
# elif defined(TTD_LITTLE_ENDIAN) |
2635 | 242 |
d[0] |= GB(val, 0, 8); |
243 |
d[1] |= GB(val, 8, 8); |
|
244 |
d[2] |= GB(val, 16, 8); |
|
245 |
d[3] |= GB(val, 24, 8); |
|
0 | 246 |
# endif |
247 |
} |
|
248 |
#else |
|
4549
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4481
diff
changeset
|
249 |
# define WRITE_PIXELS(dst, val) *(uint32*)(dst) = (val); |
106ed18a7675
(svn r6381) -Cleanup: make the '/* */' comments that span multiple lines more uniform.
rubidium
parents:
4481
diff
changeset
|
250 |
# define WRITE_PIXELS_OR(dst,val) *(uint32*)(dst) |= (val); |
0 | 251 |
#endif |
252 |
||
2984
f9d92e013486
(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
|
253 |
#define MKCOLOR(x) TO_LE32X(x) |
0 | 254 |
|
1918
fb72133270ac
(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
|
255 |
/* Height encodings; 16 levels XXX - needs updating for more/finer heights! */ |
0 | 256 |
static const uint32 _map_height_bits[16] = { |
257 |
MKCOLOR(0x5A5A5A5A), |
|
258 |
MKCOLOR(0x5A5B5A5B), |
|
259 |
MKCOLOR(0x5B5B5B5B), |
|
260 |
MKCOLOR(0x5B5C5B5C), |
|
261 |
MKCOLOR(0x5C5C5C5C), |
|
262 |
MKCOLOR(0x5C5D5C5D), |
|
263 |
MKCOLOR(0x5D5D5D5D), |
|
264 |
MKCOLOR(0x5D5E5D5E), |
|
265 |
MKCOLOR(0x5E5E5E5E), |
|
266 |
MKCOLOR(0x5E5F5E5F), |
|
267 |
MKCOLOR(0x5F5F5F5F), |
|
268 |
MKCOLOR(0x5F1F5F1F), |
|
269 |
MKCOLOR(0x1F1F1F1F), |
|
270 |
MKCOLOR(0x1F271F27), |
|
271 |
MKCOLOR(0x27272727), |
|
272 |
MKCOLOR(0x27272727), |
|
273 |
}; |
|
274 |
||
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
275 |
struct AndOr { |
1511
5917a04566df
(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
|
276 |
uint32 mor; |
5917a04566df
(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
|
277 |
uint32 mand; |
6248
e4a2ed7e5613
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents:
6247
diff
changeset
|
278 |
}; |
1511
5917a04566df
(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
|
279 |
|
4171 | 280 |
static inline uint32 ApplyMask(uint32 colour, const AndOr *mask) |
1511
5917a04566df
(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
|
281 |
{ |
5917a04566df
(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
|
282 |
return (colour & mask->mand) | mask->mor; |
5917a04566df
(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
|
283 |
} |
5917a04566df
(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
|
284 |
|
1918
fb72133270ac
(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
|
285 |
|
1511
5917a04566df
(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
|
286 |
static const AndOr _smallmap_contours_andor[] = { |
4344
7e123fec5b0b
(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
|
287 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
7e123fec5b0b
(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
|
288 |
{MKCOLOR(0x000A0A00), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
289 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
290 |
{MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
291 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
7e123fec5b0b
(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
|
292 |
{MKCOLOR(0x98989898), MKCOLOR(0x00000000)}, |
7e123fec5b0b
(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
|
293 |
{MKCOLOR(0xCACACACA), MKCOLOR(0x00000000)}, |
7e123fec5b0b
(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
|
294 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
7e123fec5b0b
(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
|
295 |
{MKCOLOR(0xB5B5B5B5), MKCOLOR(0x00000000)}, |
7e123fec5b0b
(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
|
296 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
7e123fec5b0b
(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
|
297 |
{MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
298 |
{MKCOLOR(0x000A0A00), MKCOLOR(0xFF0000FF)}, |
0 | 299 |
}; |
300 |
||
1511
5917a04566df
(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
|
301 |
static const AndOr _smallmap_vehicles_andor[] = { |
4344
7e123fec5b0b
(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
|
302 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
7e123fec5b0b
(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
|
303 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
304 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
305 |
{MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
306 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
7e123fec5b0b
(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
|
307 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
308 |
{MKCOLOR(0xCACACACA), MKCOLOR(0x00000000)}, |
7e123fec5b0b
(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
|
309 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
7e123fec5b0b
(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
|
310 |
{MKCOLOR(0xB5B5B5B5), MKCOLOR(0x00000000)}, |
7e123fec5b0b
(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
|
311 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
7e123fec5b0b
(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
|
312 |
{MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
313 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
0 | 314 |
}; |
315 |
||
1511
5917a04566df
(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
|
316 |
static const AndOr _smallmap_vegetation_andor[] = { |
4344
7e123fec5b0b
(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
|
317 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
7e123fec5b0b
(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
|
318 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
319 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
320 |
{MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
321 |
{MKCOLOR(0x00575700), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
322 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
323 |
{MKCOLOR(0xCACACACA), MKCOLOR(0x00000000)}, |
7e123fec5b0b
(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
|
324 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
7e123fec5b0b
(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
|
325 |
{MKCOLOR(0xB5B5B5B5), MKCOLOR(0x00000000)}, |
7e123fec5b0b
(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
|
326 |
{MKCOLOR(0x00000000), MKCOLOR(0xFFFFFFFF)}, |
7e123fec5b0b
(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
|
327 |
{MKCOLOR(0x00B5B500), MKCOLOR(0xFF0000FF)}, |
7e123fec5b0b
(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
|
328 |
{MKCOLOR(0x00D7D700), MKCOLOR(0xFF0000FF)}, |
0 | 329 |
}; |
330 |
||
1918
fb72133270ac
(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
|
331 |
typedef uint32 GetSmallMapPixels(TileIndex tile); // typedef callthrough function |
fb72133270ac
(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 |
|
fb72133270ac
(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
|
333 |
/** |
fb72133270ac
(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
|
334 |
* Draws one column of the small map in a certain mode onto the screen buffer. This |
fb72133270ac
(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 |
* function looks exactly the same for all types |
fb72133270ac
(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 |
* |
fb72133270ac
(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
|
337 |
* @param dst Pointer to a part of the screen buffer to write to. |
fb72133270ac
(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
|
338 |
* @param xc The X coordinate of the first tile in the column. |
fb72133270ac
(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
|
339 |
* @param yc The Y coordinate of the first tile in the column |
fb72133270ac
(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
|
340 |
* @param pitch Number of pixels to advance in the screen buffer each time a pixel is written. |
fb72133270ac
(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
|
341 |
* @param reps Number of lines to draw |
fb72133270ac
(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
|
342 |
* @param mask ? |
fb72133270ac
(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
|
343 |
* @param proc Pointer to the colour function |
fb72133270ac
(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
|
344 |
* @see GetSmallMapPixels(TileIndex) |
fb72133270ac
(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
|
345 |
*/ |
2062 | 346 |
static void DrawSmallMapStuff(Pixel *dst, uint xc, uint yc, int pitch, int reps, uint32 mask, GetSmallMapPixels *proc) |
1918
fb72133270ac
(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
|
347 |
{ |
2062 | 348 |
Pixel *dst_ptr_end = _screen.dst_ptr + _screen.width * _screen.height - _screen.width; |
1918
fb72133270ac
(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
|
349 |
|
fb72133270ac
(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
|
350 |
do { |
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
351 |
/* check if the tile (xc,yc) is within the map range */ |
1919
ca41cc314d40
(svn r2425) - Fix (regression): wrong sprite for level-land cursor (thx Tron)
Darkvater
parents:
1918
diff
changeset
|
352 |
if (xc < MapMaxX() && yc < MapMaxY()) { |
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
353 |
/* check if the dst pointer points to a pixel inside the screen buffer */ |
1918
fb72133270ac
(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 |
if (dst > _screen.dst_ptr && dst < dst_ptr_end) |
1981 | 355 |
WRITE_PIXELS_OR(dst, proc(TileXY(xc, yc)) & mask); |
1918
fb72133270ac
(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 |
} |
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
357 |
/* switch to next tile in the column */ |
1918
fb72133270ac
(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 |
} while (xc++, yc++, dst += pitch, --reps != 0); |
fb72133270ac
(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
|
359 |
} |
fb72133270ac
(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
|
360 |
|
1516
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
361 |
|
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
362 |
static inline TileType GetEffectiveTileType(TileIndex tile) |
0 | 363 |
{ |
1516
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
364 |
TileType t = GetTileType(tile); |
0 | 365 |
|
366 |
if (t == MP_TUNNELBRIDGE) { |
|
3180
9c87ee130147
(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
|
367 |
TransportType tt; |
9c87ee130147
(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
|
368 |
|
3184
118a520164e4
(svn r3830) Move IsTunnelTile() from tile.h to tunnel_map.h and add IsTunnel(), which just checks for a tunnel, but not the tile type as IsTunnelTile() does
tron
parents:
3180
diff
changeset
|
369 |
if (IsTunnel(tile)) { |
118a520164e4
(svn r3830) Move IsTunnelTile() from tile.h to tunnel_map.h and add IsTunnel(), which just checks for a tunnel, but not the tile type as IsTunnelTile() does
tron
parents:
3180
diff
changeset
|
370 |
tt = GetTunnelTransportType(tile); |
118a520164e4
(svn r3830) Move IsTunnelTile() from tile.h to tunnel_map.h and add IsTunnel(), which just checks for a tunnel, but not the tile type as IsTunnelTile() does
tron
parents:
3180
diff
changeset
|
371 |
} else { |
3234
a2791a480b71
(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
|
372 |
tt = GetBridgeTransportType(tile); |
3180
9c87ee130147
(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
|
373 |
} |
9c87ee130147
(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
|
374 |
switch (tt) { |
9c87ee130147
(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
|
375 |
case TRANSPORT_RAIL: t = MP_RAILWAY; break; |
9c87ee130147
(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
|
376 |
case TRANSPORT_ROAD: t = MP_STREET; break; |
9c87ee130147
(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
|
377 |
default: t = MP_WATER; break; |
0 | 378 |
} |
379 |
} |
|
1516
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
380 |
return t; |
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
381 |
} |
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
382 |
|
1918
fb72133270ac
(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 |
/** |
fb72133270ac
(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 a tile would be displayed with in the small map in mode "Contour". |
fb72133270ac
(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 |
* @param tile The tile of which we would like to get the color. |
fb72133270ac
(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
|
386 |
* @return The color of tile in the small map in mode "Contour" |
fb72133270ac
(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
|
387 |
*/ |
1516
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
388 |
static inline uint32 GetSmallMapContoursPixels(TileIndex tile) |
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
389 |
{ |
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
390 |
TileType t = GetEffectiveTileType(tile); |
0 | 391 |
|
1511
5917a04566df
(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
|
392 |
return |
5917a04566df
(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
|
393 |
ApplyMask(_map_height_bits[TileHeight(tile)], &_smallmap_contours_andor[t]); |
0 | 394 |
} |
395 |
||
1918
fb72133270ac
(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
|
396 |
/** |
fb72133270ac
(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
|
397 |
* Return the color a tile would be displayed with in the small map in mode "Vehicles". |
fb72133270ac
(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
|
398 |
* |
6483
ae78fc3c6b20
(svn r9664) -Documentation: Doxygen corrections,errors and omissions
belugas
parents:
6476
diff
changeset
|
399 |
* @param tile The tile of which we would like to get the color. |
1918
fb72133270ac
(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 The color of tile in the small map in mode "Vehicles" |
fb72133270ac
(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
|
401 |
*/ |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
402 |
static inline uint32 GetSmallMapVehiclesPixels(TileIndex tile) |
0 | 403 |
{ |
1516
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
404 |
TileType t = GetEffectiveTileType(tile); |
0 | 405 |
|
1511
5917a04566df
(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
|
406 |
return ApplyMask(MKCOLOR(0x54545454), &_smallmap_vehicles_andor[t]); |
0 | 407 |
} |
408 |
||
1918
fb72133270ac
(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
|
409 |
/** |
fb72133270ac
(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
|
410 |
* Return the color a tile would be displayed with in the small map in mode "Industries". |
fb72133270ac
(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
|
411 |
* |
fb72133270ac
(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
|
412 |
* @param tile The tile of which we would like to get the color. |
fb72133270ac
(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
|
413 |
* @return The color of tile in the small map in mode "Industries" |
fb72133270ac
(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
|
414 |
*/ |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
415 |
static inline uint32 GetSmallMapIndustriesPixels(TileIndex tile) |
0 | 416 |
{ |
1516
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
417 |
TileType t = GetEffectiveTileType(tile); |
0 | 418 |
|
419 |
if (t == MP_INDUSTRY) { |
|
6441
1cb1c647752f
(svn r9578) -Codechange: Cleanup of industry_cmd (Step-10). Use industry's spec map_colour for smallmap industry color code drawing
belugas
parents:
6420
diff
changeset
|
420 |
return GetIndustrySpec(GetIndustryByTile(tile)->type)->map_colour * 0x01010101; |
0 | 421 |
} |
1918
fb72133270ac
(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
|
422 |
|
fb72133270ac
(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
|
423 |
return ApplyMask(MKCOLOR(0x54545454), &_smallmap_vehicles_andor[t]); |
0 | 424 |
} |
425 |
||
1918
fb72133270ac
(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
|
426 |
/** |
fb72133270ac
(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
|
427 |
* Return the color a tile would be displayed with in the small map in mode "Routes". |
fb72133270ac
(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
|
428 |
* |
6483
ae78fc3c6b20
(svn r9664) -Documentation: Doxygen corrections,errors and omissions
belugas
parents:
6476
diff
changeset
|
429 |
* @param tile The tile of which we would like to get the color. |
1918
fb72133270ac
(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
|
430 |
* @return The color of tile in the small map in mode "Routes" |
fb72133270ac
(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
|
431 |
*/ |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
432 |
static inline uint32 GetSmallMapRoutesPixels(TileIndex tile) |
0 | 433 |
{ |
1516
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
434 |
TileType t = GetEffectiveTileType(tile); |
0 | 435 |
uint32 bits; |
436 |
||
437 |
if (t == MP_STATION) { |
|
3338
7cff208f0446
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
438 |
switch (GetStationType(tile)) { |
7cff208f0446
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
439 |
case STATION_RAIL: bits = MKCOLOR(0x56565656); break; |
7cff208f0446
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
440 |
case STATION_AIRPORT: bits = MKCOLOR(0xB8B8B8B8); break; |
7cff208f0446
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
441 |
case STATION_TRUCK: bits = MKCOLOR(0xC2C2C2C2); break; |
7cff208f0446
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
442 |
case STATION_BUS: bits = MKCOLOR(0xBFBFBFBF); break; |
7cff208f0446
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
443 |
case STATION_DOCK: bits = MKCOLOR(0x98989898); break; |
7cff208f0446
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
444 |
default: bits = MKCOLOR(0xFFFFFFFF); break; |
7cff208f0446
(svn r4120) Use the new station functions where appropriate
tron
parents:
3326
diff
changeset
|
445 |
} |
0 | 446 |
} else { |
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
447 |
/* ground color */ |
1511
5917a04566df
(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
|
448 |
bits = ApplyMask(MKCOLOR(0x54545454), &_smallmap_contours_andor[t]); |
0 | 449 |
} |
450 |
return bits; |
|
451 |
} |
|
452 |
||
453 |
||
2955
24de69e236d2
(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
|
454 |
static const uint32 _vegetation_clear_bits[] = { |
1918
fb72133270ac
(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
|
455 |
MKCOLOR(0x54545454), ///< full grass |
fb72133270ac
(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
|
456 |
MKCOLOR(0x52525252), ///< rough land |
fb72133270ac
(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
|
457 |
MKCOLOR(0x0A0A0A0A), ///< rocks |
fb72133270ac
(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
|
458 |
MKCOLOR(0x25252525), ///< fields |
fb72133270ac
(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
|
459 |
MKCOLOR(0x98989898), ///< snow |
fb72133270ac
(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
|
460 |
MKCOLOR(0xC2C2C2C2), ///< desert |
fb72133270ac
(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
|
461 |
MKCOLOR(0x54545454), ///< unused |
fb72133270ac
(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
|
462 |
MKCOLOR(0x54545454), ///< unused |
0 | 463 |
}; |
464 |
||
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
465 |
static inline uint32 GetSmallMapVegetationPixels(TileIndex tile) |
0 | 466 |
{ |
1516
dc914162ad01
(svn r2020) Reduce code duplication in the minimap code a bit
tron
parents:
1515
diff
changeset
|
467 |
TileType t = GetEffectiveTileType(tile); |
0 | 468 |
uint32 bits; |
469 |
||
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
470 |
switch (t) { |
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
471 |
case MP_CLEAR: |
3447 | 472 |
if (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) < 3) { |
2955
24de69e236d2
(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
|
473 |
bits = MKCOLOR(0x37373737); |
24de69e236d2
(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
|
474 |
} else { |
24de69e236d2
(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
|
475 |
bits = _vegetation_clear_bits[GetClearGround(tile)]; |
24de69e236d2
(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
|
476 |
} |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
477 |
break; |
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
478 |
|
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
479 |
case MP_INDUSTRY: |
3499
92f95849788c
(svn r4350) CodeChange : Add and use accessors [G|S]etIndustrype. Define and use IndustryGfx type instead of uint
belugas
parents:
3447
diff
changeset
|
480 |
bits = GetIndustryType(tile) == IT_FOREST ? MKCOLOR(0xD0D0D0D0) : MKCOLOR(0xB5B5B5B5); |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
481 |
break; |
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
482 |
|
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
483 |
case MP_TREES: |
3441
fead68bcb6a3
(svn r4271) s/\<TR_/TREE_/ resp. s/\<TR_/TREE_GROUND/
tron
parents:
3421
diff
changeset
|
484 |
if (GetTreeGround(tile) == TREE_GROUND_SNOW_DESERT) { |
6357
f0f5e7d1713c
(svn r9400) -Codechange: Use some more representative enum names for landscape types.
belugas
parents:
6259
diff
changeset
|
485 |
bits = (_opt.landscape == LT_ARCTIC) ? MKCOLOR(0x98575798) : MKCOLOR(0xC25757C2); |
2951 | 486 |
} else { |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
487 |
bits = MKCOLOR(0x54575754); |
2951 | 488 |
} |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
489 |
break; |
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
490 |
|
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
491 |
default: |
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
492 |
bits = ApplyMask(MKCOLOR(0x54545454), &_smallmap_vehicles_andor[t]); |
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
493 |
break; |
0 | 494 |
} |
495 |
||
496 |
return bits; |
|
497 |
} |
|
498 |
||
499 |
||
4846
8cf926d11bfa
(svn r6772) -Codechange: Do not abuse OWNER_SPECTATOR as the "owner" of the industry for
Darkvater
parents:
4727
diff
changeset
|
500 |
static uint32 _owner_colors[OWNER_END + 1]; |
0 | 501 |
|
1918
fb72133270ac
(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
|
502 |
/** |
fb72133270ac
(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
|
503 |
* Return the color a tile would be displayed with in the small map in mode "Owner". |
fb72133270ac
(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
|
504 |
* |
6483
ae78fc3c6b20
(svn r9664) -Documentation: Doxygen corrections,errors and omissions
belugas
parents:
6476
diff
changeset
|
505 |
* @param tile The tile of which we would like to get the color. |
1918
fb72133270ac
(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
|
506 |
* @return The color of tile in the small map in mode "Owner" |
fb72133270ac
(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
|
507 |
*/ |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
508 |
static inline uint32 GetSmallMapOwnerPixels(TileIndex tile) |
0 | 509 |
{ |
2368
cb44b5c6953d
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
tron
parents:
2332
diff
changeset
|
510 |
Owner o; |
0 | 511 |
|
2368
cb44b5c6953d
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
tron
parents:
2332
diff
changeset
|
512 |
switch (GetTileType(tile)) { |
4846
8cf926d11bfa
(svn r6772) -Codechange: Do not abuse OWNER_SPECTATOR as the "owner" of the industry for
Darkvater
parents:
4727
diff
changeset
|
513 |
case MP_INDUSTRY: o = OWNER_END; break; |
2368
cb44b5c6953d
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
tron
parents:
2332
diff
changeset
|
514 |
case MP_HOUSE: o = OWNER_TOWN; break; |
cb44b5c6953d
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
tron
parents:
2332
diff
changeset
|
515 |
default: o = GetTileOwner(tile); break; |
0 | 516 |
} |
517 |
||
2368
cb44b5c6953d
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
tron
parents:
2332
diff
changeset
|
518 |
return _owner_colors[o]; |
0 | 519 |
} |
520 |
||
521 |
||
522 |
static const uint32 _smallmap_mask_left[3] = { |
|
523 |
MKCOLOR(0xFF000000), |
|
524 |
MKCOLOR(0xFFFF0000), |
|
525 |
MKCOLOR(0xFFFFFF00), |
|
526 |
}; |
|
527 |
||
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
528 |
static const uint32 _smallmap_mask_right[] = { |
0 | 529 |
MKCOLOR(0x000000FF), |
530 |
MKCOLOR(0x0000FFFF), |
|
531 |
MKCOLOR(0x00FFFFFF), |
|
532 |
}; |
|
533 |
||
534 |
/* each tile has 4 x pixels and 1 y pixel */ |
|
535 |
||
1918
fb72133270ac
(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
|
536 |
static GetSmallMapPixels *_smallmap_draw_procs[] = { |
fb72133270ac
(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
|
537 |
GetSmallMapContoursPixels, |
fb72133270ac
(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
|
538 |
GetSmallMapVehiclesPixels, |
fb72133270ac
(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
|
539 |
GetSmallMapIndustriesPixels, |
fb72133270ac
(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
|
540 |
GetSmallMapRoutesPixels, |
fb72133270ac
(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
|
541 |
GetSmallMapVegetationPixels, |
fb72133270ac
(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
|
542 |
GetSmallMapOwnerPixels, |
0 | 543 |
}; |
544 |
||
545 |
static const byte _vehicle_type_colors[6] = { |
|
546 |
184, 191, 152, 15, 215, 184 |
|
547 |
}; |
|
548 |
||
549 |
||
550 |
static void DrawVertMapIndicator(int x, int y, int x2, int y2) |
|
551 |
{ |
|
2951 | 552 |
GfxFillRect(x, y, x2, y + 3, 69); |
553 |
GfxFillRect(x, y2 - 3, x2, y2, 69); |
|
0 | 554 |
} |
555 |
||
556 |
static void DrawHorizMapIndicator(int x, int y, int x2, int y2) |
|
557 |
{ |
|
2951 | 558 |
GfxFillRect(x, y, x + 3, y2, 69); |
559 |
GfxFillRect(x2 - 3, y, x2, y2, 69); |
|
0 | 560 |
} |
561 |
||
1918
fb72133270ac
(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
|
562 |
/** |
fb72133270ac
(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
|
563 |
* Draws the small map. |
fb72133270ac
(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 |
* |
fb72133270ac
(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 |
* Basically, the small map is draw column of pixels by column of pixels. The pixels |
fb72133270ac
(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 |
* are drawn directly into the screen buffer. The final map is drawn in multiple passes. |
fb72133270ac
(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 |
* The passes are: |
fb72133270ac
(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 |
* <ol><li>The colors of tiles in the different modes.</li> |
6488
b6c42e91bb35
(svn r9669) -Documentation: some more doxygen fixes
belugas
parents:
6485
diff
changeset
|
569 |
* <li>Town names (optional)</li></ol> |
1918
fb72133270ac
(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 |
* |
fb72133270ac
(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
|
571 |
* @param dpi pointer to pixel to write onto |
fb72133270ac
(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 |
* @param w pointer to Window struct |
fb72133270ac
(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 type type of map requested (vegetation, owners, routes, etc) |
fb72133270ac
(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 show_towns true if the town names should be displayed, false if not. |
fb72133270ac
(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 |
*/ |
0 | 576 |
static void DrawSmallMap(DrawPixelInfo *dpi, Window *w, int type, bool show_towns) |
577 |
{ |
|
578 |
DrawPixelInfo *old_dpi; |
|
579 |
int dx,dy, x, y, x2, y2; |
|
2062 | 580 |
Pixel *ptr; |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
581 |
int tile_x; |
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
582 |
int tile_y; |
0 | 583 |
ViewPort *vp; |
584 |
||
585 |
old_dpi = _cur_dpi; |
|
586 |
_cur_dpi = dpi; |
|
587 |
||
588 |
/* clear it */ |
|
589 |
GfxFillRect(dpi->left, dpi->top, dpi->left + dpi->width - 1, dpi->top + dpi->height - 1, 0); |
|
590 |
||
591 |
/* setup owner table */ |
|
592 |
if (type == 5) { |
|
4171 | 593 |
const Player *p; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
594 |
|
0 | 595 |
/* fill with some special colors */ |
2368
cb44b5c6953d
(svn r2894) Simplify colouring in owner-mode in the minimap regarding towns and get rid of some magic numbers
tron
parents:
2332
diff
changeset
|
596 |
_owner_colors[OWNER_TOWN] = MKCOLOR(0xB4B4B4B4); |
2332
73edb64097fb
(svn r2858) -Codechange: resolved some magic numbers (_Luca_)
truelight
parents:
2186
diff
changeset
|
597 |
_owner_colors[OWNER_NONE] = MKCOLOR(0x54545454); |
73edb64097fb
(svn r2858) -Codechange: resolved some magic numbers (_Luca_)
truelight
parents:
2186
diff
changeset
|
598 |
_owner_colors[OWNER_WATER] = MKCOLOR(0xCACACACA); |
4847
84e4a64db23c
(svn r6773) -eh...I had to test it didn't i, just forgot to save
Darkvater
parents:
4846
diff
changeset
|
599 |
_owner_colors[OWNER_END] = MKCOLOR(0x20202020); /* industry */ |
0 | 600 |
|
601 |
/* now fill with the player colors */ |
|
602 |
FOR_ALL_PLAYERS(p) { |
|
2951 | 603 |
if (p->is_active) { |
1092 | 604 |
_owner_colors[p->index] = |
4455
f7e53dabbb72
(svn r6238) Use the colour stored in _colour_gradient[] instead of explicitly retrieving it with GetNonSprite()
tron
parents:
4435
diff
changeset
|
605 |
_colour_gradient[p->player_color][5] * 0x01010101; |
2951 | 606 |
} |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
607 |
} |
0 | 608 |
} |
609 |
||
3421
7968a4b5ff0a
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3391
diff
changeset
|
610 |
tile_x = WP(w,smallmap_d).scroll_x / TILE_SIZE; |
7968a4b5ff0a
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3391
diff
changeset
|
611 |
tile_y = WP(w,smallmap_d).scroll_y / TILE_SIZE; |
0 | 612 |
|
613 |
dx = dpi->left + WP(w,smallmap_d).subscroll; |
|
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
614 |
tile_x -= dx / 4; |
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
615 |
tile_y += dx / 4; |
0 | 616 |
dx &= 3; |
617 |
||
618 |
dy = dpi->top; |
|
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
619 |
tile_x += dy / 2; |
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
620 |
tile_y += dy / 2; |
0 | 621 |
|
622 |
if (dy & 1) { |
|
623 |
tile_x++; |
|
624 |
dx += 2; |
|
625 |
if (dx > 3) { |
|
626 |
dx -= 4; |
|
627 |
tile_x--; |
|
628 |
tile_y++; |
|
629 |
} |
|
630 |
} |
|
631 |
||
632 |
ptr = dpi->dst_ptr - dx - 4; |
|
633 |
x = - dx - 4; |
|
634 |
y = 0; |
|
635 |
||
2952 | 636 |
for (;;) { |
2989 | 637 |
uint32 mask = 0xFFFFFFFF; |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
638 |
int reps; |
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
639 |
int t; |
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
640 |
|
0 | 641 |
/* distance from left edge */ |
642 |
if (x < 0) { |
|
643 |
if (x < -3) goto skip_column; |
|
644 |
/* mask to use at the left edge */ |
|
645 |
mask = _smallmap_mask_left[x + 3]; |
|
646 |
} |
|
647 |
||
648 |
/* distance from right edge */ |
|
649 |
t = dpi->width - x; |
|
650 |
if (t < 4) { |
|
2951 | 651 |
if (t <= 0) break; /* exit loop */ |
0 | 652 |
/* mask to use at the right edge */ |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
653 |
mask &= _smallmap_mask_right[t - 1]; |
0 | 654 |
} |
655 |
||
656 |
/* number of lines */ |
|
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
657 |
reps = (dpi->height - y + 1) / 2; |
0 | 658 |
if (reps > 0) { |
659 |
// assert(ptr >= dpi->dst_ptr); |
|
4171 | 660 |
DrawSmallMapStuff(ptr, tile_x, tile_y, dpi->pitch * 2, reps, mask, _smallmap_draw_procs[type]); |
0 | 661 |
} |
662 |
||
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
663 |
skip_column: |
0 | 664 |
if (y == 0) { |
665 |
tile_y++; |
|
666 |
y++; |
|
667 |
ptr += dpi->pitch; |
|
668 |
} else { |
|
669 |
tile_x--; |
|
670 |
y--; |
|
671 |
ptr -= dpi->pitch; |
|
672 |
} |
|
673 |
ptr += 2; |
|
674 |
x += 2; |
|
675 |
} |
|
676 |
||
677 |
/* draw vehicles? */ |
|
678 |
if (type == 0 || type == 1) { |
|
679 |
Vehicle *v; |
|
680 |
bool skip; |
|
681 |
byte color; |
|
682 |
||
683 |
FOR_ALL_VEHICLES(v) { |
|
6259
471b91a4b1d8
(svn r9068) -Codechange: capitalize the VEH_Train etc. enums to match the coding style (and rest of the code).
rubidium
parents:
6248
diff
changeset
|
684 |
if (v->type != VEH_SPECIAL && |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
685 |
(v->vehstatus & (VS_HIDDEN | VS_UNCLICKABLE)) == 0) { |
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
686 |
/* Remap into flat coordinates. */ |
0 | 687 |
Point pt = RemapCoords( |
5096
739033ce923c
(svn r7166) -Fix: [FS#402] MiniMap was misplacing vehicles sometimes (HMage)
KUDr
parents:
5070
diff
changeset
|
688 |
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 |
739033ce923c
(svn r7166) -Fix: [FS#402] MiniMap was misplacing vehicles sometimes (HMage)
KUDr
parents:
5070
diff
changeset
|
689 |
v->y_pos / TILE_SIZE - WP(w,smallmap_d).scroll_y / TILE_SIZE, // dtto |
0 | 690 |
0); |
691 |
x = pt.x; |
|
692 |
y = pt.y; |
|
693 |
||
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
694 |
/* Check if y is out of bounds? */ |
0 | 695 |
y -= dpi->top; |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
696 |
if (!IS_INT_INSIDE(y, 0, dpi->height)) continue; |
0 | 697 |
|
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
698 |
/* Default is to draw both pixels. */ |
0 | 699 |
skip = false; |
700 |
||
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
701 |
/* Offset X coordinate */ |
0 | 702 |
x -= WP(w,smallmap_d).subscroll + 3 + dpi->left; |
703 |
||
704 |
if (x < 0) { |
|
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
705 |
/* if x+1 is 0, that means we're on the very left edge, |
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
706 |
* and should thus only draw a single pixel */ |
2951 | 707 |
if (++x != 0) continue; |
0 | 708 |
skip = true; |
709 |
} else if (x >= dpi->width - 1) { |
|
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
710 |
/* Check if we're at the very right edge, and if so draw only a single pixel */ |
2951 | 711 |
if (x != dpi->width - 1) continue; |
0 | 712 |
skip = true; |
713 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
714 |
|
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
715 |
/* Calculate pointer to pixel and the color */ |
0 | 716 |
ptr = dpi->dst_ptr + y * dpi->pitch + x; |
5955
fe61588d5188
(svn r8621) -Codechange: assigned new numbers to the VEH_(type) enum so that VEH_Train is 0, VEH_Road is 1 and so on
bjarni
parents:
5893
diff
changeset
|
717 |
color = (type == 1) ? _vehicle_type_colors[v->type] : 0xF; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
718 |
|
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
719 |
/* And draw either one or two pixels depending on clipping */ |
0 | 720 |
ptr[0] = color; |
2951 | 721 |
if (!skip) ptr[1] = color; |
0 | 722 |
} |
723 |
} |
|
724 |
} |
|
725 |
||
726 |
if (show_towns) { |
|
1918
fb72133270ac
(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
|
727 |
const Town *t; |
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
728 |
|
0 | 729 |
FOR_ALL_TOWNS(t) { |
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
730 |
/* Remap the town coordinate */ |
4346
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
731 |
Point pt = RemapCoords( |
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
732 |
(int)(TileX(t->xy) * TILE_SIZE - WP(w, smallmap_d).scroll_x) / TILE_SIZE, |
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
733 |
(int)(TileY(t->xy) * TILE_SIZE - WP(w, smallmap_d).scroll_y) / TILE_SIZE, |
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
734 |
0); |
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
735 |
x = pt.x - WP(w,smallmap_d).subscroll + 3 - (t->sign.width_2 >> 1); |
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
736 |
y = pt.y; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
737 |
|
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
738 |
/* Check if the town sign is within bounds */ |
4346
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
739 |
if (x + t->sign.width_2 > dpi->left && |
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
740 |
x < dpi->left + dpi->width && |
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
741 |
y + 6 > dpi->top && |
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
742 |
y < dpi->top + dpi->height) { |
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
743 |
/* And draw it. */ |
4346
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
744 |
SetDParam(0, t->index); |
66105d4f6e83
(svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones
truelight
parents:
4344
diff
changeset
|
745 |
DrawString(x, y, STR_2056, 12); |
0 | 746 |
} |
747 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
748 |
} |
0 | 749 |
|
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
750 |
/* Draw map indicators */ |
0 | 751 |
{ |
752 |
Point pt; |
|
753 |
||
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
754 |
/* Find main viewport. */ |
0 | 755 |
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
|
756 |
|
1515
071fe1565cb8
(svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch
tron
parents:
1511
diff
changeset
|
757 |
pt = RemapCoords(WP(w, smallmap_d).scroll_x, WP(w, smallmap_d).scroll_y, 0); |
0 | 758 |
|
759 |
x = vp->virtual_left - pt.x; |
|
760 |
y = vp->virtual_top - pt.y; |
|
3421
7968a4b5ff0a
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3391
diff
changeset
|
761 |
x2 = (x + vp->virtual_width) / TILE_SIZE; |
7968a4b5ff0a
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3391
diff
changeset
|
762 |
y2 = (y + vp->virtual_height) / TILE_SIZE; |
7968a4b5ff0a
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3391
diff
changeset
|
763 |
x /= TILE_SIZE; |
7968a4b5ff0a
(svn r4246) -Codechange. Replaced about 100 occurences of '16' by TILE_SIZE
celestar
parents:
3391
diff
changeset
|
764 |
y /= TILE_SIZE; |
0 | 765 |
|
766 |
x -= WP(w,smallmap_d).subscroll; |
|
767 |
x2 -= WP(w,smallmap_d).subscroll; |
|
768 |
||
769 |
DrawVertMapIndicator(x, y, x, y2); |
|
770 |
DrawVertMapIndicator(x2, y, x2, y2); |
|
771 |
||
772 |
DrawHorizMapIndicator(x, y, x2, y); |
|
773 |
DrawHorizMapIndicator(x, y2, x2, y2); |
|
774 |
} |
|
775 |
_cur_dpi = old_dpi; |
|
776 |
} |
|
777 |
||
4339
0b1c9f47e69b
(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
|
778 |
void SmallMapCenterOnCurrentPos(Window *w) |
0b1c9f47e69b
(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 |
{ |
0b1c9f47e69b
(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 |
int x, y; |
0b1c9f47e69b
(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 |
ViewPort *vp; |
0b1c9f47e69b
(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 |
vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport; |
0b1c9f47e69b
(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 |
|
0b1c9f47e69b
(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 |
x = ((vp->virtual_width - (w->widget[4].right - w->widget[4].left) * TILE_SIZE) / 2 + vp->virtual_left) / 4; |
0b1c9f47e69b
(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
|
785 |
y = ((vp->virtual_height - (w->widget[4].bottom - w->widget[4].top ) * TILE_SIZE) / 2 + vp->virtual_top ) / 2 - TILE_SIZE * 2; |
0b1c9f47e69b
(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
|
786 |
WP(w, smallmap_d).scroll_x = (y - x) & ~0xF; |
0b1c9f47e69b
(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_y = (x + y) & ~0xF; |
0b1c9f47e69b
(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 |
SetWindowDirty(w); |
0b1c9f47e69b
(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
|
789 |
} |
0b1c9f47e69b
(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 |
|
0 | 791 |
static void SmallMapWindowProc(Window *w, WindowEvent *e) |
792 |
{ |
|
1918
fb72133270ac
(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
|
793 |
switch (e->event) { |
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
794 |
case WE_PAINT: { |
6476
1667135677f7
(svn r9652) -Fix(r9651): "const" keyword forgotten. Spotted by glx.
belugas
parents:
6475
diff
changeset
|
795 |
const LegendAndColour *tbl; |
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
796 |
int x, y, y_org; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
797 |
DrawPixelInfo new_dpi; |
0 | 798 |
|
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
799 |
/* draw the window */ |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
800 |
SetDParam(0, STR_00E5_CONTOURS + _smallmap_type); |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
801 |
DrawWindowWidgets(w); |
0 | 802 |
|
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
803 |
/* draw the legend */ |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
804 |
tbl = _legend_table[(_smallmap_type != 2) ? _smallmap_type : (_opt.landscape + IND_OFFS)]; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
805 |
x = 4; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
806 |
y_org = w->height - 44 - 11; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
807 |
y = y_org; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
808 |
for (;;) { |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
809 |
GfxFillRect(x, y + 1, x + 8, y + 5, 0); |
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
810 |
GfxFillRect(x + 1, y + 2, x + 7, y + 4, tbl->colour); |
b7dce828b7a1
(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:
6453
diff
changeset
|
811 |
DrawString(x + 11, y, tbl->legend, 0); |
0 | 812 |
|
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
813 |
tbl += 1; |
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
814 |
y += 6; |
4339
0b1c9f47e69b
(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
|
815 |
|
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
816 |
if (tbl->end) { // end of the list |
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
817 |
break; |
6475
b7dce828b7a1
(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:
6453
diff
changeset
|
818 |
} else if (tbl->col_break) { |
b7dce828b7a1
(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:
6453
diff
changeset
|
819 |
/* break asked, continue at top, 123 pixels (one "row") to the right */ |
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
820 |
x += 123; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
821 |
y = y_org; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
822 |
} |
4339
0b1c9f47e69b
(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
|
823 |
} |
0b1c9f47e69b
(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
|
824 |
|
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
825 |
if (!FillDrawPixelInfo(&new_dpi, 3, 17, w->width - 28 + 22, w->height - 64 - 11)) |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
826 |
return; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
827 |
|
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
828 |
DrawSmallMap(&new_dpi, w, _smallmap_type, _smallmap_show_towns); |
0 | 829 |
} break; |
830 |
||
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
831 |
case WE_CLICK: |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
832 |
switch (e->we.click.widget) { |
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
833 |
case 4: { // Map window |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
834 |
Window *w2 = FindWindowById(WC_MAIN_WINDOW, 0); |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
835 |
Point pt; |
5127
44b74d23fab1
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
836 |
|
44b74d23fab1
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
837 |
/* |
44b74d23fab1
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
838 |
* XXX: scrolling with the left mouse button is done by subsequently |
44b74d23fab1
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
839 |
* clicking with the left mouse button; clicking once centers the |
44b74d23fab1
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
840 |
* large map at the selected point. So by unclicking the left mouse |
44b74d23fab1
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
841 |
* button here, it gets reclicked during the next inputloop, which |
44b74d23fab1
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
842 |
* would make it look like the mouse is being dragged, while it is |
44b74d23fab1
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
843 |
* actually being (virtually) clicked every inputloop. |
44b74d23fab1
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
844 |
*/ |
44b74d23fab1
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
845 |
_left_button_clicked = false; |
0 | 846 |
|
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
847 |
pt = RemapCoords(WP(w,smallmap_d).scroll_x, WP(w,smallmap_d).scroll_y, 0); |
5127
44b74d23fab1
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
848 |
WP(w2, vp_d).scrollpos_x = pt.x + ((_cursor.pos.x - w->left + 2) << 4) - (w2->viewport->virtual_width >> 1); |
44b74d23fab1
(svn r7208) -Revert [r6040]: Remove double-click action in minimap and reintroduce lmb-scrolling (Rubidium)
Darkvater
parents:
5096
diff
changeset
|
849 |
WP(w2, vp_d).scrollpos_y = pt.y + ((_cursor.pos.y - w->top - 16) << 4) - (w2->viewport->virtual_height >> 1); |
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
850 |
|
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
851 |
SetWindowDirty(w); |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
852 |
} break; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
853 |
|
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
854 |
case 5: // Show land contours |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
855 |
case 6: // Show vehicles |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
856 |
case 7: // Show industries |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
857 |
case 8: // Show transport routes |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
858 |
case 9: // Show vegetation |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
859 |
case 10: // Show land owners |
4719
fc6e14219f72
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
860 |
RaiseWindowWidget(w, _smallmap_type + 5); |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
861 |
_smallmap_type = e->we.click.widget - 5; |
4719
fc6e14219f72
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
862 |
LowerWindowWidget(w, _smallmap_type + 5); |
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
863 |
|
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
864 |
SetWindowDirty(w); |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
865 |
SndPlayFx(SND_15_BEEP); |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
866 |
break; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
867 |
|
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
868 |
case 11: // Center the smallmap again |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
869 |
SmallMapCenterOnCurrentPos(w); |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
870 |
|
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
871 |
SetWindowDirty(w); |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
872 |
SndPlayFx(SND_15_BEEP); |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
873 |
break; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
874 |
|
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
875 |
case 12: // Toggle town names |
4719
fc6e14219f72
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
876 |
ToggleWidgetLoweredState(w, 12); |
fc6e14219f72
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
877 |
_smallmap_show_towns = IsWindowWidgetLowered(w, 12); |
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
878 |
|
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
879 |
SetWindowDirty(w); |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
880 |
SndPlayFx(SND_15_BEEP); |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
881 |
break; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
882 |
} |
0 | 883 |
break; |
884 |
||
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
885 |
case WE_RCLICK: |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
886 |
if (e->we.click.widget == 4) { |
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
887 |
if (_scrolling_viewport) return; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
888 |
_scrolling_viewport = true; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
889 |
_cursor.delta.x = 0; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
890 |
_cursor.delta.y = 0; |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
891 |
} |
4339
0b1c9f47e69b
(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
|
892 |
break; |
0b1c9f47e69b
(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
|
893 |
|
4435
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
894 |
case WE_MOUSELOOP: |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
895 |
/* update the window every now and then */ |
40eff4363774
(svn r6205) -CodeChange : use a switch case instead of a cascade of if
belugas
parents:
4429
diff
changeset
|
896 |
if ((++w->vscroll.pos & 0x1F) == 0) SetWindowDirty(w); |
0 | 897 |
break; |
4335
02934874f33d
(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
|
898 |
|
02934874f33d
(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
|
899 |
case WE_SCROLL: { |
02934874f33d
(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
|
900 |
int x; |
02934874f33d
(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
|
901 |
int y; |
02934874f33d
(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
|
902 |
int sub; |
02934874f33d
(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
|
903 |
int hx; |
02934874f33d
(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
|
904 |
int hy; |
02934874f33d
(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
|
905 |
int hvx; |
02934874f33d
(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
|
906 |
int hvy; |
02934874f33d
(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
|
907 |
|
02934874f33d
(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
|
908 |
_cursor.fix_at = true; |
02934874f33d
(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
|
909 |
|
02934874f33d
(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
|
910 |
x = WP(w, smallmap_d).scroll_x; |
02934874f33d
(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
|
911 |
y = WP(w, smallmap_d).scroll_y; |
02934874f33d
(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
|
912 |
|
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
913 |
sub = WP(w, smallmap_d).subscroll + e->we.scroll.delta.x; |
4335
02934874f33d
(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
|
914 |
|
02934874f33d
(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
|
915 |
x -= (sub >> 2) << 4; |
02934874f33d
(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
|
916 |
y += (sub >> 2) << 4; |
02934874f33d
(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
|
917 |
sub &= 3; |
02934874f33d
(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
|
918 |
|
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
919 |
x += (e->we.scroll.delta.y >> 1) << 4; |
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
920 |
y += (e->we.scroll.delta.y >> 1) << 4; |
4335
02934874f33d
(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
|
921 |
|
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
922 |
if (e->we.scroll.delta.y & 1) { |
4335
02934874f33d
(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
|
923 |
x += TILE_SIZE; |
02934874f33d
(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
|
924 |
sub += 2; |
02934874f33d
(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
|
925 |
if (sub > 3) { |
02934874f33d
(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
|
926 |
sub -= 4; |
02934874f33d
(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
|
927 |
x -= TILE_SIZE; |
02934874f33d
(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
|
928 |
y += TILE_SIZE; |
02934874f33d
(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
|
929 |
} |
02934874f33d
(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
|
930 |
} |
02934874f33d
(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
|
931 |
|
02934874f33d
(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
|
932 |
hx = (w->widget[4].right - w->widget[4].left) / 2; |
02934874f33d
(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
|
933 |
hy = (w->widget[4].bottom - w->widget[4].top ) / 2; |
02934874f33d
(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
|
934 |
hvx = hx * -4 + hy * 8; |
02934874f33d
(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
|
935 |
hvy = hx * 4 + hy * 8; |
02934874f33d
(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
|
936 |
if (x < -hvx) { |
02934874f33d
(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
|
937 |
x = -hvx; |
02934874f33d
(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
|
938 |
sub = 0; |
02934874f33d
(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
|
939 |
} |
02934874f33d
(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
|
940 |
if (x > (int)MapMaxX() * TILE_SIZE - hvx) { |
02934874f33d
(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
|
941 |
x = MapMaxX() * TILE_SIZE - hvx; |
02934874f33d
(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
|
942 |
sub = 0; |
02934874f33d
(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
|
943 |
} |
02934874f33d
(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
|
944 |
if (y < -hvy) { |
02934874f33d
(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
|
945 |
y = -hvy; |
02934874f33d
(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
|
946 |
sub = 0; |
02934874f33d
(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
|
947 |
} |
02934874f33d
(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
|
948 |
if (y > (int)MapMaxY() * TILE_SIZE - hvy) { |
02934874f33d
(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
|
949 |
y = MapMaxY() * TILE_SIZE - hvy; |
02934874f33d
(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
|
950 |
sub = 0; |
02934874f33d
(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
|
951 |
} |
02934874f33d
(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
|
952 |
|
02934874f33d
(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
|
953 |
WP(w, smallmap_d).scroll_x = x; |
02934874f33d
(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
|
954 |
WP(w, smallmap_d).scroll_y = y; |
02934874f33d
(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
|
955 |
WP(w, smallmap_d).subscroll = sub; |
02934874f33d
(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
|
956 |
|
02934874f33d
(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
|
957 |
SetWindowDirty(w); |
02934874f33d
(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
|
958 |
} break; |
0 | 959 |
} |
960 |
} |
|
961 |
||
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
962 |
static const WindowDesc _smallmap_desc = { |
5070
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5045
diff
changeset
|
963 |
WDP_AUTO, WDP_AUTO, 446, 314, |
5893
7e431a4abebb
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
5584
diff
changeset
|
964 |
WC_SMALLMAP, WC_NONE, |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
965 |
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_RESIZABLE, |
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
966 |
_smallmap_widgets, |
0 | 967 |
SmallMapWindowProc |
968 |
}; |
|
969 |
||
6247 | 970 |
void ShowSmallMap() |
0 | 971 |
{ |
972 |
Window *w; |
|
973 |
||
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
974 |
w = AllocateWindowDescFront(&_smallmap_desc, 0); |
4339
0b1c9f47e69b
(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
|
975 |
if (w == NULL) return; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
976 |
|
4719
fc6e14219f72
(svn r6631) -Codechange: Use accessors for click_state.
belugas
parents:
4709
diff
changeset
|
977 |
LowerWindowWidget(w, _smallmap_type + 5); |
4727
6819acce7c57
(svn r6639) -CodeChange : Conversion of SetWidgetLoweredState to SetWindowWidgetLoweredState, in order to follow pre-established standard
belugas
parents:
4719
diff
changeset
|
978 |
SetWindowWidgetLoweredState(w, 12, _smallmap_show_towns); |
4339
0b1c9f47e69b
(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
|
979 |
w->resize.width = 350; |
0b1c9f47e69b
(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
|
980 |
w->resize.height = 250; |
0 | 981 |
|
4339
0b1c9f47e69b
(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
|
982 |
SmallMapCenterOnCurrentPos(w); |
0 | 983 |
} |
984 |
||
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
|
985 |
/* Extra ViewPort Window Stuff */ |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
986 |
static const Widget _extra_view_port_widgets[] = { |
4344
7e123fec5b0b
(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
|
987 |
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, |
7e123fec5b0b
(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
|
988 |
{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 287, 0, 13, STR_EXTRA_VIEW_PORT_TITLE, STR_018C_WINDOW_TITLE_DRAG_THIS}, |
7e123fec5b0b
(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
|
989 |
{ WWT_STICKYBOX, RESIZE_LR, 14, 288, 299, 0, 13, 0x0, STR_STICKY_BUTTON}, |
7e123fec5b0b
(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
|
990 |
{ WWT_PANEL, RESIZE_RB, 14, 0, 299, 14, 233, 0x0, STR_NULL}, |
4939
bef7c24a6027
(svn r6926) -Codechange: Rename WWT_4 to WWT_TEXTBTN_2 and WWT_6 to WWT_INSET (credits to peter1138
Darkvater
parents:
4938
diff
changeset
|
991 |
{ WWT_INSET, RESIZE_RB, 14, 2, 297, 16, 231, 0x0, STR_NULL}, |
5036
2eb10262d2b4
(svn r7078) -Codechange: Make the zoom in/out buttons of the extra viewport into proper push-buttons.
Darkvater
parents:
4939
diff
changeset
|
992 |
{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 0, 21, 234, 255, SPR_IMG_ZOOMIN, STR_017F_ZOOM_THE_VIEW_IN}, |
2eb10262d2b4
(svn r7078) -Codechange: Make the zoom in/out buttons of the extra viewport into proper push-buttons.
Darkvater
parents:
4939
diff
changeset
|
993 |
{ WWT_PUSHIMGBTN, RESIZE_TB, 14, 22, 43, 234, 255, SPR_IMG_ZOOMOUT, STR_0180_ZOOM_THE_VIEW_OUT}, |
4344
7e123fec5b0b
(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
|
994 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 44, 171, 234, 255, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT}, |
7e123fec5b0b
(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
|
995 |
{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 172, 298, 234, 255, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT}, |
7e123fec5b0b
(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
|
996 |
{ WWT_PANEL, RESIZE_RTB, 14, 299, 299, 234, 255, 0x0, STR_NULL}, |
7e123fec5b0b
(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
|
997 |
{ WWT_PANEL, RESIZE_RTB, 14, 0, 287, 256, 267, 0x0, STR_NULL}, |
7e123fec5b0b
(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
|
998 |
{ WWT_RESIZEBOX, RESIZE_LRTB, 14, 288, 299, 256, 267, 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
|
999 |
{ 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
|
1000 |
}; |
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
|
1001 |
|
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
|
1002 |
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
|
1003 |
{ |
1815
733868a48ab3
(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
|
1004 |
switch (e->event) { |
733868a48ab3
(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
|
1005 |
case WE_CREATE: /* Disable zoom in button */ |
4709
a81ab800c25b
(svn r6619) -Codechange: Use accessors for disabled_state.
belugas
parents:
4634
diff
changeset
|
1006 |
DisableWindowWidget(w, 5); |
1815
733868a48ab3
(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
|
1007 |
break; |
4000
4009d092b306
(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
|
1008 |
|
1815
733868a48ab3
(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
|
1009 |
case WE_PAINT: |
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
|
1010 |
// set the number in the title bar |
4000
4009d092b306
(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
|
1011 |
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
|
1012 |
|
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
|
1013 |
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
|
1014 |
DrawWindowViewport(w); |
1815
733868a48ab3
(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
|
1015 |
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
|
1016 |
|
4000
4009d092b306
(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
|
1017 |
case WE_CLICK: |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1018 |
switch (e->we.click.widget) { |
4000
4009d092b306
(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
|
1019 |
case 5: DoZoomInOutWindow(ZOOM_IN, w); break; |
4009d092b306
(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
|
1020 |
case 6: DoZoomInOutWindow(ZOOM_OUT, w); break; |
4009d092b306
(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
|
1021 |
|
1815
733868a48ab3
(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
|
1022 |
case 7: { /* location button (move main view to same spot as this view) 'Paste Location' */ |
733868a48ab3
(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
|
1023 |
Window *w2 = FindWindowById(WC_MAIN_WINDOW, 0); |
733868a48ab3
(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
|
1024 |
int x = WP(w, vp_d).scrollpos_x; // Where is the main looking at |
733868a48ab3
(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
|
1025 |
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
|
1026 |
|
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
1027 |
/* set this view to same location. Based on the center, adjusting for zoom */ |
1815
733868a48ab3
(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
|
1028 |
WP(w2, vp_d).scrollpos_x = x - (w2->viewport->virtual_width - w->viewport->virtual_width) / 2; |
733868a48ab3
(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
|
1029 |
WP(w2, vp_d).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
|
1030 |
} break; |
4000
4009d092b306
(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
|
1031 |
|
1815
733868a48ab3
(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
|
1032 |
case 8: { /* inverse location button (move this view to same spot as main view) 'Copy Location' */ |
4171 | 1033 |
const Window *w2 = FindWindowById(WC_MAIN_WINDOW, 0); |
2548
49c8a096033f
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2368
diff
changeset
|
1034 |
int x = WP(w2, const vp_d).scrollpos_x; |
49c8a096033f
(svn r3077) static, const, bracing, indentation, 0 -> '\0'/NULL, typos in comments, excess empty lines, minor other changes
tron
parents:
2368
diff
changeset
|
1035 |
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
|
1036 |
|
1815
733868a48ab3
(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
|
1037 |
WP(w, vp_d).scrollpos_x = x + (w2->viewport->virtual_width - w->viewport->virtual_width) / 2; |
733868a48ab3
(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
|
1038 |
WP(w, vp_d).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
|
1039 |
} break; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
1040 |
} |
4000
4009d092b306
(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
|
1041 |
break; |
1815
733868a48ab3
(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
|
1042 |
|
733868a48ab3
(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
|
1043 |
case WE_RESIZE: |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1044 |
w->viewport->width += e->we.sizing.diff.x; |
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1045 |
w->viewport->height += e->we.sizing.diff.y; |
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1046 |
w->viewport->virtual_width += e->we.sizing.diff.x; |
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1047 |
w->viewport->virtual_height += e->we.sizing.diff.y; |
1815
733868a48ab3
(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
|
1048 |
break; |
4335
02934874f33d
(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
|
1049 |
|
02934874f33d
(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
|
1050 |
case WE_SCROLL: { |
02934874f33d
(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
|
1051 |
ViewPort *vp = IsPtInWindowViewport(w, _cursor.pos.x, _cursor.pos.y); |
02934874f33d
(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
|
1052 |
|
02934874f33d
(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
|
1053 |
if (vp == NULL) { |
02934874f33d
(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
|
1054 |
_cursor.fix_at = false; |
02934874f33d
(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
|
1055 |
_scrolling_viewport = false; |
02934874f33d
(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
|
1056 |
} |
02934874f33d
(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
|
1057 |
|
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1058 |
WP(w, vp_d).scrollpos_x += e->we.scroll.delta.x << vp->zoom; |
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1059 |
WP(w, vp_d).scrollpos_y += e->we.scroll.delta.y << vp->zoom; |
4335
02934874f33d
(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
|
1060 |
} break; |
4337
e705eef174bf
(svn r6038) -Codechange: move mousewheel code to event WE_MOUSEWHEEL instead of a general function that handles that
truelight
parents:
4335
diff
changeset
|
1061 |
|
e705eef174bf
(svn r6038) -Codechange: move mousewheel code to event WE_MOUSEWHEEL instead of a general function that handles that
truelight
parents:
4335
diff
changeset
|
1062 |
case WE_MOUSEWHEEL: |
4634
07699ac2bf37
(svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct
belugas
parents:
4549
diff
changeset
|
1063 |
ZoomInOrOutToCursorWindow(e->we.wheel.wheel < 0, w); |
4337
e705eef174bf
(svn r6038) -Codechange: move mousewheel code to event WE_MOUSEWHEEL instead of a general function that handles that
truelight
parents:
4335
diff
changeset
|
1064 |
break; |
5045
846098142ffe
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1065 |
|
846098142ffe
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1066 |
|
846098142ffe
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1067 |
case WE_MESSAGE: |
846098142ffe
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1068 |
/* Only handle zoom message if intended for us (msg ZOOM_IN/ZOOM_OUT) */ |
846098142ffe
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1069 |
if (e->we.message.wparam != w->window_number) break; |
846098142ffe
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1070 |
HandleZoomMessage(w, w->viewport, 5, 6); |
846098142ffe
(svn r7094) -Codechange: Get rid of the window-specific code in DoZoomInOutWindow (enable, disable
Darkvater
parents:
5036
diff
changeset
|
1071 |
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
|
1072 |
} |
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
|
1073 |
} |
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
|
1074 |
|
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
|
1075 |
static const WindowDesc _extra_view_port_desc = { |
5070
7f5b13b7e728
(svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1)
Darkvater
parents:
5045
diff
changeset
|
1076 |
WDP_AUTO, WDP_AUTO, 300, 268, |
5893
7e431a4abebb
(svn r8511) -Codechange: make WindowClass an enumerated value.
rubidium
parents:
5584
diff
changeset
|
1077 |
WC_EXTRA_VIEW_PORT, WC_NONE, |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
1078 |
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
|
1079 |
_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
|
1080 |
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
|
1081 |
}; |
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
|
1082 |
|
6247 | 1083 |
void ShowExtraViewPortWindow() |
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
|
1084 |
{ |
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
|
1085 |
Window *w, *v; |
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
|
1086 |
int i = 0; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
1087 |
|
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
1088 |
/* find next free window number for extra viewport */ |
2989 | 1089 |
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
|
1090 |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
1091 |
w = AllocateWindowDescFront(&_extra_view_port_desc, i); |
2989 | 1092 |
if (w != NULL) { |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
856
diff
changeset
|
1093 |
int x, y; |
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
1094 |
/* the main window with the main view */ |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
1095 |
v = FindWindowById(WC_MAIN_WINDOW, 0); |
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
1096 |
/* New viewport start ats (zero,zero) */ |
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
|
1097 |
AssignWindowViewport(w, 3, 17, 294, 214, 0 , 0); |
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
|
1098 |
|
6420
456c275f3313
(svn r9556) -Documentation: doxygen and comment-style changes. 'R', 'S'.. The end of the preliminary work is near
belugas
parents:
6357
diff
changeset
|
1099 |
/* center on same place as main window (zoom is maximum, no adjustment needed) */ |
1815
733868a48ab3
(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
|
1100 |
x = WP(v, vp_d).scrollpos_x; |
733868a48ab3
(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
|
1101 |
y = WP(v, vp_d).scrollpos_y; |
733868a48ab3
(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
|
1102 |
WP(w, vp_d).scrollpos_x = x + (v->viewport->virtual_width - (294)) / 2; |
733868a48ab3
(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
|
1103 |
WP(w, vp_d).scrollpos_y = y + (v->viewport->virtual_height - (214)) / 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
|
1104 |
} |
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
|
1105 |
} |