openttd-ottdgrfs: src/industry_gui.cpp@646711c5feaa (annotated)

2186 461a2aff3486 (svn r2701) Insert Id tags into all source files tron parents: 2163 diff changeset	1	/* $Id$ */
461a2aff3486 (svn r2701) Insert Id tags into all source files tron parents: 2163 diff changeset	2
6285 187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	3	/** @file industry_gui.cpp */
187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	4
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	5	#include "stdafx.h"
1891 92a3b0aa0946 (svn r2397) - CodeChange: rename all "ttd" files to "openttd" files. Darkvater parents: 1786 diff changeset	6	#include "openttd.h"
1299 0a6510cc889b (svn r1803) Move debugging stuff into files of it's own tron parents: 1287 diff changeset	7	#include "debug.h"
2163 637ec3c361f5 (svn r2673) Include functions.h directly, not globally via openttd.h tron parents: 2159 diff changeset	8	#include "functions.h"
1309 dab90d4cbf2d (svn r1813) Declare functions implemented in strings.c in their own shiny new header (though i think some of these function don't belong into strings.c) tron parents: 1299 diff changeset	9	#include "strings.h"
507 8aa8100b0b22 (svn r815) Include strings.h only in the files which need it. tron parents: 222 diff changeset	10	#include "table/strings.h"
1914 5ede46fd496f (svn r2420) - Codechange: magic number elminitation of cursorsprites. Darkvater parents: 1891 diff changeset	11	#include "table/sprites.h"
679 e959706a3e4d (svn r1117) Move map arrays and some related macros into their own files map.c and map.h tron parents: 534 diff changeset	12	#include "map.h"
1386 aa5a172a8431 (svn r1890) Begin to clean up the edit box: Remove one global variable and split the combined edit/original buffer into two tron parents: 1309 diff changeset	13	#include "gui.h"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	14	#include "window.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	15	#include "gfx.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	16	#include "command.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	17	#include "viewport.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	18	#include "industry.h"
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	19	#include "town.h"
2159 3b634157c3b2 (svn r2669) Shuffle some more stuff around to reduce dependencies tron parents: 2084 diff changeset	20	#include "variables.h"
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	21	#include "helpers.hpp"
6268 4b5241e5dd10 (svn r8938) [cpp_gui] -Sync with trunk (r8772..r8900) bjarni parents: 6263 diff changeset	22	#include "cargotype.h"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	23
6285 187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	24	/* industries per climate, according to the different construction windows */
4995 e6152c0dc612 (svn r7001) -Codechange: _build_industry_trypes is now only used by industry_gui.c. Move it there. belugas parents: 4939 diff changeset	25	const byte _build_industry_types[4][12] = {
e6152c0dc612 (svn r7001) -Codechange: _build_industry_trypes is now only used by industry_gui.c. Move it there. belugas parents: 4939 diff changeset	26	{ 1, 2, 4, 6, 8, 0, 3, 5, 9, 11, 18 },
e6152c0dc612 (svn r7001) -Codechange: _build_industry_trypes is now only used by industry_gui.c. Move it there. belugas parents: 4939 diff changeset	27	{ 1, 14, 4, 13, 7, 0, 3, 9, 11, 15 },
e6152c0dc612 (svn r7001) -Codechange: _build_industry_trypes is now only used by industry_gui.c. Move it there. belugas parents: 4939 diff changeset	28	{ 25, 13, 4, 23, 22, 11, 17, 10, 24, 19, 20, 21 },
e6152c0dc612 (svn r7001) -Codechange: _build_industry_trypes is now only used by industry_gui.c. Move it there. belugas parents: 4939 diff changeset	29	{ 27, 30, 31, 33, 26, 28, 29, 32, 34, 35, 36 },
e6152c0dc612 (svn r7001) -Codechange: _build_industry_trypes is now only used by industry_gui.c. Move it there. belugas parents: 4939 diff changeset	30	};
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	31
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	32	static void UpdateIndustryProduction(Industry *i);
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	33
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	34	static void BuildIndustryWndProc(BaseWindow w, WindowEvent e)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	35	{
2951 2db3adee7736 (svn r3510) Fiddle with whitespace and parentheses tron parents: 2866 diff changeset	36	switch (e->event) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	37	case WE_PAINT:
6241 6a7a41b0cd32 (svn r8702) [cpp_gui] -Codechange: changed the 3 window functions in widget.cpp into Window methods bjarni parents: 6235 diff changeset	38	w->DrawWidgets();
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	39	if (_thd.place_mode == 1 && _thd.window_class == WC_BUILD_INDUSTRY) {
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	40	int ind_type = _build_industry_types[_opt_ptr->landscape][WP(w, def_d).data_1];
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	41
3689 db67c356f44b (svn r4614) CodeChange : Cleanup of industry_cmd (Step-4). belugas parents: 3107 diff changeset	42	SetDParam(0, (_price.build_industry >> 5) * GetIndustrySpec(ind_type)->cost_multiplier);
6263 19dab6a68886 (svn r8913) [cpp_gui] -Codechange: use BaseWindow accessors instead of accessing window size/position directly KUDr parents: 6258 diff changeset	43	DrawStringCentered(85, w->Height() - 21, STR_482F_COST, 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	44	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	45	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	46
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	47	case WE_CLICK: {
4634 897461a3e9ca (svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct belugas parents: 4617 diff changeset	48	int wid = e->we.click.widget;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	49	if (wid >= 3) {
1914 5ede46fd496f (svn r2420) - Codechange: magic number elminitation of cursorsprites. Darkvater parents: 1891 diff changeset	50	if (HandlePlacePushButton(w, wid, SPR_CURSOR_INDUSTRY, 1, NULL))
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	51	WP(w, def_d).data_1 = wid - 3;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	52	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	53	} break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	54
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	55	case WE_PLACE_OBJ:
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	56	if (DoCommandP(e->we.place.tile, _build_industry_types[_opt_ptr->landscape][WP(w, def_d).data_1], 0, NULL, CMD_BUILD_INDUSTRY \| CMD_MSG(STR_4830_CAN_T_CONSTRUCT_THIS_INDUSTRY)))
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	57	ResetObjectToPlace();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	58	break;
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	59
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	60	case WE_ABORT_PLACE_OBJ:
6235 5077e6ed3788 (svn r8683) [cpp_gui] -Codechange: first steps towards OO GUI (together with Bjarni) without changes in the logic KUDr parents: 6144 diff changeset	61	w->RaiseButtons();
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	62	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	63	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	64	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	65
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	66	static const OldWidget _build_industry_land0_widgets[] = {
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	67	{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	68	{ WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0314_FUND_NEW_INDUSTRY, STR_018C_WINDOW_TITLE_DRAG_THIS},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	69	{ WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 115, 0x0, STR_NULL},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	70	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	71	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_0242_SAWMILL, STR_0264_CONSTRUCT_SAWMILL},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	72	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	73	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	74	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_0247_STEEL_MILL, STR_0269_CONSTRUCT_STEEL_MILL},
176 84990c4b9212 (svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron) darkvater parents: 164 diff changeset	75	{ WIDGETS_END},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	76	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	77
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	78	static const OldWidget _build_industry_land1_widgets[] = {
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	79	{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	80	{ WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0314_FUND_NEW_INDUSTRY, STR_018C_WINDOW_TITLE_DRAG_THIS},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	81	{ WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 115, 0x0, STR_NULL},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	82	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	83	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_024C_PAPER_MILL, STR_026E_CONSTRUCT_PAPER_MILL},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	84	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	85	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	86	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_024E_PRINTING_WORKS, STR_0270_CONSTRUCT_PRINTING_WORKS},
176 84990c4b9212 (svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron) darkvater parents: 164 diff changeset	87	{ WIDGETS_END},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	88	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	89
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	90	static const OldWidget _build_industry_land2_widgets[] = {
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	91	{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	92	{ WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0314_FUND_NEW_INDUSTRY, STR_018C_WINDOW_TITLE_DRAG_THIS},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	93	{ WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 115, 0x0, STR_NULL},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	94	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0250_LUMBER_MILL, STR_0273_CONSTRUCT_LUMBER_MILL_TO},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	95	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	96	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	97	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	98	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_0254_WATER_TOWER, STR_0277_CONSTRUCT_WATER_TOWER_CAN},
176 84990c4b9212 (svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron) darkvater parents: 164 diff changeset	99	{ WIDGETS_END},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	100	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	101
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	102	static const OldWidget _build_industry_land3_widgets[] = {
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	103	{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	104	{ WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0314_FUND_NEW_INDUSTRY, STR_018C_WINDOW_TITLE_DRAG_THIS},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	105	{ WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 115, 0x0, STR_NULL},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	106	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0258_CANDY_FACTORY, STR_027B_CONSTRUCT_CANDY_FACTORY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	107	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_025B_TOY_SHOP, STR_027E_CONSTRUCT_TOY_SHOP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	108	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_025C_TOY_FACTORY, STR_027F_CONSTRUCT_TOY_FACTORY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	109	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_025E_FIZZY_DRINK_FACTORY, STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},
176 84990c4b9212 (svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron) darkvater parents: 164 diff changeset	110	{ WIDGETS_END},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	111	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	112
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	113	static const OldWidget _build_industry_land0_widgets_extra[] = {
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	114	{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	115	{ WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0314_FUND_NEW_INDUSTRY, STR_018C_WINDOW_TITLE_DRAG_THIS},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	116	{ WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 187, 0x0, STR_NULL},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	117
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	118	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	119	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_0242_SAWMILL, STR_0264_CONSTRUCT_SAWMILL},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	120	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	121	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	122	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_0247_STEEL_MILL, STR_0269_CONSTRUCT_STEEL_MILL},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	123
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	124	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 84, 95, STR_0240_COAL_MINE, STR_CONSTRUCT_COAL_MINE_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	125	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 97, 108, STR_0243_FOREST, STR_CONSTRUCT_FOREST_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	126	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 110, 121, STR_0245_OIL_RIG, STR_CONSTRUCT_OIL_RIG_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	127	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 123, 134, STR_0248_FARM, STR_CONSTRUCT_FARM_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	128	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 136, 147, STR_024A_OIL_WELLS, STR_CONSTRUCT_OIL_WELLS_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	129	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 149, 160, STR_0249_IRON_ORE_MINE, STR_CONSTRUCT_IRON_ORE_MINE_TIP},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	130
176 84990c4b9212 (svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron) darkvater parents: 164 diff changeset	131	{ WIDGETS_END},
0 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
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	134	static const OldWidget _build_industry_land1_widgets_extra[] = {
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	135	{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	136	{ WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0314_FUND_NEW_INDUSTRY, STR_018C_WINDOW_TITLE_DRAG_THIS},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	137	{ WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 174, 0x0, STR_NULL},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	138
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	139	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	140	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_024C_PAPER_MILL, STR_026E_CONSTRUCT_PAPER_MILL},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	141	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	142	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	143	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_024E_PRINTING_WORKS, STR_0270_CONSTRUCT_PRINTING_WORKS},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	144
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	145	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 84, 95, STR_0240_COAL_MINE, STR_CONSTRUCT_COAL_MINE_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	146	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 97, 108, STR_0243_FOREST, STR_CONSTRUCT_FOREST_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	147	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 110, 121, STR_0248_FARM, STR_CONSTRUCT_FARM_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	148	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 123, 134, STR_024A_OIL_WELLS, STR_CONSTRUCT_OIL_WELLS_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	149	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 136, 147, STR_024F_GOLD_MINE, STR_CONSTRUCT_GOLD_MINE_TIP},
176 84990c4b9212 (svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron) darkvater parents: 164 diff changeset	150	{ WIDGETS_END},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	151	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	152
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	153	static const OldWidget _build_industry_land2_widgets_extra[] = {
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	154	{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	155	{ WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0314_FUND_NEW_INDUSTRY, STR_018C_WINDOW_TITLE_DRAG_THIS},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	156	{ WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 200, 0x0, STR_NULL},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	157
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	158	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0250_LUMBER_MILL, STR_0273_CONSTRUCT_LUMBER_MILL_TO},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	159	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	160	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	161	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	162	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 68, 79, STR_0254_WATER_TOWER, STR_0277_CONSTRUCT_WATER_TOWER_CAN},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	163
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	164	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 84, 95, STR_024A_OIL_WELLS, STR_CONSTRUCT_OIL_WELLS_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	165	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 97, 108, STR_0255_DIAMOND_MINE, STR_CONSTRUCT_DIAMOND_MINE_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	166	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 110, 121, STR_0256_COPPER_ORE_MINE, STR_CONSTRUCT_COPPER_ORE_MINE_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	167	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 123, 134, STR_0248_FARM, STR_CONSTRUCT_FARM_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	168	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 136, 147, STR_0251_FRUIT_PLANTATION, STR_CONSTRUCT_FRUIT_PLANTATION_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	169	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 149, 160, STR_0252_RUBBER_PLANTATION, STR_CONSTRUCT_RUBBER_PLANTATION_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	170	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 162, 173, STR_0253_WATER_SUPPLY, STR_CONSTRUCT_WATER_SUPPLY_TIP},
176 84990c4b9212 (svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron) darkvater parents: 164 diff changeset	171	{ WIDGETS_END},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	172	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	173
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	174	static const OldWidget _build_industry_land3_widgets_extra[] = {
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	175	{ WWT_CLOSEBOX, RESIZE_NONE, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	176	{ WWT_CAPTION, RESIZE_NONE, 7, 11, 169, 0, 13, STR_0314_FUND_NEW_INDUSTRY, STR_018C_WINDOW_TITLE_DRAG_THIS},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	177	{ WWT_PANEL, RESIZE_NONE, 7, 0, 169, 14, 187, 0x0, STR_NULL},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	178
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	179	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 16, 27, STR_0258_CANDY_FACTORY, STR_027B_CONSTRUCT_CANDY_FACTORY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	180	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 29, 40, STR_025B_TOY_SHOP, STR_027E_CONSTRUCT_TOY_SHOP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	181	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 42, 53, STR_025C_TOY_FACTORY, STR_027F_CONSTRUCT_TOY_FACTORY},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	182	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 55, 66, STR_025E_FIZZY_DRINK_FACTORY, STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	183
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	184	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 71, 82, STR_0257_COTTON_CANDY_FOREST, STR_CONSTRUCT_COTTON_CANDY_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	185	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 84, 95, STR_0259_BATTERY_FARM, STR_CONSTRUCT_BATTERY_FARM_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	186	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 97, 108, STR_025A_COLA_WELLS, STR_CONSTRUCT_COLA_WELLS_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	187	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 110, 121, STR_025D_PLASTIC_FOUNTAINS, STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	188	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 123, 134, STR_025F_BUBBLE_GENERATOR, STR_CONSTRUCT_BUBBLE_GENERATOR_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	189	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 136, 147, STR_0260_TOFFEE_QUARRY, STR_CONSTRUCT_TOFFEE_QUARRY_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	190	{ WWT_TEXTBTN, RESIZE_NONE, 14, 2, 167, 149, 160, STR_0261_SUGAR_MINE, STR_CONSTRUCT_SUGAR_MINE_TIP},
176 84990c4b9212 (svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron) darkvater parents: 164 diff changeset	191	{ WIDGETS_END},
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	194
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	195	static const WindowDesc _build_industry_land0_desc = {
5070 0bbf5264bfb7 (svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1) Darkvater parents: 5005 diff changeset	196	WDP_AUTO, WDP_AUTO, 170, 116,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 5860 diff changeset	197	WC_BUILD_INDUSTRY, WC_NONE,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	198	WDF_STD_TOOLTIPS \| WDF_STD_BTN \| WDF_DEF_WIDGET,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	199	_build_industry_land0_widgets,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	200	BuildIndustryWndProc
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	201	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	202
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	203	static const WindowDesc _build_industry_land1_desc = {
5070 0bbf5264bfb7 (svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1) Darkvater parents: 5005 diff changeset	204	WDP_AUTO, WDP_AUTO, 170, 116,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 5860 diff changeset	205	WC_BUILD_INDUSTRY, WC_NONE,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	206	WDF_STD_TOOLTIPS \| WDF_STD_BTN \| WDF_DEF_WIDGET,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	207	_build_industry_land1_widgets,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	208	BuildIndustryWndProc
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	211	static const WindowDesc _build_industry_land2_desc = {
5070 0bbf5264bfb7 (svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1) Darkvater parents: 5005 diff changeset	212	WDP_AUTO, WDP_AUTO, 170, 116,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 5860 diff changeset	213	WC_BUILD_INDUSTRY, WC_NONE,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	214	WDF_STD_TOOLTIPS \| WDF_STD_BTN \| WDF_DEF_WIDGET,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	215	_build_industry_land2_widgets,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	216	BuildIndustryWndProc
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	217	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	218
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	219	static const WindowDesc _build_industry_land3_desc = {
5070 0bbf5264bfb7 (svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1) Darkvater parents: 5005 diff changeset	220	WDP_AUTO, WDP_AUTO, 170, 116,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 5860 diff changeset	221	WC_BUILD_INDUSTRY, WC_NONE,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	222	WDF_STD_TOOLTIPS \| WDF_STD_BTN \| WDF_DEF_WIDGET,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	223	_build_industry_land3_widgets,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	224	BuildIndustryWndProc
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	225	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	226
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	227	static const WindowDesc _build_industry_land0_desc_extra = {
5070 0bbf5264bfb7 (svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1) Darkvater parents: 5005 diff changeset	228	WDP_AUTO, WDP_AUTO, 170, 188,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 5860 diff changeset	229	WC_BUILD_INDUSTRY, WC_NONE,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	230	WDF_STD_TOOLTIPS \| WDF_STD_BTN \| WDF_DEF_WIDGET,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	231	_build_industry_land0_widgets_extra,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	232	BuildIndustryWndProc
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
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	235	static const WindowDesc _build_industry_land1_desc_extra = {
5070 0bbf5264bfb7 (svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1) Darkvater parents: 5005 diff changeset	236	WDP_AUTO, WDP_AUTO, 170, 175,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 5860 diff changeset	237	WC_BUILD_INDUSTRY, WC_NONE,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	238	WDF_STD_TOOLTIPS \| WDF_STD_BTN \| WDF_DEF_WIDGET,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	239	_build_industry_land1_widgets_extra,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	240	BuildIndustryWndProc
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	241	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	242
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	243	static const WindowDesc _build_industry_land2_desc_extra = {
5070 0bbf5264bfb7 (svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1) Darkvater parents: 5005 diff changeset	244	WDP_AUTO, WDP_AUTO, 170, 201,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 5860 diff changeset	245	WC_BUILD_INDUSTRY, WC_NONE,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	246	WDF_STD_TOOLTIPS \| WDF_STD_BTN \| WDF_DEF_WIDGET,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	247	_build_industry_land2_widgets_extra,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	248	BuildIndustryWndProc
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	249	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	250
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	251	static const WindowDesc _build_industry_land3_desc_extra = {
5070 0bbf5264bfb7 (svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1) Darkvater parents: 5005 diff changeset	252	WDP_AUTO, WDP_AUTO, 170, 188,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 5860 diff changeset	253	WC_BUILD_INDUSTRY, WC_NONE,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	254	WDF_STD_TOOLTIPS \| WDF_STD_BTN \| WDF_DEF_WIDGET,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	255	_build_industry_land3_widgets_extra,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	256	BuildIndustryWndProc
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	257	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	258
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	259	static const WindowDesc * const _industry_window_desc[2][4] = {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	260	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	261	&_build_industry_land0_desc,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	262	&_build_industry_land1_desc,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	263	&_build_industry_land2_desc,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	264	&_build_industry_land3_desc,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	265	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	266	{
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	267	&_build_industry_land0_desc_extra,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	268	&_build_industry_land1_desc_extra,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	269	&_build_industry_land2_desc_extra,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	270	&_build_industry_land3_desc_extra,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	271	},
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	272	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	273
6298 c30fe89622df (svn r9119) [cpp_gui] -Sync with trunk (r9003:9100) bjarni parents: 6285 diff changeset	274	void ShowBuildIndustryWindow()
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	275	{
5005 21e84e53c732 (svn r7022) -Fix [FS#292]: Properly guard against viewing company-sensitive information from Darkvater parents: 4995 diff changeset	276	if (!IsValidPlayer(_current_player)) return;
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	277	BaseWindow::AllocateFront(_industry_window_desc[_patches.build_rawmaterial_ind][_opt_ptr->landscape], 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	278	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	279
4211 d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	280	static inline bool isProductionMinimum(const Industry *i, int pt) {
d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	281	return i->production_rate[pt] == 1;
d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	282	}
d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	283
d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	284	static inline bool isProductionMaximum(const Industry *i, int pt) {
d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	285	return i->production_rate[pt] == 255;
d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	286	}
d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	287
4194 18a32dace8ba (svn r5654) -Cleanup: Change an ugly define into a function Darkvater parents: 4193 diff changeset	288	static inline bool IsProductionAlterable(const Industry *i)
18a32dace8ba (svn r5654) -Cleanup: Change an ugly define into a function Darkvater parents: 4193 diff changeset	289	{
18a32dace8ba (svn r5654) -Cleanup: Change an ugly define into a function Darkvater parents: 4193 diff changeset	290	return ((_game_mode == GM_EDITOR \|\| _cheats.setup_prod.value) &&
18a32dace8ba (svn r5654) -Cleanup: Change an ugly define into a function Darkvater parents: 4193 diff changeset	291	(i->accepts_cargo[0] == CT_INVALID \|\| i->accepts_cargo[0] == CT_VALUABLES));
18a32dace8ba (svn r5654) -Cleanup: Change an ugly define into a function Darkvater parents: 4193 diff changeset	292	}
18a32dace8ba (svn r5654) -Cleanup: Change an ugly define into a function Darkvater parents: 4193 diff changeset	293
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	294	static void IndustryViewWndProc(BaseWindow w, WindowEvent e)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	295	{
6285 187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	296	/* WP(w,vp2_d).data_1 is for the editbox line
187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	297	* WP(w,vp2_d).data_2 is for the clickline
187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	298	* WP(w,vp2_d).data_3 is for the click pos (left or right) */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	299
2951 2db3adee7736 (svn r3510) Fiddle with whitespace and parentheses tron parents: 2866 diff changeset	300	switch (e->event) {
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	301	case WE_PAINT: {
4171 3fadda3afe70 (svn r5609) CodeChange : Apply coding style belugas parents: 3689 diff changeset	302	const Industry *i = GetIndustry(w->window_number);
2557 3ed00023e382 (svn r3090) Remove long dead pieces of code tron parents: 2469 diff changeset	303
2070 26c657906f25 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2063 diff changeset	304	SetDParam(0, w->window_number);
6241 6a7a41b0cd32 (svn r8702) [cpp_gui] -Codechange: changed the 3 window functions in widget.cpp into Window methods bjarni parents: 6235 diff changeset	305	w->DrawWidgets();
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	306
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	307	if (i->accepts_cargo[0] != CT_INVALID) {
2989 99c95a3ebcaa (svn r3564) Several smaller changes: tron parents: 2952 diff changeset	308	StringID str;
99c95a3ebcaa (svn r3564) Several smaller changes: tron parents: 2952 diff changeset	309
6268 4b5241e5dd10 (svn r8938) [cpp_gui] -Sync with trunk (r8772..r8900) bjarni parents: 6263 diff changeset	310	SetDParam(0, GetCargo(i->accepts_cargo[0])->name);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	311	str = STR_4827_REQUIRES;
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	312	if (i->accepts_cargo[1] != CT_INVALID) {
6268 4b5241e5dd10 (svn r8938) [cpp_gui] -Sync with trunk (r8772..r8900) bjarni parents: 6263 diff changeset	313	SetDParam(1, GetCargo(i->accepts_cargo[1])->name);
2989 99c95a3ebcaa (svn r3564) Several smaller changes: tron parents: 2952 diff changeset	314	str = STR_4828_REQUIRES;
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	315	if (i->accepts_cargo[2] != CT_INVALID) {
6268 4b5241e5dd10 (svn r8938) [cpp_gui] -Sync with trunk (r8772..r8900) bjarni parents: 6263 diff changeset	316	SetDParam(2, GetCargo(i->accepts_cargo[2])->name);
2989 99c95a3ebcaa (svn r3564) Several smaller changes: tron parents: 2952 diff changeset	317	str = STR_4829_REQUIRES;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	318	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	319	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	320	DrawString(2, 107, str, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	321	}
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	322
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	323	if (i->produced_cargo[0] != CT_INVALID) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	324	DrawString(2, 117, STR_482A_PRODUCTION_LAST_MONTH, 0);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	325
4896 72d7a8614580 (svn r6855) - Codechange: When displaying a "quantity of cargo" string, use the {CARGO} command and supply the cargo type and quantity, instead of manually looking up the cargo type's string. peter1138 parents: 4848 diff changeset	326	SetDParam(0, i->produced_cargo[0]);
534 17ab2f22ff74 (svn r901) Small step in the process to clean up the DPARAM mess: tron parents: 507 diff changeset	327	SetDParam(1, i->total_production[0]);
2063 95259a31ceb5 (svn r2572) - Codechange: [string] Changed string system so it's not as dependent on decode_parameters ludde parents: 1981 diff changeset	328
534 17ab2f22ff74 (svn r901) Small step in the process to clean up the DPARAM mess: tron parents: 507 diff changeset	329	SetDParam(2, i->pct_transported[0] * 100 >> 8);
4194 18a32dace8ba (svn r5654) -Cleanup: Change an ugly define into a function Darkvater parents: 4193 diff changeset	330	DrawString(4 + (IsProductionAlterable(i) ? 30 : 0), 127, STR_482B_TRANSPORTED, 0);
6285 187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	331	/* Let's put out those buttons.. */
4211 d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	332	if (IsProductionAlterable(i)) {
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	333	DrawArrowButtons(5, 127, 3, (WP(w, vp2_d).data_2 == 1) ? WP(w, vp2_d).data_3 : 0,
4211 d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	334	!isProductionMinimum(i, 0), !isProductionMaximum(i, 0));
d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	335	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	336
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	337	if (i->produced_cargo[1] != CT_INVALID) {
4896 72d7a8614580 (svn r6855) - Codechange: When displaying a "quantity of cargo" string, use the {CARGO} command and supply the cargo type and quantity, instead of manually looking up the cargo type's string. peter1138 parents: 4848 diff changeset	338	SetDParam(0, i->produced_cargo[1]);
534 17ab2f22ff74 (svn r901) Small step in the process to clean up the DPARAM mess: tron parents: 507 diff changeset	339	SetDParam(1, i->total_production[1]);
17ab2f22ff74 (svn r901) Small step in the process to clean up the DPARAM mess: tron parents: 507 diff changeset	340	SetDParam(2, i->pct_transported[1] * 100 >> 8);
4194 18a32dace8ba (svn r5654) -Cleanup: Change an ugly define into a function Darkvater parents: 4193 diff changeset	341	DrawString(4 + (IsProductionAlterable(i) ? 30 : 0), 137, STR_482B_TRANSPORTED, 0);
6285 187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	342	/* Let's put out those buttons.. */
4211 d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	343	if (IsProductionAlterable(i)) {
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	344	DrawArrowButtons(5, 137, 3, (WP(w, vp2_d).data_2 == 2) ? WP(w, vp2_d).data_3 : 0,
4211 d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	345	!isProductionMinimum(i, 1), !isProductionMaximum(i, 1));
d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	346	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	347	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	348	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	349
6244 4b42fb40e6d2 (svn r8710) [cpp_gui] -Codechange: yet another two functions are turned into Window methods bjarni parents: 6242 diff changeset	350	w->DrawViewport();
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	351	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	352	break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	353
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	354	case WE_CLICK: {
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	355	Industry *i;
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	356
4634 897461a3e9ca (svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct belugas parents: 4617 diff changeset	357	switch (e->we.click.widget) {
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	358	case 5: {
4193 ef08dda0369e (svn r5653) -Cleanup: Do a little cleanup of the industry gui code. Darkvater parents: 4192 diff changeset	359	int line, x;
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	360
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	361	i = GetIndustry(w->window_number);
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	362
6285 187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	363	/* We should work if needed.. */
4194 18a32dace8ba (svn r5654) -Cleanup: Change an ugly define into a function Darkvater parents: 4193 diff changeset	364	if (!IsProductionAlterable(i)) return;
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	365
4634 897461a3e9ca (svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct belugas parents: 4617 diff changeset	366	x = e->we.click.pt.x;
897461a3e9ca (svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct belugas parents: 4617 diff changeset	367	line = (e->we.click.pt.y - 127) / 10;
897461a3e9ca (svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct belugas parents: 4617 diff changeset	368	if (e->we.click.pt.y >= 127 && IS_INT_INSIDE(line, 0, 2) && i->produced_cargo[line] != CT_INVALID) {
1019 6363b8a4273e (svn r1520) Trim 134 (!) lines with trailing whitespace ): tron parents: 1004 diff changeset	369	if (IS_INT_INSIDE(x, 5, 25) ) {
4193 ef08dda0369e (svn r5653) -Cleanup: Do a little cleanup of the industry gui code. Darkvater parents: 4192 diff changeset	370	/* Clicked buttons, decrease or increase production */
1019 6363b8a4273e (svn r1520) Trim 134 (!) lines with trailing whitespace ): tron parents: 1004 diff changeset	371	if (x < 15) {
4211 d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	372	if (isProductionMinimum(i, line)) return;
5852 cb3f71b16e1a (svn r8055) -Codechange: Replace the different max, dmax, maxu whatever macros by a simple template function max(), that requires two arguments of the same type. While I'm at it change a variable called "max" to "maxval" in a function that calls max(). celestar parents: 5838 diff changeset	373	i->production_rate[line] = max(i->production_rate[line] / 2, 1);
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	374	} else {
4211 d8c4c40eba62 (svn r5714) Backport from branches/TGP (r5701 and r5711) miham parents: 4194 diff changeset	375	if (isProductionMaximum(i, line)) return;
4193 ef08dda0369e (svn r5653) -Cleanup: Do a little cleanup of the industry gui code. Darkvater parents: 4192 diff changeset	376	i->production_rate[line] = minu(i->production_rate[line] * 2, 255);
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	377	}
4193 ef08dda0369e (svn r5653) -Cleanup: Do a little cleanup of the industry gui code. Darkvater parents: 4192 diff changeset	378
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	379	UpdateIndustryProduction(i);
6235 5077e6ed3788 (svn r8683) [cpp_gui] -Codechange: first steps towards OO GUI (together with Bjarni) without changes in the logic KUDr parents: 6144 diff changeset	380	w->SetDirty();
6242 17609af8a1d1 (svn r8704) [cpp_gui] -Codechange: flash_timeout and autorepeat_timeout extracted from Window::flags4 KUDr parents: 6241 diff changeset	381	w->autorepeat_timeout = 5;
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	382	WP(w, vp2_d).data_2 = line + 1;
646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	383	WP(w, vp2_d).data_3 = (x < 15 ? 1 : 2);
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	384	} else if (IS_INT_INSIDE(x, 34, 160)) {
6285 187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	385	/* clicked the text */
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	386	WP(w, vp2_d).data_1 = line;
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	387	SetDParam(0, i->production_rate[line] * 8);
5682 eeddbbacd4ac (svn r7637) -Codechange: Change ShowQueryString to use a window pointer as a parent. If the Darkvater parents: 5568 diff changeset	388	ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_CONFIG_GAME_PRODUCTION, 10, 100, w, CS_ALPHANUMERAL);
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	389	}
1019 6363b8a4273e (svn r1520) Trim 134 (!) lines with trailing whitespace ): tron parents: 1004 diff changeset	390	}
4193 ef08dda0369e (svn r5653) -Cleanup: Do a little cleanup of the industry gui code. Darkvater parents: 4192 diff changeset	391	} break;
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: 727 diff changeset	392	case 6:
919 b0d6c7642f99 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 893 diff changeset	393	i = GetIndustry(w->window_number);
1981 de031d2aed47 (svn r2487) Replace TILE_XY by TileXY/TileDiffXY tron parents: 1914 diff changeset	394	ScrollMainWindowToTile(i->xy + TileDiffXY(1, 1));
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	395	} break;
4193 ef08dda0369e (svn r5653) -Cleanup: Do a little cleanup of the industry gui code. Darkvater parents: 4192 diff changeset	396
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	397	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	398	break;
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	399	case WE_TIMEOUT:
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	400	WP(w, vp2_d).data_2 = 0;
646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	401	WP(w, vp2_d).data_3 = 0;
6235 5077e6ed3788 (svn r8683) [cpp_gui] -Codechange: first steps towards OO GUI (together with Bjarni) without changes in the logic KUDr parents: 6144 diff changeset	402	w->SetDirty();
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	403	break;
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	404
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	405	case WE_ON_EDIT_TEXT:
4634 897461a3e9ca (svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct belugas parents: 4617 diff changeset	406	if (e->we.edittext.str[0] != '\0') {
3017 915fae59d5e0 (svn r3597) Miscellaneous (I like that word) changes: Fix some indentation, add consts, reduce indentation level by short-circuit logic, convert if cascades to switch, whitespace, bracing, plus some minor stuff tron parents: 2989 diff changeset	407	Industry* i = GetIndustry(w->window_number);
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	408	int line = WP(w, vp2_d).data_1;
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	409
4634 897461a3e9ca (svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct belugas parents: 4617 diff changeset	410	i->production_rate[line] = clampu(atoi(e->we.edittext.str), 0, 255);
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	411	UpdateIndustryProduction(i);
6235 5077e6ed3788 (svn r8683) [cpp_gui] -Codechange: first steps towards OO GUI (together with Bjarni) without changes in the logic KUDr parents: 6144 diff changeset	412	w->SetDirty();
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	413	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	414	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	415	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	416
1004 edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	417	static void UpdateIndustryProduction(Industry *i)
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	418	{
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	419	if (i->produced_cargo[0] != CT_INVALID)
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	420	i->total_production[0] = 8 * i->production_rate[0];
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	421
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	422	if (i->produced_cargo[1] != CT_INVALID)
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	423	i->total_production[1] = 8 * i->production_rate[1];
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	424	}
edbdc62fbf24 (svn r1503) Added feature: miham parents: 919 diff changeset	425
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	426	static const OldWidget _industry_view_widgets[] = {
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	427	{ WWT_CLOSEBOX, RESIZE_NONE, 9, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	428	{ WWT_CAPTION, RESIZE_NONE, 9, 11, 247, 0, 13, STR_4801, STR_018C_WINDOW_TITLE_DRAG_THIS},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	429	{ WWT_STICKYBOX, RESIZE_NONE, 9, 248, 259, 0, 13, 0x0, STR_STICKY_BUTTON},
4938 074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4912 diff changeset	430	{ WWT_PANEL, RESIZE_NONE, 9, 0, 259, 14, 105, 0x0, STR_NULL},
4939 ede0f6777b3c (svn r6926) -Codechange: Rename WWT_4 to WWT_TEXTBTN_2 and WWT_6 to WWT_INSET (credits to peter1138 Darkvater parents: 4938 diff changeset	431	{ WWT_INSET, RESIZE_NONE, 9, 2, 257, 16, 103, 0x0, STR_NULL},
4938 074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4912 diff changeset	432	{ WWT_PANEL, RESIZE_NONE, 9, 0, 259, 106, 147, 0x0, STR_NULL},
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	433	{ WWT_PUSHTXTBTN, RESIZE_NONE, 9, 0, 129, 148, 159, STR_00E4_LOCATION, STR_482C_CENTER_THE_MAIN_VIEW_ON},
4938 074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4912 diff changeset	434	{ WWT_PANEL, RESIZE_NONE, 9, 130, 259, 148, 159, 0x0, STR_NULL},
176 84990c4b9212 (svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron) darkvater parents: 164 diff changeset	435	{ WIDGETS_END},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	436	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	437
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	438	static const WindowDesc _industry_view_desc = {
5070 0bbf5264bfb7 (svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1) Darkvater parents: 5005 diff changeset	439	WDP_AUTO, WDP_AUTO, 260, 160,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 5860 diff changeset	440	WC_INDUSTRY_VIEW, WC_NONE,
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: 727 diff changeset	441	WDF_STD_TOOLTIPS \| WDF_STD_BTN \| WDF_DEF_WIDGET \| WDF_UNCLICK_BUTTONS \| WDF_STICKY_BUTTON,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	442	_industry_view_widgets,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	443	IndustryViewWndProc
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	444	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	445
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	446	void ShowIndustryViewWindow(int industry)
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	447	{
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	448	BaseWindow *w = BaseWindow::AllocateFront(&_industry_view_desc, industry);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	449
2989 99c95a3ebcaa (svn r3564) Several smaller changes: tron parents: 2952 diff changeset	450	if (w != NULL) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	451	w->flags4 \|= WF_DISABLE_VP_SCROLL;
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	452	WP(w, vp2_d).data_1 = 0;
646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	453	WP(w, vp2_d).data_2 = 0;
646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	454	WP(w, vp2_d).data_3 = 0;
2989 99c95a3ebcaa (svn r3564) Several smaller changes: tron parents: 2952 diff changeset	455	AssignWindowViewport(w, 3, 17, 0xFE, 0x56, GetIndustry(w->window_number)->xy + TileDiffXY(1, 1), 1);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	456	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	457	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	458
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	459	static const OldWidget _industry_directory_widgets[] = {
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	460	{ WWT_CLOSEBOX, RESIZE_NONE, 13, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	461	{ WWT_CAPTION, RESIZE_NONE, 13, 11, 495, 0, 13, STR_INDUSTRYDIR_CAPTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	462	{ WWT_STICKYBOX, RESIZE_NONE, 13, 496, 507, 0, 13, 0x0, STR_STICKY_BUTTON},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	463	{ WWT_PUSHTXTBTN, RESIZE_NONE, 13, 0, 100, 14, 25, STR_SORT_BY_NAME, STR_SORT_ORDER_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	464	{ WWT_PUSHTXTBTN, RESIZE_NONE, 13, 101, 200, 14, 25, STR_SORT_BY_TYPE, STR_SORT_ORDER_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	465	{ WWT_PUSHTXTBTN, RESIZE_NONE, 13, 201, 300, 14, 25, STR_SORT_BY_PRODUCTION, STR_SORT_ORDER_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	466	{ WWT_PUSHTXTBTN, RESIZE_NONE, 13, 301, 400, 14, 25, STR_SORT_BY_TRANSPORTED, STR_SORT_ORDER_TIP},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	467	{ WWT_PANEL, RESIZE_NONE, 13, 401, 495, 14, 25, 0x0, STR_NULL},
4938 074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4912 diff changeset	468	{ WWT_PANEL, RESIZE_BOTTOM, 13, 0, 495, 26, 189, 0x0, STR_200A_TOWN_NAMES_CLICK_ON_NAME},
4344 5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	469	{ WWT_SCROLLBAR, RESIZE_BOTTOM, 13, 496, 507, 14, 177, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
5d0e40cd67b9 (svn r6045) -Cleanup: align all table-like structures using spaces, i.e. whitespace fixes only except for a few comments to make them uniform for the whole enum/struct. rubidium parents: 4299 diff changeset	470	{ WWT_RESIZEBOX, RESIZE_TB, 13, 496, 507, 178, 189, 0x0, STR_RESIZE_BUTTON},
176 84990c4b9212 (svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron) darkvater parents: 164 diff changeset	471	{ WIDGETS_END},
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	472	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	473
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	474	static uint _num_industry_sort;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	475
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	476	static char _bufcache[96];
4277 3539bd14f023 (svn r5907) Remove more indirection by using pointers instead of IDs. Also fix some bogus warnings on MSVC by using (void) casts tron* parents: 4211 diff changeset	477	static const Industry* _last_industry;
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	static byte _industry_sort_order;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	480
164 0cbdf3c9bde1 (svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code). darkvater parents: 69 diff changeset	481	static int CDECL GeneralIndustrySorter(const void a, const void b)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	482	{
4277 3539bd14f023 (svn r5907) Remove more indirection by using pointers instead of IDs. Also fix some bogus warnings on MSVC by using (void) casts tron* parents: 4211 diff changeset	483	const Industry* i = (const Industry*)a;
3539bd14f023 (svn r5907) Remove more indirection by using pointers instead of IDs. Also fix some bogus warnings on MSVC by using (void) casts tron* parents: 4211 diff changeset	484	const Industry* j = (const Industry*)b;
4282 cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	485	int r;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	486
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	487	switch (_industry_sort_order >> 1) {
4282 cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	488	default: NOT_REACHED();
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	489	case 0: /* Sort by Name (handled later) */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	490	r = 0;
4282 cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	491	break;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	492
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	493	case 1: /* Sort by Type */
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	494	r = i->type - j->type;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	495	break;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	496
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	497	case 2: /* Sort by Production */
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	498	if (i->produced_cargo[0] == CT_INVALID) {
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	499	r = (j->produced_cargo[0] == CT_INVALID ? 0 : -1);
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	500	} else {
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	501	if (j->produced_cargo[0] == CT_INVALID) {
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	502	r = 1;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	503	} else {
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	504	r =
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	505	(i->total_production[0] + i->total_production[1]) -
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	506	(j->total_production[0] + j->total_production[1]);
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	507	}
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	508	}
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	509	break;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	510
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	511	case 3: /* Sort by transported fraction */
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	512	if (i->produced_cargo[0] == CT_INVALID) {
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	513	r = (j->produced_cargo[0] == CT_INVALID ? 0 : -1);
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	514	} else {
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	515	if (j->produced_cargo[0] == CT_INVALID) {
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	516	r = 1;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	517	} else {
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	518	int pi;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	519	int pj;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	520
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	521	pi = i->pct_transported[0] * 100 >> 8;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	522	if (i->produced_cargo[1] != CT_INVALID) {
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	523	int p = i->pct_transported[1] * 100 >> 8;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	524	if (p < pi) pi = p;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	525	}
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	526
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	527	pj = j->pct_transported[0] * 100 >> 8;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	528	if (j->produced_cargo[1] != CT_INVALID) {
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	529	int p = j->pct_transported[1] * 100 >> 8;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	530	if (p < pj) pj = p;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	531	}
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	532
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	533	r = pi - pj;
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	534	}
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	535	}
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	536	break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	537	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	538
6285 187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	539	/* default to string sorting if they are otherwise equal */
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	540	if (r == 0) {
4282 cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	541	char buf1[96];
cd0af1cdc454 (svn r5912) -Fix: Sort order for produced amount and transported percentage was reversed in the industry list tron parents: 4277 diff changeset	542
2070 26c657906f25 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2063 diff changeset	543	SetDParam(0, i->town->index);
4912 d04b3f2bca70 (svn r6884) -Codechange: Add strict bounds checking in string formatting system. Darkvater parents: 4896 diff changeset	544	GetString(buf1, STR_TOWN, lastof(buf1));
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	545
4277 3539bd14f023 (svn r5907) Remove more indirection by using pointers instead of IDs. Also fix some bogus warnings on MSVC by using (void) casts tron* parents: 4211 diff changeset	546	if (j != _last_industry) {
3539bd14f023 (svn r5907) Remove more indirection by using pointers instead of IDs. Also fix some bogus warnings on MSVC by using (void) casts tron* parents: 4211 diff changeset	547	_last_industry = j;
2070 26c657906f25 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2063 diff changeset	548	SetDParam(0, j->town->index);
4912 d04b3f2bca70 (svn r6884) -Codechange: Add strict bounds checking in string formatting system. Darkvater parents: 4896 diff changeset	549	GetString(_bufcache, STR_TOWN, lastof(_bufcache));
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	550	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	551	r = strcmp(buf1, _bufcache);
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	552	}
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	553
0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	554	if (_industry_sort_order & 1) r = -r;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	555	return r;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	556	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	557
6285 187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	558	/**
187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	559	* Makes a sorted industry list.
187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	560	* When there are no industries, the list has to be made. This so when one
187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	561	* starts a new game without industries after playing a game with industries
187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	562	* the list is not populated with invalid industries from the previous game.
187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	563	*/
6298 c30fe89622df (svn r9119) [cpp_gui] -Sync with trunk (r9003:9100) bjarni parents: 6285 diff changeset	564	static void MakeSortedIndustryList()
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	565	{
4277 3539bd14f023 (svn r5907) Remove more indirection by using pointers instead of IDs. Also fix some bogus warnings on MSVC by using (void) casts tron* parents: 4211 diff changeset	566	const Industry* i;
919 b0d6c7642f99 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 893 diff changeset	567	int n = 0;
b0d6c7642f99 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 893 diff changeset	568
b0d6c7642f99 (svn r1407) -Codechange: changed a lot around _stations, _vehicles, _towns and _industries truelight parents: 893 diff changeset	569	/* Create array for sorting */
5860 7fdc9b423ba1 (svn r8066) - Codechange: MallocT(), CallocT(), ReallocT() now return the pointer to allocated memory instead of modifying the pointer given as parameter KUDr parents: 5852 diff changeset	570	_industry_sort = ReallocT(_industry_sort, GetMaxIndustryIndex() + 1);
5568 75f13d7bfaed (svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to Darkvater parents: 5247 diff changeset	571	if (_industry_sort == NULL) error("Could not allocate memory for the industry-sorting-list");
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	572
6285 187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	573	/* Don't attempt a sort if there are no industries */
187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	574	if (GetNumIndustries() != 0) {
187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	575	FOR_ALL_INDUSTRIES(i) _industry_sort[n++] = i;
187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	576	qsort((void*)_industry_sort, n, sizeof(_industry_sort[0]), GeneralIndustrySorter);
187e3ef04cc9 (svn r9004) [cpp_gui] -Sync with trunk (r8900..r9003) KUDr parents: 6268 diff changeset	577	}
4346 3f00094f2670 (svn r6047) -Codechange: FOR_ALL now _only_ loops valid items, and skips invalid ones truelight parents: 4344 diff changeset	578
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	579	_num_industry_sort = n;
4277 3539bd14f023 (svn r5907) Remove more indirection by using pointers instead of IDs. Also fix some bogus warnings on MSVC by using (void) casts tron* parents: 4211 diff changeset	580	_last_industry = NULL; // used for "cache"
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	581
5568 75f13d7bfaed (svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to Darkvater parents: 5247 diff changeset	582	DEBUG(misc, 3, "Resorting industries list");
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	583	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	584
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	585
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	586	static void IndustryDirectoryWndProc(BaseWindow w, WindowEvent e)
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	587	{
2951 2db3adee7736 (svn r3510) Fiddle with whitespace and parentheses tron parents: 2866 diff changeset	588	switch (e->event) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	589	case WE_PAINT: {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	590	int n;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	591	uint p;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	592	static const uint16 _indicator_positions[4] = {88, 187, 284, 387};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	593
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	594	if (_industry_sort_dirty) {
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	595	_industry_sort_dirty = false;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	596	MakeSortedIndustryList();
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	597	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	598
1666 b36927825adb (svn r2170) -fix: [1179457] the industry list can now no longer scroll down then the end of the list is reached (Hackykid) bjarni parents: 1388 diff changeset	599	SetVScrollCount(w, _num_industry_sort);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	600
6241 6a7a41b0cd32 (svn r8702) [cpp_gui] -Codechange: changed the 3 window functions in widget.cpp into Window methods bjarni parents: 6235 diff changeset	601	w->DrawWidgets();
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	602	DoDrawString(_industry_sort_order & 1 ? DOWNARROW : UPARROW, _indicator_positions[_industry_sort_order >> 1], 15, 0x10);
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	p = w->vscroll.pos;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	605	n = 0;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	606
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	607	while (p < _num_industry_sort) {
4277 3539bd14f023 (svn r5907) Remove more indirection by using pointers instead of IDs. Also fix some bogus warnings on MSVC by using (void) casts tron* parents: 4211 diff changeset	608	const Industry* i = _industry_sort[p];
2989 99c95a3ebcaa (svn r3564) Several smaller changes: tron parents: 2952 diff changeset	609
2070 26c657906f25 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2063 diff changeset	610	SetDParam(0, i->index);
2469 1bfbb0dc0b75 (svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate tron parents: 2406 diff changeset	611	if (i->produced_cargo[0] != CT_INVALID) {
4896 72d7a8614580 (svn r6855) - Codechange: When displaying a "quantity of cargo" string, use the {CARGO} command and supply the cargo type and quantity, instead of manually looking up the cargo type's string. peter1138 parents: 4848 diff changeset	612	SetDParam(1, i->produced_cargo[0]);
2070 26c657906f25 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2063 diff changeset	613	SetDParam(2, i->total_production[0]);
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	614
2469 1bfbb0dc0b75 (svn r2995) Replace 0xFF/0xFFFF with CT_INVALID/OWNER_SPECTATOR/INVALID_STATION where appropriate tron parents: 2406 diff changeset	615	if (i->produced_cargo[1] != CT_INVALID) {
4896 72d7a8614580 (svn r6855) - Codechange: When displaying a "quantity of cargo" string, use the {CARGO} command and supply the cargo type and quantity, instead of manually looking up the cargo type's string. peter1138 parents: 4848 diff changeset	616	SetDParam(3, i->produced_cargo[1]);
2070 26c657906f25 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2063 diff changeset	617	SetDParam(4, i->total_production[1]);
26c657906f25 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2063 diff changeset	618	SetDParam(5, i->pct_transported[0] * 100 >> 8);
26c657906f25 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2063 diff changeset	619	SetDParam(6, i->pct_transported[1] * 100 >> 8);
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	620	DrawString(4, 28 + n * 10, STR_INDUSTRYDIR_ITEM_TWO, 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	621	} else {
2070 26c657906f25 (svn r2580) Change: Added {INDUSTRY} command for printing industry names instead of the old {TOWN} {STRING} way. ludde parents: 2063 diff changeset	622	SetDParam(3, i->pct_transported[0] * 100 >> 8);
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	623	DrawString(4, 28 + n * 10, STR_INDUSTRYDIR_ITEM, 0);
0 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	} else {
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	626	DrawString(4, 28 + n * 10, STR_INDUSTRYDIR_ITEM_NOPROD, 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	627	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	628	p++;
2951 2db3adee7736 (svn r3510) Fiddle with whitespace and parentheses tron parents: 2866 diff changeset	629	if (++n == w->vscroll.cap) break;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	630	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	631	} break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	632
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	633	case WE_CLICK:
4634 897461a3e9ca (svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct belugas parents: 4617 diff changeset	634	switch (e->we.click.widget) {
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: 727 diff changeset	635	case 3: {
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	636	_industry_sort_order = _industry_sort_order == 0 ? 1 : 0;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	637	_industry_sort_dirty = true;
6235 5077e6ed3788 (svn r8683) [cpp_gui] -Codechange: first steps towards OO GUI (together with Bjarni) without changes in the logic KUDr parents: 6144 diff changeset	638	w->SetDirty();
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	639	} break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	640
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: 727 diff changeset	641	case 4: {
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	642	_industry_sort_order = _industry_sort_order == 2 ? 3 : 2;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	643	_industry_sort_dirty = true;
6235 5077e6ed3788 (svn r8683) [cpp_gui] -Codechange: first steps towards OO GUI (together with Bjarni) without changes in the logic KUDr parents: 6144 diff changeset	644	w->SetDirty();
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	645	} break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	646
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: 727 diff changeset	647	case 5: {
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	648	_industry_sort_order = _industry_sort_order == 4 ? 5 : 4;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	649	_industry_sort_dirty = true;
6235 5077e6ed3788 (svn r8683) [cpp_gui] -Codechange: first steps towards OO GUI (together with Bjarni) without changes in the logic KUDr parents: 6144 diff changeset	650	w->SetDirty();
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	651	} break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	652
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: 727 diff changeset	653	case 6: {
6308 646711c5feaa (svn r9708) [cpp_gui] -Sync with trunk (r9633:9707) KUDr parents: 6298 diff changeset	654	_industry_sort_order = _industry_sort_order == 6 ? 7 : 6;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	655	_industry_sort_dirty = true;
6235 5077e6ed3788 (svn r8683) [cpp_gui] -Codechange: first steps towards OO GUI (together with Bjarni) without changes in the logic KUDr parents: 6144 diff changeset	656	w->SetDirty();
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	657	} break;
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	658
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: 727 diff changeset	659	case 8: {
4634 897461a3e9ca (svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct belugas parents: 4617 diff changeset	660	int y = (e->we.click.pt.y - 28) / 10;
821 4af53631a47a (svn r1292) -Codechange: also updated the town/industry sort-list to be uint16 compatible truelight parents: 758 diff changeset	661	uint16 p;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	662
2989 99c95a3ebcaa (svn r3564) Several smaller changes: tron parents: 2952 diff changeset	663	if (!IS_INT_INSIDE(y, 0, w->vscroll.cap)) return;
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	664	p = y + w->vscroll.pos;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	665	if (p < _num_industry_sort) {
4277 3539bd14f023 (svn r5907) Remove more indirection by using pointers instead of IDs. Also fix some bogus warnings on MSVC by using (void) casts tron* parents: 4211 diff changeset	666	ScrollMainWindowToTile(_industry_sort[p]->xy);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	667	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	668	} break;
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	669	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	670	break;
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	case WE_4:
6235 5077e6ed3788 (svn r8683) [cpp_gui] -Codechange: first steps towards OO GUI (together with Bjarni) without changes in the logic KUDr parents: 6144 diff changeset	673	w->SetDirty();
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	674	break;
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 830 diff changeset	675
581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 830 diff changeset	676	case WE_RESIZE:
4634 897461a3e9ca (svn r6499) -Codechange: Finally, got "byte event" outside of the union WindowEvent, which is now a struct belugas parents: 4617 diff changeset	677	w->vscroll.cap += e->we.sizing.diff.y / 10;
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 830 diff changeset	678	break;
193 0a7025304867 (svn r194) -Codechange: stripping trailing-spaces. Please keep this that way! truelight parents: 176 diff changeset	679	}
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	680	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	681
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	682
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	683	/* Industry List */
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	684	static const WindowDesc _industry_directory_desc = {
5070 0bbf5264bfb7 (svn r7128) -Codechange: Replace magic numbers by magic enums (windowdesc positioning WDP_AUTO = -1) Darkvater parents: 5005 diff changeset	685	WDP_AUTO, WDP_AUTO, 508, 190,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 5860 diff changeset	686	WC_INDUSTRY_DIRECTORY, WC_NONE,
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 830 diff changeset	687	WDF_STD_TOOLTIPS \| WDF_STD_BTN \| WDF_DEF_WIDGET \| WDF_UNCLICK_BUTTONS \| WDF_STICKY_BUTTON \| WDF_RESIZABLE,
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	688	_industry_directory_widgets,
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	689	IndustryDirectoryWndProc
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	690	};
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	691
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	692
6298 c30fe89622df (svn r9119) [cpp_gui] -Sync with trunk (r9003:9100) bjarni parents: 6285 diff changeset	693	void ShowIndustryDirectory()
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	694	{
6258 a2f86b8fd99b (svn r8801) [cpp_gui] -Codechange: few changes towards OO GUI: KUDr parents: 6244 diff changeset	695	BaseWindow *w = BaseWindow::AllocateFront(&_industry_directory_desc, 0);
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	696
2989 99c95a3ebcaa (svn r3564) Several smaller changes: tron parents: 2952 diff changeset	697	if (w != NULL) {
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	698	w->vscroll.cap = 16;
6263 19dab6a68886 (svn r8913) [cpp_gui] -Codechange: use BaseWindow accessors instead of accessing window size/position directly KUDr parents: 6258 diff changeset	699	w->resize.height = w->Height() - 6 * 10; // minimum 10 items
867 581154a08a78 (svn r1348) -Feature: resizable windows. Read the comment in window.h to find out truelight parents: 830 diff changeset	700	w->resize.step_height = 10;
6235 5077e6ed3788 (svn r8683) [cpp_gui] -Codechange: first steps towards OO GUI (together with Bjarni) without changes in the logic KUDr parents: 6144 diff changeset	701	w->SetDirty();
0 29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	702	}
29654efe3188 (svn r1) Import of revision 975 of old (crashed) SVN truelight parents: diff changeset	703	}

author	KUDr
	Sat, 21 Apr 2007 08:23:57 +0000
branch	cpp_gui
changeset 6308	646711c5feaa
parent 6298	c30fe89622df
permissions	-rw-r--r--