openttd-ottdgrfs: smallmap_gui.c@fb05044cf5c3 (annotated)

0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	1	#include "stdafx.h"
1891 92a3b0aa0946 (svn r2397) - CodeChange: rename all "ttd" files to "openttd" files. Darkvater parents: 1815 diff changeset	2	#include "openttd.h"
1349 07514c2cc6d1 (svn r1853) Move spritecache function declarations into a header of their own and use SpriteID as parameter type where appropriate tron parents: 1214 diff changeset	3	#include "spritecache.h"
507 8aa8100b0b22 (svn r815) Include strings.h only in the files which need it. tron parents: 500 diff changeset	4	#include "table/strings.h"
679 e959706a3e4d (svn r1117) Move map arrays and some related macros into their own files map.c and map.h tron parents: 541 diff changeset	5	#include "map.h"
1209 a1ac96655b79 (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	6	#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	7	#include "gui.h"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	8	#include "window.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	9	#include "gfx.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	10	#include "viewport.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	11	#include "player.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	12	#include "vehicle.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	13	#include "town.h"
337 66647f97e7c0 (svn r513) Merge revisions 402, 416, 417, 478, 479, 511, 512 from map to trunk tron parents: 193 diff changeset	14	#include "sound.h"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	15
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	16	static const Widget _smallmap_widgets[] = {
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	17	{ WWT_TEXTBTN, RESIZE_NONE, 13, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	18	{ WWT_CAPTION, RESIZE_RIGHT, 13, 11, 433, 0, 13, STR_00B0_MAP,STR_018C_WINDOW_TITLE_DRAG_THIS},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	19	{ WWT_STICKYBOX, RESIZE_LR, 13, 434, 445, 0, 13, 0x0, STR_STICKY_BUTTON},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	20	{ WWT_IMGBTN, RESIZE_RB, 13, 0, 445, 14, 257, 0x0, STR_NULL},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	21	{ WWT_6, RESIZE_RB, 13, 2, 443, 16, 255, 0x0, STR_NULL},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	22	{ WWT_IMGBTN, RESIZE_LRTB, 13, 380, 401, 258, 279, 0x2E2, STR_0191_SHOW_LAND_CONTOURS_ON_MAP},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	23	{ WWT_IMGBTN, RESIZE_LRTB, 13, 402, 423, 258, 279, 0x2E3, STR_0192_SHOW_VEHICLES_ON_MAP},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	24	{ WWT_IMGBTN, RESIZE_LRTB, 13, 424, 445, 258, 279, 0x2E5, STR_0193_SHOW_INDUSTRIES_ON_MAP},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	25	{ WWT_IMGBTN, RESIZE_LRTB, 13, 380, 401, 280, 301, 0x2E4, STR_0194_SHOW_TRANSPORT_ROUTES_ON},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	26	{ WWT_IMGBTN, RESIZE_LRTB, 13, 402, 423, 280, 301, 0x2E6, STR_0195_SHOW_VEGETATION_ON_MAP},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	27	{ WWT_IMGBTN, RESIZE_LRTB, 13, 424, 445, 280, 301, 0x2E7, STR_0196_SHOW_LAND_OWNERS_ON_MAP},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	28	{ WWT_IMGBTN, RESIZE_LRTB, 13, 358, 379, 258, 279, 0x0, STR_NULL},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	29	{ WWT_IMGBTN, RESIZE_LRTB, 13, 358, 379, 280, 301, 0xFED, STR_0197_TOGGLE_TOWN_NAMES_ON_OFF},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	30	{ WWT_IMGBTN, RESIZE_RTB, 13, 0, 357, 258, 301, 0x0, STR_NULL},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	31	{ WWT_PANEL, RESIZE_RTB, 13, 0, 433, 302, 313, 0x0, STR_NULL},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	32	{ WWT_RESIZEBOX, RESIZE_LRTB, 13, 434, 445, 302, 313, 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	33	{ WIDGETS_END},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	34	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	35
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	36	static int _smallmap_type;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	37	static bool _smallmap_show_towns = true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	38
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	39	#define MK(a,b) a,b
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	40	#define MKEND() 0xffff
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	41	#define MS(a,b) (a\|0x100),b
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	42
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	43	static const uint16 _legend_land_contours[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	44	MK(0x5A,STR_00F0_100M),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	45	MK(0x5C,STR_00F1_200M),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	46	MK(0x5E,STR_00F2_300M),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	47	MK(0x1F,STR_00F3_400M),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	48	MK(0x27,STR_00F4_500M),
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	49
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	50	MS(0xD7,STR_00EB_ROADS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	51	MK(0x0A,STR_00EC_RAILROADS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	52	MK(0x98,STR_00ED_STATIONS_AIRPORTS_DOCKS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	53	MK(0xB5,STR_00EE_BUILDINGS_INDUSTRIES),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	54	MK(0x0F,STR_00EF_VEHICLES),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	55	MKEND()
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	56	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	57
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	58	static const uint16 _legend_vehicles[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	59	MK(0xB8,STR_00F5_TRAINS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	60	MK(0xBF,STR_00F6_ROAD_VEHICLES),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	61	MK(0x98,STR_00F7_SHIPS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	62	MK(0x0F,STR_00F8_AIRCRAFT),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	63	MS(0xD7,STR_00F9_TRANSPORT_ROUTES),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	64	MK(0xB5,STR_00EE_BUILDINGS_INDUSTRIES),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	65	MKEND()
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	66	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	67
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	68	static const uint16 _legend_industries_normal[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	69	MK(0xD7,STR_00FA_COAL_MINE),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	70	MK(0xB8,STR_00FB_POWER_STATION),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	71	MK(0x56,STR_00FC_FOREST),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	72	MK(0xC2,STR_00FD_SAWMILL),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	73	MK(0xBF,STR_00FE_OIL_REFINERY),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	74	MK(0x0F,STR_0105_BANK),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	75
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	76	MS(0x30,STR_00FF_FARM),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	77	MK(0xAE,STR_0100_FACTORY),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	78	MK(0x98,STR_0102_OIL_WELLS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	79	MK(0x37,STR_0103_IRON_ORE_MINE),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	80	MK(0x0A,STR_0104_STEEL_MILL),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	81	MKEND()
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	82	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	83
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	84	static const uint16 _legend_industries_hilly[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	85	MK(0xD7,STR_00FA_COAL_MINE),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	86	MK(0xB8,STR_00FB_POWER_STATION),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	87	MK(0x56,STR_00FC_FOREST),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	88	MK(0x0A,STR_0106_PAPER_MILL),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	89	MK(0xBF,STR_00FE_OIL_REFINERY),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	90	MK(0x37,STR_0108_FOOD_PROCESSING_PLANT),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	91	MS(0x30,STR_00FF_FARM),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	92
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	93	MK(0xAE,STR_0101_PRINTING_WORKS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	94	MK(0x98,STR_0102_OIL_WELLS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	95	MK(0xC2,STR_0107_GOLD_MINE),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	96	MK(0x0F,STR_0105_BANK),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	97	MKEND()
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	98	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	99
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	100	static const uint16 _legend_industries_desert[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	101	MK(0xBF,STR_00FE_OIL_REFINERY),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	102	MK(0x98,STR_0102_OIL_WELLS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	103	MK(0x0F,STR_0105_BANK),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	104	MK(0xB8,STR_0109_DIAMOND_MINE),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	105	MK(0x37,STR_0108_FOOD_PROCESSING_PLANT),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	106	MK(0x0A,STR_010A_COPPER_ORE_MINE),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	107	MK(0x30,STR_00FF_FARM),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	108	MS(0x56,STR_010B_FRUIT_PLANTATION),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	109
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	110	MK(0x27,STR_010C_RUBBER_PLANTATION),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	111	MK(0x25,STR_010D_WATER_SUPPLY),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	112	MK(0xD0,STR_010E_WATER_TOWER),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	113	MK(0xAE,STR_0100_FACTORY),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	114	MK(0xC2,STR_010F_LUMBER_MILL),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	115	MKEND()
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	116	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	117
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	118	static const uint16 _legend_industries_candy[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	119	MK(0x30,STR_0110_COTTON_CANDY_FOREST),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	120	MK(0xAE,STR_0111_CANDY_FACTORY),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	121	MK(0x27,STR_0112_BATTERY_FARM),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	122	MK(0x37,STR_0113_COLA_WELLS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	123	MK(0xD0,STR_0114_TOY_SHOP),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	124	MK(0x0A,STR_0115_TOY_FACTORY),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	125	MS(0x25,STR_0116_PLASTIC_FOUNTAINS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	126
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	127	MK(0xB8,STR_0117_FIZZY_DRINK_FACTORY),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	128	MK(0x98,STR_0118_BUBBLE_GENERATOR),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	129	MK(0xC2,STR_0119_TOFFEE_QUARRY),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	130	MK(0x0F,STR_011A_SUGAR_MINE),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	131	MKEND()
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	132	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	133
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	134	static const uint16 _legend_routes[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	135	MK(0xD7,STR_00EB_ROADS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	136	MK(0x0A,STR_00EC_RAILROADS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	137	MK(0xB5,STR_00EE_BUILDINGS_INDUSTRIES),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	138	MS(0x56,STR_011B_RAILROAD_STATION),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	139
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	140	MK(0xC2,STR_011C_TRUCK_LOADING_BAY),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	141	MK(0xBF,STR_011D_BUS_STATION),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	142	MK(0xB8,STR_011E_AIRPORT_HELIPORT),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	143	MK(0x98,STR_011F_DOCK),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	144	MKEND()
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	145	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	146
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	147	static const uint16 _legend_vegetation[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	148	MK(0x52,STR_0120_ROUGH_LAND),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	149	MK(0x54,STR_0121_GRASS_LAND),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	150	MK(0x37,STR_0122_BARE_LAND),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	151	MK(0x25,STR_0123_FIELDS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	152	MK(0x57,STR_0124_TREES),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	153	MK(0xD0,STR_00FC_FOREST),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	154	MS(0x0A,STR_0125_ROCKS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	155
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	156	MK(0xC2,STR_012A_DESERT),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	157	MK(0x98,STR_012B_SNOW),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	158	MK(0xD7,STR_00F9_TRANSPORT_ROUTES),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	159	MK(0xB5,STR_00EE_BUILDINGS_INDUSTRIES),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	160	MKEND()
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	161	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	162
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	163	static const uint16 _legend_land_owners[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	164	MK(0xCA,STR_0126_WATER),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	165	MK(0x54,STR_0127_NO_OWNER),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	166	MK(0xB4,STR_0128_TOWNS),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	167	MK(0x20,STR_0129_INDUSTRIES),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	168	MKEND()
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	169	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	170	#undef MK
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	171	#undef MS
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	172	#undef MKEND
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	173
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	174
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	175	enum { IND_OFFS = 6 };
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	176	static const uint16 * const _legend_table[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	177	_legend_land_contours,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	178	_legend_vehicles,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	179	NULL,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	180	_legend_routes,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	181	_legend_vegetation,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	182	_legend_land_owners,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	183
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	184	_legend_industries_normal,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	185	_legend_industries_hilly,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	186	_legend_industries_desert,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	187	_legend_industries_candy,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	188	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	189
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	190	#if defined(TTD_ALIGNMENT_4)
500 ef288590e096 (svn r793) Merge INLINE -> inline replacement (revision 376) tron parents: 337 diff changeset	191	static inline void WRITE_PIXELS(void *dst, uint32 val)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	192	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	193	byte d = (byte)dst;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	194	# if defined(TTD_BIG_ENDIAN)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	195	d[0] = (byte)(val >> 24);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	196	d[1] = (byte)(val >> 16);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	197	d[2] = (byte)(val >> 8);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	198	d[3] = (byte)(val >> 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	199	# elif defined(TTD_LITTLE_ENDIAN)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	200	d[0] = (byte)(val >> 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	201	d[1] = (byte)(val >> 8);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	202	d[2] = (byte)(val >> 16);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	203	d[3] = (byte)(val >> 24);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	204	# endif
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	205	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	206
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	207	/* need to use OR, otherwise we will overwrite the wrong pixels at the edges :( */
500 ef288590e096 (svn r793) Merge INLINE -> inline replacement (revision 376) tron parents: 337 diff changeset	208	static inline void WRITE_PIXELS_OR(void *dst, uint32 val)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	209	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	210	byte d = (byte)dst;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	211	# if defined(TTD_BIG_ENDIAN)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	212	d[0] \|= (byte)(val >> 24);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	213	d[1] \|= (byte)(val >> 16);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	214	d[2] \|= (byte)(val >> 8);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	215	d[3] \|= (byte)(val >> 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	216	# elif defined(TTD_LITTLE_ENDIAN)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	217	d[0] \|= (byte)(val >> 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	218	d[1] \|= (byte)(val >> 8);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	219	d[2] \|= (byte)(val >> 16);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	220	d[3] \|= (byte)(val >> 24);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	221	# endif
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	222	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	223	#else
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	224	# define WRITE_PIXELS(dst, val) (uint32)(dst) = (val);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	225	# define WRITE_PIXELS_OR(dst,val) (uint32)(dst) \|= (val);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	226	#endif
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	227
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	228	#if defined(TTD_BIG_ENDIAN)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	229	# define MKCOLOR(x) BSWAP32(x)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	230	#elif defined(TTD_LITTLE_ENDIAN)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	231	# define MKCOLOR(x) (x)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	232	#endif
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	233
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	234	static const uint32 _map_height_bits[16] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	235	MKCOLOR(0x5A5A5A5A),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	236	MKCOLOR(0x5A5B5A5B),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	237	MKCOLOR(0x5B5B5B5B),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	238	MKCOLOR(0x5B5C5B5C),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	239	MKCOLOR(0x5C5C5C5C),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	240	MKCOLOR(0x5C5D5C5D),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	241	MKCOLOR(0x5D5D5D5D),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	242	MKCOLOR(0x5D5E5D5E),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	243	MKCOLOR(0x5E5E5E5E),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	244	MKCOLOR(0x5E5F5E5F),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	245	MKCOLOR(0x5F5F5F5F),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	246	MKCOLOR(0x5F1F5F1F),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	247	MKCOLOR(0x1F1F1F1F),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	248	MKCOLOR(0x1F271F27),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	249	MKCOLOR(0x27272727),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	250	MKCOLOR(0x27272727),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	251	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	252
1511 32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	253	typedef struct AndOr {
32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	254	uint32 mor;
32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	255	uint32 mand;
32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	256	} AndOr;
32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	257
32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	258	static inline uint32 ApplyMask(uint32 colour, const AndOr* mask)
32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	259	{
32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	260	return (colour & mask->mand) \| mask->mor;
32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	261	}
32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	262
32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	263	static const AndOr _smallmap_contours_andor[] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	264	{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	265	{MKCOLOR(0x000A0A00),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	266	{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	267	{MKCOLOR(0x00B5B500),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	268	{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	269	{MKCOLOR(0x98989898),MKCOLOR(0x00000000)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	270	{MKCOLOR(0xCACACACA),MKCOLOR(0x00000000)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	271	{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	272	{MKCOLOR(0xB5B5B5B5),MKCOLOR(0x00000000)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	273	{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	274	{MKCOLOR(0x00B5B500),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	275	{MKCOLOR(0x000A0A00),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	276	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	277
1511 32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	278	static const AndOr _smallmap_vehicles_andor[] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	279	{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	280	{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	281	{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	282	{MKCOLOR(0x00B5B500),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	283	{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	284	{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	285	{MKCOLOR(0xCACACACA),MKCOLOR(0x00000000)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	286	{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	287	{MKCOLOR(0xB5B5B5B5),MKCOLOR(0x00000000)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	288	{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	289	{MKCOLOR(0x00B5B500),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	290	{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	291	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	292
1511 32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	293	static const AndOr _smallmap_vegetation_andor[] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	294	{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	295	{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	296	{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	297	{MKCOLOR(0x00B5B500),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	298	{MKCOLOR(0x00575700),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	299	{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	300	{MKCOLOR(0xCACACACA),MKCOLOR(0x00000000)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	301	{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	302	{MKCOLOR(0xB5B5B5B5),MKCOLOR(0x00000000)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	303	{MKCOLOR(0x00000000),MKCOLOR(0xFFFFFFFF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	304	{MKCOLOR(0x00B5B500),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	305	{MKCOLOR(0x00D7D700),MKCOLOR(0xFF0000FF)},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	306	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	307
1516 997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	308
997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	309	static inline TileType GetEffectiveTileType(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	310	{
1516 997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	311	TileType t = GetTileType(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	312
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	313	if (t == MP_TUNNELBRIDGE) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	314	t = _map5[tile];
1516 997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	315	if ((t & 0x80) == 0) t >>= 1;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	316	if ((t & 6) == 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	317	t = MP_RAILWAY;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	318	} else if ((t & 6) == 2) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	319	t = MP_STREET;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	320	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	321	t = MP_WATER;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	322	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	323	}
1516 997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	324	return t;
997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	325	}
997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	326
997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	327
997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	328	static inline uint32 GetSmallMapContoursPixels(TileIndex tile)
997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	329	{
997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	330	TileType t = GetEffectiveTileType(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	331
1511 32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	332	return
32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	333	ApplyMask(_map_height_bits[TileHeight(tile)], &_smallmap_contours_andor[t]);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	334	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	335
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	336	static void DrawSmallMapContours(byte *dst, uint xc, uint yc, int pitch, int reps, uint32 mask)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	337	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	338	do {
856 07dc27d0503e (svn r1337) Use MapMax[XY]() (or MapSize[XY]() if appropriate) instead of TILE_MAX_[XY] tron parents: 758 diff changeset	339	if (xc < MapMaxX() && yc < MapMaxY())
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	340	if (dst > _screen.dst_ptr && dst < (_screen.dst_ptr + _screen.width * _screen.height - _screen.width))
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	341	WRITE_PIXELS_OR(dst, GetSmallMapContoursPixels(TILE_XY(xc,yc)) & mask);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	342	} while (xc++,yc++,dst+=pitch,--reps != 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	343	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	344
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	345
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	346	static inline uint32 GetSmallMapVehiclesPixels(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	347	{
1516 997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	348	TileType t = GetEffectiveTileType(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	349
1511 32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	350	return ApplyMask(MKCOLOR(0x54545454), &_smallmap_vehicles_andor[t]);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	351	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	352
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	353
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	354	static void DrawSmallMapVehicles(byte *dst, uint xc, uint yc, int pitch, int reps, uint32 mask)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	355	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	356	do {
856 07dc27d0503e (svn r1337) Use MapMax[XY]() (or MapSize[XY]() if appropriate) instead of TILE_MAX_[XY] tron parents: 758 diff changeset	357	if (xc < MapMaxX() && yc < MapMaxY())
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	358	WRITE_PIXELS_OR( dst, GetSmallMapVehiclesPixels(TILE_XY(xc,yc)) & mask );
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	359	} while (xc++,yc++,dst+=pitch,--reps != 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	360	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	361
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	362	static const byte _industry_smallmap_colors[175] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	363	215,215,215,215,215,215,215,184,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	364	184,184,184,194,194,194,194,194,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	365	86, 86,191,191,191,191,191,191,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	366	152,152,152,152,152,152,152,152,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	367	152, 48, 48, 48, 48, 48, 48,174,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	368	174,174,174,174,174,174,174, 10,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	369	10, 10, 10, 10, 10, 10, 10, 10,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	370	10, 10, 15, 15, 55, 55, 55, 55,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	371	10, 10, 10, 10, 10, 10, 10, 10,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	372	194,194,194,194,194,194,194,194,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	373	194,194,194,194,194,194,194,194,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	374	194, 15, 15,184,184,184,184,184,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	375	184,184,184,184, 55, 55, 55, 55,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	376	55, 55, 55, 55, 55, 55, 55, 55,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	377	55, 55, 55, 55, 86, 39, 37, 37,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	378	208,174,174,174,174,194,194,194,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	379	194, 48, 48,174,174,174,174, 39,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	380	39, 55,208,208,208,208, 10, 10,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	381	10, 10, 10, 10, 37, 37, 37, 37,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	382	37, 37, 37, 37,184,184,184,184,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	383	152,152,152,152,194,194,194, 15,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	384	15, 15, 15, 15, 15, 15, 15,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	385	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	386
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	387	static inline uint32 GetSmallMapIndustriesPixels(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	388	{
1516 997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	389	TileType t = GetEffectiveTileType(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	390
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	391	if (t == MP_INDUSTRY) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	392	byte color = _industry_smallmap_colors[_map5[tile]];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	393	return color + (color << 8) + (color << 16) + (color << 24);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	394	} else {
1511 32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	395	return ApplyMask(MKCOLOR(0x54545454), &_smallmap_vehicles_andor[t]);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	396	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	397	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	398
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	399	static void DrawSmallMapIndustries(byte *dst, uint xc, uint yc, int pitch, int reps, uint32 mask)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	400	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	401	do {
856 07dc27d0503e (svn r1337) Use MapMax[XY]() (or MapSize[XY]() if appropriate) instead of TILE_MAX_[XY] tron parents: 758 diff changeset	402	if (xc < MapMaxX() && yc < MapMaxY())
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	403	WRITE_PIXELS_OR(dst, GetSmallMapIndustriesPixels(TILE_XY(xc,yc)) & mask);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	404	} while (xc++,yc++,dst+=pitch,--reps != 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	405	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	406
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	407	static inline uint32 GetSmallMapRoutesPixels(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	408	{
1516 997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	409	TileType t = GetEffectiveTileType(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	410	uint32 bits;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	411
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	412	if (t == MP_STATION) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	413	byte m5 = _map5[tile];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	414	(bits = MKCOLOR(0x56565656), m5 < 8) \|\| // 8 - railroad station (green)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	415	(bits = MKCOLOR(0xB8B8B8B8), m5 < 0x43) \|\| // 67 - airport (red)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	416	(bits = MKCOLOR(0xC2C2C2C2), m5 < 0x47) \|\| // 71 - truck loading bay (orange)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	417	(bits = MKCOLOR(0xBFBFBFBF), m5 < 0x4B) \|\| // 75 - bus station (yellow)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	418	(bits = MKCOLOR(0x98989898), m5 < 0x53) \|\| // 83 - docks (blue)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	419	(bits = MKCOLOR(0xB8B8B8B8), m5 < 0x73) \|\| // 115 - airport (red) (new airports)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	420	(bits = MKCOLOR(0xFFFFFFFF), true); // all others
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	421	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	422	// ground color
1511 32b095e3da76 (svn r2015) Use a struct and an inline function for colour masking on the mini-map - this should improve readability a bit tron parents: 1350 diff changeset	423	bits = ApplyMask(MKCOLOR(0x54545454), &_smallmap_contours_andor[t]);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	424	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	425	return bits;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	426	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	427
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	428	static void DrawSmallMapRoutes(byte *dst, uint xc, uint yc, int pitch, int reps, uint32 mask)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	429	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	430	do {
856 07dc27d0503e (svn r1337) Use MapMax[XY]() (or MapSize[XY]() if appropriate) instead of TILE_MAX_[XY] tron parents: 758 diff changeset	431	if (xc < MapMaxX() && yc < MapMaxY())
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	432	WRITE_PIXELS_OR(dst, GetSmallMapRoutesPixels(TILE_XY(xc,yc)) & mask);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	433	} while (xc++,yc++,dst+=pitch,--reps != 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	434	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	435
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	436	static const uint32 _vegetation_clear_bits[4 + 7] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	437	MKCOLOR(0x37373737),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	438	MKCOLOR(0x37373737),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	439	MKCOLOR(0x37373737),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	440	MKCOLOR(0x54545454),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	441
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	442	MKCOLOR(0x52525252),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	443	MKCOLOR(0x0A0A0A0A),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	444	MKCOLOR(0x25252525),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	445	MKCOLOR(0x98989898),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	446	MKCOLOR(0xC2C2C2C2),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	447	MKCOLOR(0x54545454),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	448	MKCOLOR(0x54545454),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	449	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	450
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	451	static inline uint32 GetSmallMapVegetationPixels(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	452	{
1516 997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	453	TileType t = GetEffectiveTileType(tile);
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	454	int i;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	455	uint32 bits;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	456
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	457	switch (t) {
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	458	case MP_CLEAR:
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	459	i = (_map5[tile] & 0x1F) - 4;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	460	if (i >= 0) i >>= 2;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	461	bits = _vegetation_clear_bits[i + 4];
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	462	break;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	463
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	464	case MP_INDUSTRY:
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	465	bits = IS_BYTE_INSIDE(_map5[tile], 0x10, 0x12) ? MKCOLOR(0xD0D0D0D0) : MKCOLOR(0xB5B5B5B5);
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	466	break;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	467
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	468	case MP_TREES:
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	469	if ((_map2[tile] & 0x30) == 0x20)
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	470	bits = (_opt.landscape == LT_HILLY) ? MKCOLOR(0x98575798) : MKCOLOR(0xC25757C2);
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	471	else
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	472	bits = MKCOLOR(0x54575754);
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	473	break;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	474
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	475	default:
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	476	bits = ApplyMask(MKCOLOR(0x54545454), &_smallmap_vehicles_andor[t]);
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	477	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	478	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	479
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	480	return bits;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	481	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	482
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	483
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	484	static void DrawSmallMapVegetation(byte *dst, uint xc, uint yc, int pitch, int reps, uint32 mask)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	485	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	486	do {
856 07dc27d0503e (svn r1337) Use MapMax[XY]() (or MapSize[XY]() if appropriate) instead of TILE_MAX_[XY] tron parents: 758 diff changeset	487	if (xc < MapMaxX() && yc < MapMaxY())
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	488	WRITE_PIXELS_OR(dst, GetSmallMapVegetationPixels(TILE_XY(xc,yc)) & mask);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	489	} while (xc++,yc++,dst+=pitch,--reps != 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	490	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	491
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	492
1092 9adcd7820373 (svn r1593) Remove yet another alloca() tron parents: 1044 diff changeset	493	static uint32 _owner_colors[256];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	494
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	495	static inline uint32 GetSmallMapOwnerPixels(TileIndex tile)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	496	{
1516 997a23b8b16c (svn r2020) Reduce code duplication in the minimap code a bit tron parents: 1515 diff changeset	497	TileType t = GetTileType(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	498
1901 fb05044cf5c3 (svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner tron parents: 1891 diff changeset	499	if (t == MP_INDUSTRY) {
fb05044cf5c3 (svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner tron parents: 1891 diff changeset	500	t = 0xff;
fb05044cf5c3 (svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner tron parents: 1891 diff changeset	501	} else if (t == MP_HOUSE \|\| IsTileOwner(tile, OWNER_TOWN)) {
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	502	t = 0x80;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	503	} else {
1901 fb05044cf5c3 (svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner tron parents: 1891 diff changeset	504	t = GetTileOwner(tile);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	505	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	506
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	507	return _owner_colors[t];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	508	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	509
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	510
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	511	static void DrawSmallMapOwners(byte *dst, uint xc, uint yc, int pitch, int reps, uint32 mask)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	512	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	513	do {
856 07dc27d0503e (svn r1337) Use MapMax[XY]() (or MapSize[XY]() if appropriate) instead of TILE_MAX_[XY] tron parents: 758 diff changeset	514	if (xc < MapMaxX() && yc < MapMaxY())
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	515	WRITE_PIXELS_OR(dst, GetSmallMapOwnerPixels(TILE_XY(xc,yc)) & mask);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	516	} while (xc++,yc++,dst+=pitch,--reps != 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	517	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	518
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	519
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	520	static const uint32 _smallmap_mask_left[3] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	521	MKCOLOR(0xFF000000),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	522	MKCOLOR(0xFFFF0000),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	523	MKCOLOR(0xFFFFFF00),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	524	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	525
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	526	static const uint32 _smallmap_mask_right[] = {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	527	MKCOLOR(0x000000FF),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	528	MKCOLOR(0x0000FFFF),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	529	MKCOLOR(0x00FFFFFF),
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	530	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	531
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	532	/* each tile has 4 x pixels and 1 y pixel */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	533
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	534	typedef void SmallmapDrawProc(byte *dst, uint xc, uint yc, int pitch, int reps, uint32 mask);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	535
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	536	static SmallmapDrawProc *_smallmap_draw_procs[] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	537	DrawSmallMapContours,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	538	DrawSmallMapVehicles,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	539	DrawSmallMapIndustries,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	540	DrawSmallMapRoutes,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	541	DrawSmallMapVegetation,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	542	DrawSmallMapOwners,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	543	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	544
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	545	static const byte _vehicle_type_colors[6] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	546	184, 191, 152, 15, 215, 184
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	547	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	548
500 ef288590e096 (svn r793) Merge INLINE -> inline replacement (revision 376) tron parents: 337 diff changeset	549	static inline uint32 dup_byte32(byte b) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	550	return b + (b << 8) + (b << 16) + (b << 24);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	551	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	552
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	553	static void DrawVertMapIndicator(int x, int y, int x2, int y2)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	554	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	555	GfxFillRect(x, y, x2, y + 3, 69);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	556	GfxFillRect(x, y2 - 3, x2, y2, 69);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	557	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	558
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	559	static void DrawHorizMapIndicator(int x, int y, int x2, int y2)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	560	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	561	GfxFillRect(x, y, x + 3, y2, 69);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	562	GfxFillRect(x2 - 3, y, x2, y2, 69);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	563	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	564
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	565	static void DrawSmallMap(DrawPixelInfo dpi, Window w, int type, bool show_towns)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	566	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	567	DrawPixelInfo *old_dpi;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	568	int dx,dy, x, y, x2, y2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	569	byte *ptr;
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	570	int tile_x;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	571	int tile_y;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	572	SmallmapDrawProc *proc;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	573	ViewPort *vp;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	574
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	575	old_dpi = _cur_dpi;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	576	_cur_dpi = dpi;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	577
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	578	/* clear it */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	579	GfxFillRect(dpi->left, dpi->top, dpi->left + dpi->width - 1, dpi->top + dpi->height - 1, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	580
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	581	/* setup owner table */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	582	if (type == 5) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	583	Player *p;
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	584
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	585	/* clear the town colors */
1092 9adcd7820373 (svn r1593) Remove yet another alloca() tron parents: 1044 diff changeset	586	memset(&_owner_colors[128], 0xB4, 128 * sizeof(*_owner_colors));
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	587
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	588	/* fill with some special colors */
1092 9adcd7820373 (svn r1593) Remove yet another alloca() tron parents: 1044 diff changeset	589	_owner_colors[0x10] = MKCOLOR(0x54545454);
9adcd7820373 (svn r1593) Remove yet another alloca() tron parents: 1044 diff changeset	590	_owner_colors[0x11] = MKCOLOR(0xCACACACA);
9adcd7820373 (svn r1593) Remove yet another alloca() tron parents: 1044 diff changeset	591	_owner_colors[0xff] = MKCOLOR(0x20202020); /* industry */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	592
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	593	/* now fill with the player colors */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	594	FOR_ALL_PLAYERS(p) {
1092 9adcd7820373 (svn r1593) Remove yet another alloca() tron parents: 1044 diff changeset	595	if (p->is_active)
9adcd7820373 (svn r1593) Remove yet another alloca() tron parents: 1044 diff changeset	596	_owner_colors[p->index] =
1350 067b22970f19 (svn r1854) Split GetSpritePtr() into GetSprite() for regular sprites (returning a Sprite) and GetNonSprite() for "sprites" of type 0xFF (returning byte) tron parents: 1349 diff changeset	597	dup_byte32(GetNonSprite(0x307 + p->player_color)[0xCB]);
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	598	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	599	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	600
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	601	tile_x = WP(w,smallmap_d).scroll_x / 16;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	602	tile_y = WP(w,smallmap_d).scroll_y / 16;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	603
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	604	dx = dpi->left + WP(w,smallmap_d).subscroll;
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	605	tile_x -= dx / 4;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	606	tile_y += dx / 4;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	607	dx &= 3;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	608
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	609	dy = dpi->top;
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	610	tile_x += dy / 2;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	611	tile_y += dy / 2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	612
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	613	if (dy & 1) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	614	tile_x++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	615	dx += 2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	616	if (dx > 3) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	617	dx -= 4;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	618	tile_x--;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	619	tile_y++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	620	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	621	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	622
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	623	proc = _smallmap_draw_procs[type];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	624
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	625	ptr = dpi->dst_ptr - dx - 4;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	626	x = - dx - 4;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	627	y = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	628
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	629	for(;;) {
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	630	uint32 mask;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	631	int reps;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	632	int t;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	633
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	634	mask = 0xFFFFFFFF;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	635
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	636	/* distance from left edge */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	637	if (x < 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	638	if (x < -3) goto skip_column;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	639	/* mask to use at the left edge */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	640	mask = _smallmap_mask_left[x + 3];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	641	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	642
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	643	/* distance from right edge */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	644	t = dpi->width - x;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	645	if (t < 4) {
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	646	if (t <= 0)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	647	break; /* exit loop */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	648	/* mask to use at the right edge */
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	649	mask &= _smallmap_mask_right[t - 1];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	650	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	651
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	652	/* number of lines */
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	653	reps = (dpi->height - y + 1) / 2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	654	if (reps > 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	655	// assert(ptr >= dpi->dst_ptr);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	656	proc(ptr, tile_x, tile_y, dpi->pitch*2, reps, mask);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	657	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	658
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	659	skip_column:
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	660	if (y == 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	661	tile_y++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	662	y++;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	663	ptr += dpi->pitch;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	664	} else {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	665	tile_x--;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	666	y--;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	667	ptr -= dpi->pitch;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	668	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	669	ptr += 2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	670	x += 2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	671	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	672
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	673	/* draw vehicles? */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	674	if (type == 0 \|\| type == 1) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	675	Vehicle *v;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	676	bool skip;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	677	byte color;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	678
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	679	FOR_ALL_VEHICLES(v) {
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	680	if (v->type != 0 && v->type != VEH_Special &&
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	681	(v->vehstatus & (VS_HIDDEN \| VS_UNCLICKABLE)) == 0) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	682	// Remap into flat coordinates.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	683	Point pt = RemapCoords(
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	684	(v->x_pos - WP(w,smallmap_d).scroll_x) / 16,
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	685	(v->y_pos - WP(w,smallmap_d).scroll_y) / 16,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	686	0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	687	x = pt.x;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	688	y = pt.y;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	689
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	690	// Check if y is out of bounds?
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	691	y -= dpi->top;
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	692	if (!IS_INT_INSIDE(y, 0, dpi->height)) continue;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	693
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	694	// Default is to draw both pixels.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	695	skip = false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	696
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	697	// Offset X coordinate
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	698	x -= WP(w,smallmap_d).subscroll + 3 + dpi->left;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	699
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	700	if (x < 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	701	// if x+1 is 0, that means we're on the very left edge,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	702	// and should thus only draw a single pixel
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	703	if (++x != 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	704	continue;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	705	skip = true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	706	} else if (x >= dpi->width - 1) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	707	// Check if we're at the very right edge, and if so draw only a single pixel
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	708	if (x != dpi->width - 1)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	709	continue;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	710	skip = true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	711	}
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	712
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	713	// Calculate pointer to pixel and the color
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	714	ptr = dpi->dst_ptr + y * dpi->pitch + x;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	715	color = (type == 1) ? _vehicle_type_colors[v->type-0x10] : 0xF;
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	716
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	717	// And draw either one or two pixels depending on clipping
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	718	ptr[0] = color;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	719	if (!skip)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	720	ptr[1] = color;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	721	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	722	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	723	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	724
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	725	if (show_towns) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	726	Town *t;
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	727
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	728	FOR_ALL_TOWNS(t) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	729	if (t->xy != 0) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	730	// Remap the town coordinate
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	731	Point pt = RemapCoords(
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	732	(int)(TileX(t->xy) * 16 - WP(w, smallmap_d).scroll_x) / 16,
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	733	(int)(TileY(t->xy) * 16 - WP(w, smallmap_d).scroll_y) / 16,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	734	0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	735	x = pt.x - WP(w,smallmap_d).subscroll + 3 - (t->sign.width_2 >> 1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: 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
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	738	// Check if the town sign is within bounds
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	739	if (x + t->sign.width_2 > dpi->left &&
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	740	x < dpi->left + dpi->width &&
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	741	y + 6 > dpi->top &&
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	742	y < dpi->top + dpi->height) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	743	// And draw it.
534 17ab2f22ff74 (svn r901) Small step in the process to clean up the DPARAM mess: tron parents: 507 diff changeset	744	SetDParam(0, t->index);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	745	DrawString(x, y, STR_2056, 12);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	746	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	747	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	748	}
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	749	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	750
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	751	// Draw map indicators
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	752	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	753	Point pt;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	754
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	755	// Find main viewport.
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	756	vp = FindWindowById(WC_MAIN_WINDOW,0)->viewport;
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	757
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	758	pt = RemapCoords(WP(w, smallmap_d).scroll_x, WP(w, smallmap_d).scroll_y, 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	759
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	760	x = vp->virtual_left - pt.x;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	761	y = vp->virtual_top - pt.y;
1515 f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	762	x2 = (x + vp->virtual_width) / 16;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	763	y2 = (y + vp->virtual_height) / 16;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	764	x /= 16;
f466d02bd936 (svn r2019) Miscellaneous cleanups, like uint -> TileIndex, >> -> /, if cascade -> switch tron parents: 1511 diff changeset	765	y /= 16;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	766
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	767	x -= WP(w,smallmap_d).subscroll;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	768	x2 -= WP(w,smallmap_d).subscroll;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	769
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	770	DrawVertMapIndicator(x, y, x, y2);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	771	DrawVertMapIndicator(x2, y, x2, y2);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	772
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	773	DrawHorizMapIndicator(x, y, x2, y);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	774	DrawHorizMapIndicator(x, y2, x2, y2);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	775	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	776	_cur_dpi = old_dpi;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	777	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	778
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	779	static void SmallMapWindowProc(Window w, WindowEvent e)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	780	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	781	switch(e->event) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	782	case WE_PAINT: {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	783	const uint16 *tbl;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	784	int x,y,y_org;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	785	DrawPixelInfo new_dpi;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	786
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	787	/* draw the window */
534 17ab2f22ff74 (svn r901) Small step in the process to clean up the DPARAM mess: tron parents: 507 diff changeset	788	SetDParam(0, STR_00E5_CONTOURS + _smallmap_type);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	789	DrawWindowWidgets(w);
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	790
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	791	/* draw the legend */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	792	tbl = _legend_table[(_smallmap_type != 2) ? _smallmap_type : (_opt.landscape + IND_OFFS)];
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	793	x = 4;
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	794	y_org = w->height - 43 - 11;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	795	y = y_org;
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	796	while (true) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	797	GfxFillRect(x, y+1, x+8, y + 5, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	798	GfxFillRect(x+1, y+2, x+7, y + 4, (byte)tbl[0]);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	799	DrawString(x+11, y, tbl[1], 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	800
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	801	tbl += 2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	802	y += 6;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	803
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	804	if (tbl[0] == 0xFFFF) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	805	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	806	} else if (tbl[0] & 0x100) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	807	x += 123;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	808	y = y_org;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	809	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	810	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	811
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	812	if (!FillDrawPixelInfo(&new_dpi, NULL, 3, 17, w->width - 28 + 22, w->height - 64 - 11))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	813	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	814
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	815	DrawSmallMap(&new_dpi, w, _smallmap_type, _smallmap_show_towns);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	816	} break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	817
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	818	case WE_CLICK:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	819	switch(e->click.widget) {
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	820	case 4: {/* main wnd */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	821	Window *w2;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	822	Point pt;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	823
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	824	_left_button_clicked = false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	825
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	826	w2 = FindWindowById(WC_MAIN_WINDOW, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	827
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	828	pt = RemapCoords(WP(w,smallmap_d).scroll_x, WP(w,smallmap_d).scroll_y, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	829	WP(w2,vp_d).scrollpos_x = pt.x + ((_cursor.pos.x - w->left + 2) << 4) - (w2->viewport->virtual_width >> 1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	830	WP(w2,vp_d).scrollpos_y = pt.y + ((_cursor.pos.y - w->top - 16) << 4) - (w2->viewport->virtual_height >> 1);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	831	} break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	832
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	833	case 5: /* show land contours */
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	834	case 6: /* show vehicles */
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	835	case 7: /* show industries */
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	836	case 8: /* show transport routes */
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	837	case 9: /* show vegetation */
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	838	case 10: /* show land owners */
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	839	w->click_state &= ~(1<<5\|1<<6\|1<<7\|1<<8\|1<<9\|1<<10);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	840	w->click_state \|= 1 << e->click.widget;
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	841	_smallmap_type = e->click.widget - 5;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	842
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	843	SetWindowDirty(w);
541 e1cd34389f79 (svn r925) Use sound enums tron parents: 534 diff changeset	844	SndPlayFx(SND_15_BEEP);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	845	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	846
758 bd9e868b9fae (svn r1214) -Feature: Stickified Industries (list & window), Smallmaps (all three), Stations (list & window) and Towns (list & window). I hope I didn't forget to update a widget somewhere :O darkvater parents: 682 diff changeset	847	case 12: /* toggle town names */
bd9e868b9fae (svn r1214) -Feature: Stickified Industries (list & window), Smallmaps (all three), Stations (list & window) and Towns (list & window). I hope I didn't forget to update a widget somewhere :O darkvater parents: 682 diff changeset	848	w->click_state ^= (1 << 12);
bd9e868b9fae (svn r1214) -Feature: Stickified Industries (list & window), Smallmaps (all three), Stations (list & window) and Towns (list & window). I hope I didn't forget to update a widget somewhere :O darkvater parents: 682 diff changeset	849	_smallmap_show_towns = (w->click_state >> 12) & 1;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	850	SetWindowDirty(w);
541 e1cd34389f79 (svn r925) Use sound enums tron parents: 534 diff changeset	851	SndPlayFx(SND_15_BEEP);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	852	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	853	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	854	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	855
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	856	case WE_RCLICK:
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	857	if (e->click.widget == 4) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	858	if (_scrolling_viewport)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	859	return;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	860	_scrolling_viewport = true;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	861	_cursor.delta.x = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	862	_cursor.delta.y = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	863	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	864	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	865
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	866	case WE_MOUSELOOP:
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	867	/* update the window every now and then */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	868	if ((++w->vscroll.pos & 0x1F) == 0)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	869	SetWindowDirty(w);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	870	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	871	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	872	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	873
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	874	static const WindowDesc _smallmap_desc = {
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	875	-1,-1, 446, 314,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	876	WC_SMALLMAP,0,
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	877	WDF_STD_TOOLTIPS \| WDF_STD_BTN \| WDF_DEF_WIDGET \| WDF_STICKY_BUTTON \| WDF_RESIZABLE,
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	878	_smallmap_widgets,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	879	SmallMapWindowProc
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	880	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	881
1093 e8d26c7dc42f (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1092 diff changeset	882	void ShowSmallMap(void)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	883	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	884	Window *w;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	885	ViewPort *vp;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	886	int x,y;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	887
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	888	w = AllocateWindowDescFront(&_smallmap_desc, 0);
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	889	if (w) {
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	890	w->click_state = ((1<<5) << _smallmap_type) \| (_smallmap_show_towns << 12);
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	891	w->resize.width = 350;
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	892	w->resize.height = 250;
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	893
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	894	vp = FindWindowById(WC_MAIN_WINDOW, 0)->viewport;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	895
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	896	x = (((vp->virtual_width - (220*32)) / 2) + vp->virtual_left) / 4;
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	897	y = ((((vp->virtual_height- (120*32)) / 2) + vp->virtual_top ) / 2) - 32;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	898	WP(w,smallmap_d).scroll_x = (y-x) & ~0xF;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	899	WP(w,smallmap_d).scroll_y = (x+y) & ~0xF;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	900	WP(w,smallmap_d).subscroll = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	901	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	902	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	903
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	904	/* Extra ViewPort Window Stuff */
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	905	static const Widget _extra_view_port_widgets[] = {
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	906	{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	907	{ WWT_CAPTION, RESIZE_RIGHT, 14, 11, 287, 0, 13, STR_EXTRA_VIEW_PORT_TITLE, STR_018C_WINDOW_TITLE_DRAG_THIS},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	908	{ WWT_STICKYBOX, RESIZE_LR, 14, 288, 299, 0, 13, 0x0, STR_STICKY_BUTTON},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	909	{ WWT_PANEL, RESIZE_RB, 14, 0, 299, 14, 233, 0x0, STR_NULL},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	910	{ WWT_6, RESIZE_RB, 14, 2, 297, 16, 231, 0x0, STR_NULL},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	911	{ WWT_PANEL, RESIZE_TB, 14, 0, 21, 234, 255, 0x2DF, STR_017F_ZOOM_THE_VIEW_IN},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	912	{ WWT_PANEL, RESIZE_TB, 14, 22, 43, 234, 255, 0x2E0, STR_0180_ZOOM_THE_VIEW_OUT},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	913	{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 44, 171, 234, 255, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW,STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	914	{ WWT_PUSHTXTBTN, RESIZE_TB, 14, 172, 298, 234, 255, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN,STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	915	{ WWT_PANEL, RESIZE_RTB, 14, 299, 299, 234, 255, 0x0, STR_NULL},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	916	{ WWT_PANEL, RESIZE_RTB, 14, 0, 287, 256, 267, 0x0, STR_NULL},
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	917	{ 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	918	{ 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	919	};
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	920
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	921	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	922	{
1815 cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	923	switch (e->event) {
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	924	case WE_CREATE: /* Disable zoom in button */
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	925	w->disabled_state = (1 << 5);
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	926	break;
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	927	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	928	// set the number in the title bar
534 17ab2f22ff74 (svn r901) Small step in the process to clean up the DPARAM mess: tron parents: 507 diff changeset	929	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	930
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	931	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	932	DrawWindowViewport(w);
1815 cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	933	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	934
1815 cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	935	case WE_CLICK: {
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	936	switch (e->click.widget) {
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	937	case 5: /* zoom in */
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	938	DoZoomInOutWindow(ZOOM_IN, w);
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	939	break;
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	940	case 6: /* zoom out */
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	941	DoZoomInOutWindow(ZOOM_OUT, w);
1815 cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	942	break;
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	943	case 7: { /* location button (move main view to same spot as this view) 'Paste Location' */
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	944	Window *w2 = FindWindowById(WC_MAIN_WINDOW, 0);
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	945	int x = WP(w, vp_d).scrollpos_x; // Where is the main looking at
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	946	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	947
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	948	// set this view to same location. Based on the center, adjusting for zoom
1815 cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	949	WP(w2, vp_d).scrollpos_x = x - (w2->viewport->virtual_width - w->viewport->virtual_width) / 2;
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	950	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	951	} break;
1815 cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	952	case 8: { /* inverse location button (move this view to same spot as main view) 'Copy Location' */
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	953	const Window *w2 = FindWindowById(WC_MAIN_WINDOW, 0);
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	954	int x = WP(w2, vp_d).scrollpos_x;
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	955	int y = WP(w2, 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	956
1815 cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	957	WP(w, vp_d).scrollpos_x = x + (w2->viewport->virtual_width - w->viewport->virtual_width) / 2;
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	958	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	959	} break;
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	960	}
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	961	} break;
1815 cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	962
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	963	case WE_RESIZE:
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	964	w->viewport->width += e->sizing.diff.x;
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	965	w->viewport->height += e->sizing.diff.y;
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	966
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	967	w->viewport->virtual_width += e->sizing.diff.x;
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	968	w->viewport->virtual_height += e->sizing.diff.y;
1815 cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	969	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	970	}
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	971	}
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	972
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	973	static const WindowDesc _extra_view_port_desc = {
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	974	-1,-1, 300, 268,
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	975	WC_EXTRA_VIEW_PORT,0,
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	976	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	977	_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	978	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	979	};
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	980
1093 e8d26c7dc42f (svn r1594) Convert all undefined parameter lists to (void) and add the appropriate warning flags in the Makefile tron parents: 1092 diff changeset	981	void ShowExtraViewPortWindow(void)
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	982	{
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	983	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	984	int i = 0;
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	985
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	986	// find next free window number for extra viewport
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	987	while (FindWindowById(WC_EXTRA_VIEW_PORT, 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	988	i++;
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	989	}
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	990
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	991	w = AllocateWindowDescFront(&_extra_view_port_desc, 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	992	if (w) {
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 856 diff changeset	993	int x, 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	994	// 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	995	v = FindWindowById(WC_MAIN_WINDOW, 0);
0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	996	// 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	997	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	998
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	999	// center on same place as main window (zoom is maximum, no adjustment needed)
1815 cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	1000	x = WP(v, vp_d).scrollpos_x;
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	1001	y = WP(v, vp_d).scrollpos_y;
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	1002	WP(w, vp_d).scrollpos_x = x + (v->viewport->virtual_width - (294)) / 2;
cfc1399ea8c9 (svn r2319) - Fix: copying/pasting from the extra viewport did not center on what you wanted to see if one of the windows (viewport or main) was zoomed out. Also fix the undisabled-zoom-in button upon creation. Darkvater parents: 1516 diff changeset	1003	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	1004	}
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	1005	}

author	tron
	Sat, 04 Jun 2005 11:56:32 +0000
changeset 1901	fb05044cf5c3
parent 1891	92a3b0aa0946
child 1918	68d78ef6833d
permissions	-rw-r--r--