openttd-ottdgrfs: src/genworld_gui.cpp@b39bc69bb2f2 (annotated)

4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	1	/* $Id$ */
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	2
6505 abcb0580d976 (svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style. belugas parents: 6152 diff changeset	3	/** @file genworld_gui.cpp */
abcb0580d976 (svn r8950) -Cleanup: doxygen changes. Mostly @files missing tags and a few comments style. belugas parents: 6152 diff changeset	4
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	5	#include "stdafx.h"
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	6	#include "openttd.h"
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	7	#include "heightmap.h"
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	8	#include "gui.h"
9723 eee46cb39750 (svn r11796) [NoAI] -Sync: with trunk r11502:11795. rubidium parents: 9722 diff changeset	9	#include "window_gui.h"
eee46cb39750 (svn r11796) [NoAI] -Sync: with trunk r11502:11795. rubidium parents: 9722 diff changeset	10	#include "textbuf_gui.h"
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	11	#include "gfxinit.h"
9723 eee46cb39750 (svn r11796) [NoAI] -Sync: with trunk r11502:11795. rubidium parents: 9722 diff changeset	12	#include "command_func.h"
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	13	#include "variables.h"
9723 eee46cb39750 (svn r11796) [NoAI] -Sync: with trunk r11502:11795. rubidium parents: 9722 diff changeset	14	#include "settings_func.h"
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	15	#include "debug.h"
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	16	#include "genworld.h"
5720 cc0ceeafaa55 (svn r7751) -Codechange: move network_* to a new network map. Furthermore move the low level network functions to network/core, so they can be reused by the masterserver and website-serverlist-updater. rubidium parents: 5715 diff changeset	17	#include "network/network.h"
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	18	#include "thread.h"
5228 c4a780348f66 (svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames... peter1138 parents: 5213 diff changeset	19	#include "newgrf_config.h"
9723 eee46cb39750 (svn r11796) [NoAI] -Sync: with trunk r11502:11795. rubidium parents: 9722 diff changeset	20	#include "strings_func.h"
eee46cb39750 (svn r11796) [NoAI] -Sync: with trunk r11502:11795. rubidium parents: 9722 diff changeset	21	#include "window_func.h"
eee46cb39750 (svn r11796) [NoAI] -Sync: with trunk r11502:11795. rubidium parents: 9722 diff changeset	22	#include "date_func.h"
eee46cb39750 (svn r11796) [NoAI] -Sync: with trunk r11502:11795. rubidium parents: 9722 diff changeset	23	#include "sound_func.h"
eee46cb39750 (svn r11796) [NoAI] -Sync: with trunk r11502:11795. rubidium parents: 9722 diff changeset	24	#include "fios.h"
eee46cb39750 (svn r11796) [NoAI] -Sync: with trunk r11502:11795. rubidium parents: 9722 diff changeset	25	#include "string_func.h"
eee46cb39750 (svn r11796) [NoAI] -Sync: with trunk r11502:11795. rubidium parents: 9722 diff changeset	26	#include "gfx_func.h"
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	27	#include "settings_type.h"
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	28	#include "widgets/dropdown_type.h"
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	29	#include "widgets/dropdown_func.h"
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	30	#include "core/random_func.hpp"
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	31
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	32	#include "table/strings.h"
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	33	#include "table/sprites.h"
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	34
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	35	/**
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	36	* In what 'mode' the GenerateLandscapeWindowProc is.
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	37	*/
6574 e1d1a12faaf7 (svn r9051) -Codechange: typedef [enum\|struct] Y {} X; -> [enum\|struct] X {}; rubidium parents: 6573 diff changeset	38	enum glwp_modes {
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	39	GLWP_GENERATE,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	40	GLWP_HEIGHTMAP,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	41	GLWP_SCENARIO,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	42	GLWP_END
6574 e1d1a12faaf7 (svn r9051) -Codechange: typedef [enum\|struct] Y {} X; -> [enum\|struct] X {}; rubidium parents: 6573 diff changeset	43	};
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	44
9631 8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	45	struct generate_d {
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	46	uint widget_id;
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	47	uint x;
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	48	uint y;
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	49	char name[64];
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	50	};
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	51
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	52	extern void SwitchMode(int new_mode);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	53
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	54	static inline void SetNewLandscapeType(byte landscape)
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	55	{
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	56	_opt_newgame.landscape = landscape;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	57	InvalidateWindowClasses(WC_SELECT_GAME);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	58	InvalidateWindowClasses(WC_GENERATE_LANDSCAPE);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	59	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	60
6152 42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	61	enum GenerateLandscapeWindowWidgets {
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	62	GLAND_TEMPERATE = 3,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	63	GLAND_ARCTIC,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	64	GLAND_TROPICAL,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	65	GLAND_TOYLAND,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	66
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	67	GLAND_MAPSIZE_X_TEXT,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	68	GLAND_MAPSIZE_X_PULLDOWN,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	69	GLAND_MAPSIZE_Y_TEXT,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	70	GLAND_MAPSIZE_Y_PULLDOWN,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	71
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	72	GLAND_TOWN_TEXT,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	73	GLAND_TOWN_PULLDOWN,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	74	GLAND_INDUSTRY_TEXT,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	75	GLAND_INDUSTRY_PULLDOWN,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	76
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	77	GLAND_RANDOM_TEXT,
6152 42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	78	GLAND_RANDOM_EDITBOX,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	79	GLAND_RANDOM_BUTTON,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	80
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	81	GLAND_GENERATE_BUTTON,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	82
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	83	GLAND_START_DATE_TEXT1,
6152 42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	84	GLAND_START_DATE_DOWN,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	85	GLAND_START_DATE_TEXT,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	86	GLAND_START_DATE_UP,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	87
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	88	GLAND_SNOW_LEVEL_TEXT1,
6152 42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	89	GLAND_SNOW_LEVEL_DOWN,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	90	GLAND_SNOW_LEVEL_TEXT,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	91	GLAND_SNOW_LEVEL_UP,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	92
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	93	GLAND_TREE_TEXT,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	94	GLAND_TREE_PULLDOWN,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	95	GLAND_LANDSCAPE_TEXT,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	96	GLAND_LANDSCAPE_PULLDOWN,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	97	GLAND_HEIGHTMAP_ROTATION_TEXT = GLAND_LANDSCAPE_TEXT,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	98	GLAND_HEIGHTMAP_ROTATION_PULLDOWN = GLAND_LANDSCAPE_PULLDOWN,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	99
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	100	GLAND_TERRAIN_TEXT,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	101	GLAND_TERRAIN_PULLDOWN,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	102	GLAND_WATER_TEXT,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	103	GLAND_WATER_PULLDOWN,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	104	GLAND_SMOOTHNESS_TEXT,
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	105	GLAND_SMOOTHNESS_PULLDOWN
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	106	};
42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	107
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	108	static const Widget _generate_landscape_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: 4326 diff changeset	109	{ 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: 4326 diff changeset	110	{ WWT_CAPTION, RESIZE_NONE, 13, 11, 337, 0, 13, STR_WORLD_GENERATION_CAPTION, STR_NULL},
4938 074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	111	{ WWT_PANEL, RESIZE_NONE, 13, 0, 337, 14, 267, 0x0, STR_NULL},
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	112
4938 074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	113	{ WWT_IMGBTN_2, RESIZE_NONE, 12, 10, 86, 24, 78, SPR_SELECT_TEMPERATE, STR_030E_SELECT_TEMPERATE_LANDSCAPE},
074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	114	{ WWT_IMGBTN_2, RESIZE_NONE, 12, 90, 166, 24, 78, SPR_SELECT_SUB_ARCTIC, STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE},
074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	115	{ WWT_IMGBTN_2, RESIZE_NONE, 12, 170, 246, 24, 78, SPR_SELECT_SUB_TROPICAL, STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE},
074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	116	{ WWT_IMGBTN_2, RESIZE_NONE, 12, 250, 326, 24, 78, SPR_SELECT_TOYLAND, STR_0311_SELECT_TOYLAND_LANDSCAPE},
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	117
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	118	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 91, 101, STR_MAPSIZE, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	119	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 161, 90, 101, STR_NUM_1, STR_NULL}, // Mapsize X
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	120	{ WWT_TEXT, RESIZE_NONE, 0, 168, 176, 91, 101, STR_BY, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	121	{ WWT_DROPDOWN, RESIZE_NONE, 12, 180, 227, 90, 101, STR_NUM_2, STR_NULL}, // Mapsize Y
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	122
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	123	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 113, 123, STR_NUMBER_OF_TOWNS, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	124	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 175, 112, 123, 0x0, STR_NULL}, // Number of towns
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: 4326 diff changeset	125
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	126	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 131, 141, STR_NUMBER_OF_INDUSTRIES, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	127	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 175, 130, 141, 0x0, STR_NULL}, // Number of industries
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	128
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	129	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 153, 163, STR_RANDOM_SEED, STR_NULL},
4938 074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	130	{ WWT_PANEL, RESIZE_NONE, 15, 114, 207, 152, 163, 0x0, STR_RANDOM_SEED_HELP}, // Edit box for seed
4364 0fc1e43842f6 (svn r6079) -Change: size and alignment of random seed input box and randomise button glx parents: 4344 diff changeset	131	{ WWT_TEXTBTN, RESIZE_NONE, 12, 216, 326, 152, 163, STR_RANDOM, STR_RANDOM_HELP},
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: 4326 diff changeset	132
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: 4326 diff changeset	133	{ WWT_TEXTBTN, RESIZE_NONE, 6, 243, 326, 228, 257, STR_GENERATE, STR_NULL}, // Generate 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: 4326 diff changeset	134
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	135	{ WWT_TEXT, RESIZE_NONE, 0, 182, 212, 113, 123, STR_DATE, 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: 4326 diff changeset	136	{ WWT_IMGBTN, RESIZE_NONE, 12, 216, 227, 112, 123, SPR_ARROW_DOWN, STR_029E_MOVE_THE_STARTING_DATE},
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	137	{ WWT_TEXTBTN, RESIZE_NONE, 12, 228, 314, 112, 123, STR_GENERATE_DATE, 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: 4326 diff changeset	138	{ WWT_IMGBTN, RESIZE_NONE, 12, 315, 326, 112, 123, SPR_ARROW_UP, STR_029F_MOVE_THE_STARTING_DATE},
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: 4326 diff changeset	139
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	140	{ WWT_TEXT, RESIZE_NONE, 0, 182, 278, 131, 141, STR_SNOW_LINE_HEIGHT, 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: 4326 diff changeset	141	{ WWT_IMGBTN, RESIZE_NONE, 12, 282, 293, 130, 141, SPR_ARROW_DOWN, STR_SNOW_LINE_DOWN},
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	142	{ WWT_TEXTBTN, RESIZE_NONE, 12, 294, 314, 130, 141, STR_NUM_3, 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: 4326 diff changeset	143	{ WWT_IMGBTN, RESIZE_NONE, 12, 315, 326, 130, 141, SPR_ARROW_UP, STR_SNOW_LINE_UP},
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: 4326 diff changeset	144
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	145	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 193, 203, STR_TREE_PLACER, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	146	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 231, 192, 203, 0x0, STR_NULL}, // Tree placer
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	147
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	148	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 175, 185, STR_LAND_GENERATOR, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	149	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 231, 174, 185, 0x0, STR_NULL}, // Landscape generator
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	150
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	151	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 211, 221, STR_TERRAIN_TYPE, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	152	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 231, 210, 221, 0x0, STR_NULL}, // Terrain type
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	153
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	154	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 229, 239, STR_QUANTITY_OF_SEA_LAKES, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	155	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 231, 228, 239, 0x0, STR_NULL}, // Water quantity
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	156
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	157	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 245, 257, STR_SMOOTHNESS, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	158	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 231, 246, 257, 0x0, STR_NULL}, // Map smoothness
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	159	{ WIDGETS_END},
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	160	};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	161
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	162	static const Widget _heightmap_load_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: 4326 diff changeset	163	{ 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: 4326 diff changeset	164	{ WWT_CAPTION, RESIZE_NONE, 13, 11, 337, 0, 13, STR_WORLD_GENERATION_CAPTION, STR_NULL},
4938 074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	165	{ WWT_PANEL, RESIZE_NONE, 13, 0, 337, 14, 235, 0x0, STR_NULL},
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	166
4938 074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	167	{ WWT_IMGBTN_2, RESIZE_NONE, 12, 10, 86, 24, 78, SPR_SELECT_TEMPERATE, STR_030E_SELECT_TEMPERATE_LANDSCAPE},
074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	168	{ WWT_IMGBTN_2, RESIZE_NONE, 12, 90, 166, 24, 78, SPR_SELECT_SUB_ARCTIC, STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE},
074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	169	{ WWT_IMGBTN_2, RESIZE_NONE, 12, 170, 246, 24, 78, SPR_SELECT_SUB_TROPICAL, STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE},
074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	170	{ WWT_IMGBTN_2, RESIZE_NONE, 12, 250, 326, 24, 78, SPR_SELECT_TOYLAND, STR_0311_SELECT_TOYLAND_LANDSCAPE},
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	171
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	172	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 113, 123, STR_MAPSIZE, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	173	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 161, 112, 123, STR_NUM_1, STR_NULL}, // Mapsize X
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	174	{ WWT_TEXT, RESIZE_NONE, 0, 168, 176, 113, 123, STR_BY, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	175	{ WWT_DROPDOWN, RESIZE_NONE, 12, 180, 227, 112, 123, STR_NUM_2, STR_NULL}, // Mapsize Y
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	176
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	177	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 135, 145, STR_NUMBER_OF_TOWNS, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	178	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 175, 134, 145, 0x0, STR_NULL}, // Number of towns
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	179
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	180	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 153, 163, STR_NUMBER_OF_INDUSTRIES, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	181	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 175, 152, 163, 0x0, STR_NULL}, // Number of industries
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	182
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	183	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 175, 185, STR_RANDOM_SEED, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	184	{ WWT_PANEL, RESIZE_NONE, 15, 114, 207, 174, 185, 0x0, STR_RANDOM_SEED_HELP}, // Edit box for seed
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	185	{ WWT_TEXTBTN, RESIZE_NONE, 12, 216, 326, 174, 185, STR_RANDOM, STR_RANDOM_HELP},
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	186
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: 4326 diff changeset	187	{ WWT_TEXTBTN, RESIZE_NONE, 6, 243, 326, 196, 225, STR_GENERATE, STR_NULL}, // Generate 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: 4326 diff changeset	188
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	189	{ WWT_TEXT, RESIZE_NONE, 0, 182, 212, 135, 145, STR_DATE, 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: 4326 diff changeset	190	{ WWT_IMGBTN, RESIZE_NONE, 12, 216, 227, 134, 145, SPR_ARROW_DOWN, STR_029E_MOVE_THE_STARTING_DATE},
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	191	{ WWT_TEXTBTN, RESIZE_NONE, 12, 228, 314, 134, 145, STR_GENERATE_DATE, 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: 4326 diff changeset	192	{ WWT_IMGBTN, RESIZE_NONE, 12, 315, 326, 134, 145, SPR_ARROW_UP, STR_029F_MOVE_THE_STARTING_DATE},
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: 4326 diff changeset	193
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	194	{ WWT_TEXT, RESIZE_NONE, 0, 182, 278, 153, 163, STR_SNOW_LINE_HEIGHT, 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: 4326 diff changeset	195	{ WWT_IMGBTN, RESIZE_NONE, 12, 282, 293, 152, 163, SPR_ARROW_DOWN, STR_SNOW_LINE_DOWN},
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	196	{ WWT_TEXTBTN, RESIZE_NONE, 12, 294, 314, 152, 163, STR_NUM_3, 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: 4326 diff changeset	197	{ WWT_IMGBTN, RESIZE_NONE, 12, 315, 326, 152, 163, SPR_ARROW_UP, STR_SNOW_LINE_UP},
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: 4326 diff changeset	198
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	199	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 197, 207, STR_TREE_PLACER, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	200	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 231, 196, 207, STR_0225, STR_NULL}, // Tree placer
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: 4326 diff changeset	201
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	202	{ WWT_TEXT, RESIZE_NONE, 0, 12, 110, 215, 225, STR_HEIGHTMAP_ROTATION, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	203	{ WWT_DROPDOWN, RESIZE_NONE, 12, 114, 231, 214, 225, STR_0225, STR_NULL}, // Heightmap rotation
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	204
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	205	{ WIDGETS_END},
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	206	};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	207
6150 648233476115 (svn r8522) -Regression (r8512): The flat/random window moved the to scenario editor did not use the right settings for generating land Darkvater parents: 6145 diff changeset	208	void StartGeneratingLandscape(glwp_modes mode)
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	209	{
6150 648233476115 (svn r8522) -Regression (r8512): The flat/random window moved the to scenario editor did not use the right settings for generating land Darkvater parents: 6145 diff changeset	210	DeleteAllNonVitalWindows();
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	211
6150 648233476115 (svn r8522) -Regression (r8512): The flat/random window moved the to scenario editor did not use the right settings for generating land Darkvater parents: 6145 diff changeset	212	/* Copy all XXX_newgame to XXX when coming from outside the editor */
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	213	UpdatePatches();
6150 648233476115 (svn r8522) -Regression (r8512): The flat/random window moved the to scenario editor did not use the right settings for generating land Darkvater parents: 6145 diff changeset	214	_opt = _opt_newgame;
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	215	_opt_ptr = &_opt;
5228 c4a780348f66 (svn r7348) -Feature: Initial support for saving NewGRF settings with savegames. Back up your savegames... peter1138 parents: 5213 diff changeset	216	ResetGRFConfig(true);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	217
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	218	SndPlayFx(SND_15_BEEP);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	219	switch (mode) {
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	220	case GLWP_GENERATE: _switch_mode = (_game_mode == GM_EDITOR) ? SM_GENRANDLAND : SM_NEWGAME; break;
d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	221	case GLWP_HEIGHTMAP: _switch_mode = (_game_mode == GM_EDITOR) ? SM_LOAD_HEIGHTMAP : SM_START_HEIGHTMAP; break;
6150 648233476115 (svn r8522) -Regression (r8512): The flat/random window moved the to scenario editor did not use the right settings for generating land Darkvater parents: 6145 diff changeset	222	case GLWP_SCENARIO: _switch_mode = SM_EDITOR; break;
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	223	default: NOT_REACHED();
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	224	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	225	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	226
9620 31e38d28a0af (svn r9816) [NoAI] -Sync with trunk r9712:9815 except r9759 (MorphOS threading) because that needs special attention. rubidium parents: 9601 diff changeset	227	static void LandscapeGenerationCallback(Window *w, bool confirmed)
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	228	{
5669 ea25407ffa55 (svn r7621) -Codechange: Rework ShowQuery into a general modal popup window. It gets passed Darkvater parents: 5568 diff changeset	229	if (confirmed) StartGeneratingLandscape((glwp_modes)w->window_number);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	230	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	231
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	232	static DropDownList *BuildMapsizeDropDown()
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	233	{
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	234	DropDownList *list = new DropDownList();
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	235
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	236	for (uint i = 6; i <= 11; i++) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	237	DropDownListParamStringItem *item = new DropDownListParamStringItem(STR_JUST_INT, i, false);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	238	item->SetParam(0, 1 << i);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	239	list->push_back(item);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	240	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	241
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	242	return list;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	243	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	244
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	245	static void GenerateLandscapeWndProc(Window w, WindowEvent e)
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	246	{
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	247	static const StringID elevations[] = {STR_682A_VERY_FLAT, STR_682B_FLAT, STR_682C_HILLY, STR_682D_MOUNTAINOUS, INVALID_STRING_ID};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	248	static const StringID sea_lakes[] = {STR_VERY_LOW, STR_6820_LOW, STR_6821_MEDIUM, STR_6822_HIGH, INVALID_STRING_ID};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	249	static const StringID smoothness[] = {STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH, STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_SMOOTH, STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_ROUGH, STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_ROUGH, INVALID_STRING_ID};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	250	static const StringID tree_placer[] = {STR_CONFIG_PATCHES_TREE_PLACER_NONE, STR_CONFIG_PATCHES_TREE_PLACER_ORIGINAL, STR_CONFIG_PATCHES_TREE_PLACER_IMPROVED, INVALID_STRING_ID};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	251	static const StringID rotation[] = {STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE, STR_CONFIG_PATCHES_HEIGHTMAP_ROTATION_CLOCKWISE, INVALID_STRING_ID};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	252	static const StringID landscape[] = {STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL, STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS, INVALID_STRING_ID};
9620 31e38d28a0af (svn r9816) [NoAI] -Sync with trunk r9712:9815 except r9759 (MorphOS threading) because that needs special attention. rubidium parents: 9601 diff changeset	253	static const StringID num_towns[] = {STR_NUM_VERY_LOW, STR_6816_LOW, STR_6817_NORMAL, STR_6818_HIGH, INVALID_STRING_ID};
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	254	static const StringID num_inds[] = {STR_NONE, STR_NUM_VERY_LOW, STR_6816_LOW, STR_6817_NORMAL, STR_6818_HIGH, INVALID_STRING_ID};
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	255
5715 0dceee0154a5 (svn r7733) -Fix (r5946): do not use WP(w, querystr_d) and WP(w, def_d) for the same window. rubidium parents: 5682 diff changeset	256	/* Data used for the generate seed edit box */
0dceee0154a5 (svn r7733) -Fix (r5946): do not use WP(w, querystr_d) and WP(w, def_d) for the same window. rubidium parents: 5682 diff changeset	257	static querystr_d _genseed_query;
6152 42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	258	static char _genseed_buffer[11];
5715 0dceee0154a5 (svn r7733) -Fix (r5946): do not use WP(w, querystr_d) and WP(w, def_d) for the same window. rubidium parents: 5682 diff changeset	259
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	260	glwp_modes mode = (glwp_modes)w->window_number;
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	261
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	262	switch (e->event) {
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	263	case WE_CREATE:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	264	w->LowerWidget(_opt_newgame.landscape + GLAND_TEMPERATE);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	265
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	266	snprintf(_genseed_buffer, sizeof(_genseed_buffer), "%u", _patches_newgame.generation_seed);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	267	InitializeTextBuffer(&_genseed_query.text, _genseed_buffer, lengthof(_genseed_buffer), 120);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	268	_genseed_query.caption = STR_NULL;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	269	_genseed_query.afilter = CS_NUMERAL;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	270	break;
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	271
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	272	case WE_PAINT:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	273	/* You can't select smoothness if not terragenesis */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	274	if (mode == GLWP_GENERATE) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	275	w->SetWidgetDisabledState(GLAND_SMOOTHNESS_PULLDOWN, _patches_newgame.land_generator == 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	276	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	277	/* Disable snowline if not hilly */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	278	w->SetWidgetDisabledState(GLAND_SNOW_LEVEL_TEXT, _opt_newgame.landscape != LT_ARCTIC);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	279	/* Disable town, industry and trees in SE */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	280	w->SetWidgetDisabledState(GLAND_TOWN_PULLDOWN, _game_mode == GM_EDITOR);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	281	w->SetWidgetDisabledState(GLAND_INDUSTRY_PULLDOWN, _game_mode == GM_EDITOR);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	282	w->SetWidgetDisabledState(GLAND_TREE_PULLDOWN, _game_mode == GM_EDITOR);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	283
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	284	w->SetWidgetDisabledState(GLAND_START_DATE_DOWN, _patches_newgame.starting_year <= MIN_YEAR);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	285	w->SetWidgetDisabledState(GLAND_START_DATE_UP, _patches_newgame.starting_year >= MAX_YEAR);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	286	w->SetWidgetDisabledState(GLAND_SNOW_LEVEL_DOWN, _patches_newgame.snow_line_height <= 2 \|\| _opt_newgame.landscape != LT_ARCTIC);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	287	w->SetWidgetDisabledState(GLAND_SNOW_LEVEL_UP, _patches_newgame.snow_line_height >= MAX_SNOWLINE_HEIGHT \|\| _opt_newgame.landscape != LT_ARCTIC);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	288
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	289	w->SetWidgetLoweredState(GLAND_TEMPERATE, _opt_newgame.landscape == LT_TEMPERATE);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	290	w->SetWidgetLoweredState(GLAND_ARCTIC, _opt_newgame.landscape == LT_ARCTIC);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	291	w->SetWidgetLoweredState(GLAND_TROPICAL, _opt_newgame.landscape == LT_TROPIC);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	292	w->SetWidgetLoweredState(GLAND_TOYLAND, _opt_newgame.landscape == LT_TOYLAND);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	293
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	294	if (_game_mode == GM_EDITOR) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	295	w->widget[GLAND_TOWN_PULLDOWN].data = STR_6836_OFF;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	296	w->widget[GLAND_INDUSTRY_PULLDOWN].data = STR_6836_OFF;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	297	} else {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	298	w->widget[GLAND_TOWN_PULLDOWN].data = num_towns[_opt_newgame.diff.number_towns];
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	299	w->widget[GLAND_INDUSTRY_PULLDOWN].data = num_inds[_opt_newgame.diff.number_industries];
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	300	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	301
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	302	if (mode == GLWP_GENERATE) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	303	w->widget[GLAND_LANDSCAPE_PULLDOWN].data = landscape[_patches_newgame.land_generator];
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	304	w->widget[GLAND_TREE_PULLDOWN].data = tree_placer[_patches_newgame.tree_placer];
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	305	w->widget[GLAND_TERRAIN_PULLDOWN].data = elevations[_opt_newgame.diff.terrain_type];
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	306	w->widget[GLAND_WATER_PULLDOWN].data = sea_lakes[_opt_newgame.diff.quantity_sea_lakes];
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	307	w->widget[GLAND_SMOOTHNESS_PULLDOWN].data = smoothness[_patches_newgame.tgen_smoothness];
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	308	} else {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	309	w->widget[GLAND_TREE_PULLDOWN].data = tree_placer[_patches_newgame.tree_placer];
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	310	w->widget[GLAND_HEIGHTMAP_ROTATION_PULLDOWN].data = rotation[_patches_newgame.heightmap_rotation];
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	311	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	312
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	313	/* Set parameters for widget text that requires them. */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	314	SetDParam(0, ConvertYMDToDate(_patches_newgame.starting_year, 0, 1)); // GLAND_START_DATE_TEXT
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	315	SetDParam(1, 1 << _patches_newgame.map_x); // GLAND_MAPSIZE_X_PULLDOWN
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	316	SetDParam(2, 1 << _patches_newgame.map_y); // GLAND_MAPSIZE_Y_PULLDOWN
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	317	SetDParam(3, _patches_newgame.snow_line_height); // GLAND_SNOW_LEVEL_TEXT
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	318
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	319	DrawWindowWidgets(w);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	320
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	321	DrawEditBox(w, &_genseed_query, GLAND_RANDOM_EDITBOX);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	322
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	323	if (mode != GLWP_GENERATE) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	324	char buffer[512];
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	325
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	326	if (_patches_newgame.heightmap_rotation == HM_CLOCKWISE) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	327	SetDParam(0, WP(w, generate_d).y);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	328	SetDParam(1, WP(w, generate_d).x);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	329	} else {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	330	SetDParam(0, WP(w, generate_d).x);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	331	SetDParam(1, WP(w, generate_d).y);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	332	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	333	GetString(buffer, STR_HEIGHTMAP_SIZE, lastof(buffer));
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	334	DrawStringRightAligned(326, 91, STR_HEIGHTMAP_SIZE, TC_BLACK);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	335
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	336	DrawString( 12, 91, STR_HEIGHTMAP_NAME, TC_BLACK);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	337	SetDParamStr(0, WP(w, generate_d).name);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	338	DrawStringTruncated(114, 91, STR_ORANGE, TC_BLACK, 326 - 114 - GetStringBoundingBox(buffer).width - 5);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	339	}
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	340	break;
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	341
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	342	case WE_CLICK:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	343	switch (e->we.click.widget) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	344	case 0: DeleteWindow(w); break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	345
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	346	case GLAND_TEMPERATE:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	347	case GLAND_ARCTIC:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	348	case GLAND_TROPICAL:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	349	case GLAND_TOYLAND:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	350	w->RaiseWidget(_opt_newgame.landscape + GLAND_TEMPERATE);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	351	SetNewLandscapeType(e->we.click.widget - GLAND_TEMPERATE);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	352	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	353
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	354	case GLAND_MAPSIZE_X_PULLDOWN: // Mapsize X
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	355	ShowDropDownList(w, BuildMapsizeDropDown(), _patches_newgame.map_x, GLAND_MAPSIZE_X_PULLDOWN);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	356	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	357
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	358	case GLAND_MAPSIZE_Y_PULLDOWN: // Mapsize Y
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	359	ShowDropDownList(w, BuildMapsizeDropDown(), _patches_newgame.map_y, GLAND_MAPSIZE_Y_PULLDOWN);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	360	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	361
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	362	case GLAND_TOWN_PULLDOWN: // Number of towns
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	363	ShowDropDownMenu(w, num_towns, _opt_newgame.diff.number_towns, GLAND_TOWN_PULLDOWN, 0, 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	364	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	365
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	366	case GLAND_INDUSTRY_PULLDOWN: // Number of industries
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	367	ShowDropDownMenu(w, num_inds, _opt_newgame.diff.number_industries, GLAND_INDUSTRY_PULLDOWN, 0, 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	368	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	369
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	370	case GLAND_RANDOM_BUTTON: // Random seed
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	371	_patches_newgame.generation_seed = InteractiveRandom();
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	372	snprintf(_genseed_buffer, lengthof(_genseed_buffer), "%u", _patches_newgame.generation_seed);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	373	UpdateTextBufferSize(&_genseed_query.text);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	374	SetWindowDirty(w);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	375	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	376
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	377	case GLAND_GENERATE_BUTTON: // Generate
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	378
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	379	UpdatePatches();
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	380
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	381	if (_patches.town_layout == TL_NO_ROADS) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	382	ShowQuery(
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	383	STR_TOWN_LAYOUT_WARNING_CAPTION,
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	384	STR_TOWN_LAYOUT_WARNING_MESSAGE,
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	385	w,
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	386	LandscapeGenerationCallback);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	387	} else if (mode == GLWP_HEIGHTMAP &&
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	388	(WP(w, generate_d).x * 2 < (1U << _patches_newgame.map_x) \|\|
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	389	WP(w, generate_d).x / 2 > (1U << _patches_newgame.map_x) \|\|
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	390	WP(w, generate_d).y * 2 < (1U << _patches_newgame.map_y) \|\|
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	391	WP(w, generate_d).y / 2 > (1U << _patches_newgame.map_y))) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	392	ShowQuery(
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	393	STR_HEIGHTMAP_SCALE_WARNING_CAPTION,
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	394	STR_HEIGHTMAP_SCALE_WARNING_MESSAGE,
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	395	w,
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	396	LandscapeGenerationCallback);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	397	} else {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	398	StartGeneratingLandscape(mode);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	399	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	400	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	401
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	402	case GLAND_START_DATE_DOWN:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	403	case GLAND_START_DATE_UP: // Year buttons
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	404	/* Don't allow too fast scrolling */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	405	if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	406	w->HandleButtonClick(e->we.click.widget);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	407	SetWindowDirty(w);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	408
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	409	_patches_newgame.starting_year = Clamp(_patches_newgame.starting_year + e->we.click.widget - GLAND_START_DATE_TEXT, MIN_YEAR, MAX_YEAR);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	410	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	411	_left_button_clicked = false;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	412	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	413
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	414	case GLAND_START_DATE_TEXT: // Year text
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	415	WP(w, generate_d).widget_id = GLAND_START_DATE_TEXT;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	416	SetDParam(0, _patches_newgame.starting_year);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	417	ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_START_DATE_QUERY_CAPT, 8, 100, w, CS_NUMERAL);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	418	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	419
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	420	case GLAND_SNOW_LEVEL_DOWN:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	421	case GLAND_SNOW_LEVEL_UP: // Snow line buttons
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	422	/* Don't allow too fast scrolling */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	423	if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	424	w->HandleButtonClick(e->we.click.widget);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	425	SetWindowDirty(w);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	426
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	427	_patches_newgame.snow_line_height = Clamp(_patches_newgame.snow_line_height + e->we.click.widget - GLAND_SNOW_LEVEL_TEXT, 2, MAX_SNOWLINE_HEIGHT);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	428	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	429	_left_button_clicked = false;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	430	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	431
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	432	case GLAND_SNOW_LEVEL_TEXT: // Snow line text
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	433	WP(w, generate_d).widget_id = GLAND_SNOW_LEVEL_TEXT;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	434	SetDParam(0, _patches_newgame.snow_line_height);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	435	ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_SNOW_LINE_QUERY_CAPT, 3, 100, w, CS_NUMERAL);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	436	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	437
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	438	case GLAND_TREE_PULLDOWN: // Tree placer
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	439	ShowDropDownMenu(w, tree_placer, _patches_newgame.tree_placer, GLAND_TREE_PULLDOWN, 0, 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	440	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	441
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	442	case GLAND_LANDSCAPE_PULLDOWN: // Landscape generator OR Heightmap rotation
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	443	/* case GLAND_HEIGHTMAP_ROTATION_TEXT: case GLAND_HEIGHTMAP_ROTATION_PULLDOWN:*/
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	444	if (mode == GLWP_HEIGHTMAP) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	445	ShowDropDownMenu(w, rotation, _patches_newgame.heightmap_rotation, GLAND_HEIGHTMAP_ROTATION_PULLDOWN, 0, 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	446	} else {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	447	ShowDropDownMenu(w, landscape, _patches_newgame.land_generator, GLAND_LANDSCAPE_PULLDOWN, 0, 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	448	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	449	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	450
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	451	case GLAND_TERRAIN_PULLDOWN: // Terrain type
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	452	ShowDropDownMenu(w, elevations, _opt_newgame.diff.terrain_type, GLAND_TERRAIN_PULLDOWN, 0, 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	453	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	454
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	455	case GLAND_WATER_PULLDOWN: // Water quantity
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	456	ShowDropDownMenu(w, sea_lakes, _opt_newgame.diff.quantity_sea_lakes, GLAND_WATER_PULLDOWN, 0, 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	457	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	458
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	459	case GLAND_SMOOTHNESS_PULLDOWN: // Map smoothness
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	460	ShowDropDownMenu(w, smoothness, _patches_newgame.tgen_smoothness, GLAND_SMOOTHNESS_PULLDOWN, 0, 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	461	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	462	}
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	463	break;
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	464
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	465	case WE_MOUSELOOP:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	466	HandleEditBox(w, &_genseed_query, GLAND_RANDOM_EDITBOX);
6152 42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	467	break;
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	468
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	469	case WE_KEYPRESS:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	470	HandleEditBoxKey(w, &_genseed_query, GLAND_RANDOM_EDITBOX, e);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	471	/* the seed is unsigned, therefore atoi cannot be used.
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	472	* As 2^32 - 1 (MAX_UVALUE(uint32)) is a 'magic' value
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	473	* (use random seed) it should not be possible to be
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	474	* entered into the input field; the generate seed
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	475	* button can be used instead. */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	476	_patches_newgame.generation_seed = minu(strtoul(_genseed_buffer, NULL, sizeof(_genseed_buffer) - 1), MAX_UVALUE(uint32) - 1);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	477	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	478
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	479	case WE_DROPDOWN_SELECT:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	480	switch (e->we.dropdown.button) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	481	case GLAND_MAPSIZE_X_PULLDOWN: _patches_newgame.map_x = e->we.dropdown.index; break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	482	case GLAND_MAPSIZE_Y_PULLDOWN: _patches_newgame.map_y = e->we.dropdown.index; break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	483	case GLAND_TREE_PULLDOWN: _patches_newgame.tree_placer = e->we.dropdown.index; break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	484	case GLAND_SMOOTHNESS_PULLDOWN: _patches_newgame.tgen_smoothness = e->we.dropdown.index; break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	485
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	486	case GLAND_TOWN_PULLDOWN:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	487	_opt_newgame.diff.number_towns = e->we.dropdown.index;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	488	if (_opt_newgame.diff_level != 3) ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	489	DoCommandP(0, 2, _opt_newgame.diff.number_towns, NULL, CMD_CHANGE_DIFFICULTY_LEVEL);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	490	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	491
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	492	case GLAND_INDUSTRY_PULLDOWN:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	493	_opt_newgame.diff.number_industries = e->we.dropdown.index;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	494	if (_opt_newgame.diff_level != 3) ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	495	DoCommandP(0, 3, _opt_newgame.diff.number_industries, NULL, CMD_CHANGE_DIFFICULTY_LEVEL);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	496	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	497
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	498	case GLAND_LANDSCAPE_PULLDOWN:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	499	/* case GLAND_HEIGHTMAP_PULLDOWN: */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	500	if (mode == GLWP_HEIGHTMAP) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	501	_patches_newgame.heightmap_rotation = e->we.dropdown.index;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	502	} else {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	503	_patches_newgame.land_generator = e->we.dropdown.index;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	504	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	505	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	506
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	507	case GLAND_TERRAIN_PULLDOWN:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	508	_opt_newgame.diff.terrain_type = e->we.dropdown.index;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	509	if (_opt_newgame.diff_level != 3) ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	510	DoCommandP(0, 12, _opt_newgame.diff.terrain_type, NULL, CMD_CHANGE_DIFFICULTY_LEVEL);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	511	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	512
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	513	case GLAND_WATER_PULLDOWN:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	514	_opt_newgame.diff.quantity_sea_lakes = e->we.dropdown.index;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	515	if (_opt_newgame.diff_level != 3) ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	516	DoCommandP(0, 13, _opt_newgame.diff.quantity_sea_lakes, NULL, CMD_CHANGE_DIFFICULTY_LEVEL);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	517	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	518	}
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	519	SetWindowDirty(w);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	520	break;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	521
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	522	case WE_ON_EDIT_TEXT:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	523	if (e->we.edittext.str != NULL) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	524	int32 value = atoi(e->we.edittext.str);
6152 42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	525
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	526	switch (WP(w, generate_d).widget_id) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	527	case GLAND_START_DATE_TEXT:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	528	w->InvalidateWidget(GLAND_START_DATE_TEXT);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	529	_patches_newgame.starting_year = Clamp(value, MIN_YEAR, MAX_YEAR);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	530	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	531
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	532	case GLAND_SNOW_LEVEL_TEXT:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	533	w->InvalidateWidget(GLAND_SNOW_LEVEL_TEXT);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	534	_patches_newgame.snow_line_height = Clamp(value, 2, MAX_SNOWLINE_HEIGHT);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	535	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	536	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	537
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	538	SetWindowDirty(w);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	539	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	540	break;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	541	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	542	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	543
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	544	static const WindowDesc _generate_landscape_desc = {
9694 e72987579514 (svn r10775) [NoAI] -Sync: with trunk r10535:r10774. rubidium parents: 9631 diff changeset	545	WDP_CENTER, WDP_CENTER, 338, 268, 338, 268,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 6143 diff changeset	546	WC_GENERATE_LANDSCAPE, WC_NONE,
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	547	WDF_STD_TOOLTIPS \| WDF_DEF_WIDGET \| WDF_UNCLICK_BUTTONS,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	548	_generate_landscape_widgets,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	549	GenerateLandscapeWndProc,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	550	};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	551
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	552	static const WindowDesc _heightmap_load_desc = {
9694 e72987579514 (svn r10775) [NoAI] -Sync: with trunk r10535:r10774. rubidium parents: 9631 diff changeset	553	WDP_CENTER, WDP_CENTER, 338, 236, 338, 236,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 6143 diff changeset	554	WC_GENERATE_LANDSCAPE, WC_NONE,
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	555	WDF_STD_TOOLTIPS \| WDF_DEF_WIDGET \| WDF_STD_BTN \| WDF_UNCLICK_BUTTONS,
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	556	_heightmap_load_widgets,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	557	GenerateLandscapeWndProc,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	558	};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	559
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	560	static void _ShowGenerateLandscape(glwp_modes mode)
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	561	{
9631 8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	562	uint x = 0;
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	563	uint y = 0;
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	564
6152 42ce779b1765 (svn r8524) -Cleanup: Ala r8509 add some enum names to the generate landscape window Darkvater parents: 6150 diff changeset	565	DeleteWindowByClass(WC_GENERATE_LANDSCAPE);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	566
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	567	/* Always give a new seed if not editor */
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	568	if (_game_mode != GM_EDITOR) _patches_newgame.generation_seed = InteractiveRandom();
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	569
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	570	if (mode == GLWP_HEIGHTMAP) {
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	571	/* If the function returns negative, it means there was a problem loading the heightmap */
9631 8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	572	if (!GetHeightmapDimensions(_file_to_saveload.name, &x, &y)) return;
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	573	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	574
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	575	Window *w = AllocateWindowDescFront((mode == GLWP_HEIGHTMAP) ? &_heightmap_load_desc : &_generate_landscape_desc, mode);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	576
9631 8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	577	if (w == NULL) return;
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	578
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	579	if (mode == GLWP_HEIGHTMAP) {
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	580	WP(w, generate_d).x = x;
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	581	WP(w, generate_d).y = y;
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	582	strecpy(WP(w, generate_d).name, _file_to_saveload.title, lastof(WP(w, generate_d).name));
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	583	}
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	584
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	585	InvalidateWindow(WC_GENERATE_LANDSCAPE, mode);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	586	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	587
6573 7624f942237f (svn r9050) -Codechange: Foo(void) -> Foo() rubidium parents: 6505 diff changeset	588	void ShowGenerateLandscape()
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	589	{
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	590	_ShowGenerateLandscape(GLWP_GENERATE);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	591	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	592
6573 7624f942237f (svn r9050) -Codechange: Foo(void) -> Foo() rubidium parents: 6505 diff changeset	593	void ShowHeightmapLoad()
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	594	{
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	595	_ShowGenerateLandscape(GLWP_HEIGHTMAP);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	596	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	597
6573 7624f942237f (svn r9050) -Codechange: Foo(void) -> Foo() rubidium parents: 6505 diff changeset	598	void StartScenarioEditor()
6150 648233476115 (svn r8522) -Regression (r8512): The flat/random window moved the to scenario editor did not use the right settings for generating land Darkvater parents: 6145 diff changeset	599	{
9620 31e38d28a0af (svn r9816) [NoAI] -Sync with trunk r9712:9815 except r9759 (MorphOS threading) because that needs special attention. rubidium parents: 9601 diff changeset	600	if (_patches_newgame.town_layout == TL_NO_ROADS) {
31e38d28a0af (svn r9816) [NoAI] -Sync with trunk r9712:9815 except r9759 (MorphOS threading) because that needs special attention. rubidium parents: 9601 diff changeset	601	_patches_newgame.town_layout = TL_ORIGINAL;
31e38d28a0af (svn r9816) [NoAI] -Sync with trunk r9712:9815 except r9759 (MorphOS threading) because that needs special attention. rubidium parents: 9601 diff changeset	602	}
31e38d28a0af (svn r9816) [NoAI] -Sync with trunk r9712:9815 except r9759 (MorphOS threading) because that needs special attention. rubidium parents: 9601 diff changeset	603
6150 648233476115 (svn r8522) -Regression (r8512): The flat/random window moved the to scenario editor did not use the right settings for generating land Darkvater parents: 6145 diff changeset	604	StartGeneratingLandscape(GLWP_SCENARIO);
648233476115 (svn r8522) -Regression (r8512): The flat/random window moved the to scenario editor did not use the right settings for generating land Darkvater parents: 6145 diff changeset	605	}
648233476115 (svn r8522) -Regression (r8512): The flat/random window moved the to scenario editor did not use the right settings for generating land Darkvater parents: 6145 diff changeset	606
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	607	void StartNewGameWithoutGUI(uint seed)
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	608	{
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	609	/* GenerateWorld takes care of the possible GENERATE_NEW_SEED value in 'seed' */
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	610	_patches_newgame.generation_seed = seed;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	611
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	612	StartGeneratingLandscape(GLWP_GENERATE);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	613	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	614
6143 87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	615	enum CreateScenarioWindowWidgets {
87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	616	CSCEN_TEMPERATE = 3,
87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	617	CSCEN_ARCTIC,
87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	618	CSCEN_TROPICAL,
87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	619	CSCEN_TOYLAND,
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	620	CSCEN_EMPTY_WORLD,
d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	621	CSCEN_RANDOM_WORLD,
6143 87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	622	CSCEN_MAPSIZE_X_TEXT,
87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	623	CSCEN_MAPSIZE_X_PULLDOWN,
87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	624	CSCEN_MAPSIZE_Y_TEXT,
87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	625	CSCEN_MAPSIZE_Y_PULLDOWN,
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	626	CSCEN_START_DATE_LABEL,
6143 87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	627	CSCEN_START_DATE_DOWN,
87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	628	CSCEN_START_DATE_TEXT,
87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	629	CSCEN_START_DATE_UP,
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	630	CSCEN_FLAT_LAND_HEIGHT_LABEL,
6143 87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	631	CSCEN_FLAT_LAND_HEIGHT_DOWN,
87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	632	CSCEN_FLAT_LAND_HEIGHT_TEXT,
87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	633	CSCEN_FLAT_LAND_HEIGHT_UP
87e99d425124 (svn r8509) -Cleanup: Add some enum names to the create scenario window Darkvater parents: 5919 diff changeset	634	};
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	635
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	636
d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	637	static void CreateScenarioWndProc(Window w, WindowEvent e)
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	638	{
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	639	switch (e->event) {
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	640	case WE_CREATE:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	641	w->LowerWidget(_opt_newgame.landscape + CSCEN_TEMPERATE);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	642	break;
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	643
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	644	case WE_PAINT:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	645	w->SetWidgetDisabledState(CSCEN_START_DATE_DOWN, _patches_newgame.starting_year <= MIN_YEAR);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	646	w->SetWidgetDisabledState(CSCEN_START_DATE_UP, _patches_newgame.starting_year >= MAX_YEAR);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	647	w->SetWidgetDisabledState(CSCEN_FLAT_LAND_HEIGHT_DOWN, _patches_newgame.se_flat_world_height <= 0);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	648	w->SetWidgetDisabledState(CSCEN_FLAT_LAND_HEIGHT_UP, _patches_newgame.se_flat_world_height >= MAX_TILE_HEIGHT);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	649
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	650	w->SetWidgetLoweredState(CSCEN_TEMPERATE, _opt_newgame.landscape == LT_TEMPERATE);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	651	w->SetWidgetLoweredState(CSCEN_ARCTIC, _opt_newgame.landscape == LT_ARCTIC);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	652	w->SetWidgetLoweredState(CSCEN_TROPICAL, _opt_newgame.landscape == LT_TROPIC);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	653	w->SetWidgetLoweredState(CSCEN_TOYLAND, _opt_newgame.landscape == LT_TOYLAND);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	654
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	655	/* Set parameters for widget text that requires them */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	656	SetDParam(0, ConvertYMDToDate(_patches_newgame.starting_year, 0, 1)); // CSCEN_START_DATE_TEXT
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	657	SetDParam(1, 1 << _patches_newgame.map_x); // CSCEN_MAPSIZE_X_PULLDOWN
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	658	SetDParam(2, 1 << _patches_newgame.map_y); // CSCEN_MAPSIZE_Y_PULLDOWN
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	659	SetDParam(3, _patches_newgame.se_flat_world_height); // CSCEN_FLAT_LAND_HEIGHT_TEXT
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	660
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	661	DrawWindowWidgets(w);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	662
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	663	break;
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	664
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	665	case WE_CLICK:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	666	switch (e->we.click.widget) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	667	case CSCEN_TEMPERATE:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	668	case CSCEN_ARCTIC:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	669	case CSCEN_TROPICAL:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	670	case CSCEN_TOYLAND:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	671	w->RaiseWidget(_opt_newgame.landscape + CSCEN_TEMPERATE);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	672	SetNewLandscapeType(e->we.click.widget - CSCEN_TEMPERATE);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	673	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	674
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	675	case CSCEN_MAPSIZE_X_PULLDOWN: // Mapsize X
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	676	ShowDropDownList(w, BuildMapsizeDropDown(), _patches_newgame.map_x, CSCEN_MAPSIZE_X_PULLDOWN);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	677	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	678
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	679	case CSCEN_MAPSIZE_Y_PULLDOWN: // Mapsize Y
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	680	ShowDropDownList(w, BuildMapsizeDropDown(), _patches_newgame.map_y, CSCEN_MAPSIZE_Y_PULLDOWN);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	681	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	682
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	683	case CSCEN_EMPTY_WORLD: // Empty world / flat world
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	684	StartGeneratingLandscape(GLWP_SCENARIO);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	685	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	686
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	687	case CSCEN_RANDOM_WORLD: // Generate
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	688	ShowGenerateLandscape();
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	689	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	690
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	691	case CSCEN_START_DATE_DOWN:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	692	case CSCEN_START_DATE_UP: // Year buttons
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	693	/* Don't allow too fast scrolling */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	694	if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	695	w->HandleButtonClick(e->we.click.widget);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	696	SetWindowDirty(w);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	697
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	698	_patches_newgame.starting_year = Clamp(_patches_newgame.starting_year + e->we.click.widget - CSCEN_START_DATE_TEXT, MIN_YEAR, MAX_YEAR);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	699	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	700	_left_button_clicked = false;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	701	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	702
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	703	case CSCEN_START_DATE_TEXT: // Year text
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	704	WP(w, generate_d).widget_id = CSCEN_START_DATE_TEXT;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	705	SetDParam(0, _patches_newgame.starting_year);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	706	ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_START_DATE_QUERY_CAPT, 8, 100, w, CS_NUMERAL);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	707	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	708
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	709	case CSCEN_FLAT_LAND_HEIGHT_DOWN:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	710	case CSCEN_FLAT_LAND_HEIGHT_UP: // Height level buttons
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	711	/* Don't allow too fast scrolling */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	712	if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	713	w->HandleButtonClick(e->we.click.widget);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	714	SetWindowDirty(w);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	715
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	716	_patches_newgame.se_flat_world_height = Clamp(_patches_newgame.se_flat_world_height + e->we.click.widget - CSCEN_FLAT_LAND_HEIGHT_TEXT, 0, MAX_TILE_HEIGHT);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	717	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	718	_left_button_clicked = false;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	719	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	720
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	721	case CSCEN_FLAT_LAND_HEIGHT_TEXT: // Height level text
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	722	WP(w, generate_d).widget_id = CSCEN_FLAT_LAND_HEIGHT_TEXT;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	723	SetDParam(0, _patches_newgame.se_flat_world_height);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	724	ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_FLAT_WORLD_HEIGHT_QUERY_CAPT, 3, 100, w, CS_NUMERAL);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	725	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	726	}
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	727	break;
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	728
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	729	case WE_DROPDOWN_SELECT:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	730	switch (e->we.dropdown.button) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	731	case CSCEN_MAPSIZE_X_PULLDOWN: _patches_newgame.map_x = e->we.dropdown.index; break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	732	case CSCEN_MAPSIZE_Y_PULLDOWN: _patches_newgame.map_y = e->we.dropdown.index; break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	733	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	734	SetWindowDirty(w);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	735	break;
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	736
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	737	case WE_ON_EDIT_TEXT:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	738	if (e->we.edittext.str != NULL) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	739	int32 value = atoi(e->we.edittext.str);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	740
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	741	switch (WP(w, generate_d).widget_id) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	742	case CSCEN_START_DATE_TEXT:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	743	w->InvalidateWidget(CSCEN_START_DATE_TEXT);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	744	_patches_newgame.starting_year = Clamp(value, MIN_YEAR, MAX_YEAR);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	745	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	746
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	747	case CSCEN_FLAT_LAND_HEIGHT_TEXT:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	748	w->InvalidateWidget(CSCEN_FLAT_LAND_HEIGHT_TEXT);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	749	_patches_newgame.se_flat_world_height = Clamp(value, 0, MAX_TILE_HEIGHT);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	750	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	751	}
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	752
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	753	SetWindowDirty(w);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	754	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	755	break;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	756	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	757	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	758
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	759	static const Widget _create_scenario_widgets[] = {
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	760	{ WWT_CLOSEBOX, RESIZE_NONE, 13, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	761	{ WWT_CAPTION, RESIZE_NONE, 13, 11, 337, 0, 13, STR_SE_CAPTION, STR_NULL},
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	762	{ WWT_PANEL, RESIZE_NONE, 13, 0, 337, 14, 169, 0x0, STR_NULL},
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	763
4938 074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	764	{ WWT_IMGBTN_2, RESIZE_NONE, 12, 10, 86, 24, 78, SPR_SELECT_TEMPERATE, STR_030E_SELECT_TEMPERATE_LANDSCAPE},
074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	765	{ WWT_IMGBTN_2, RESIZE_NONE, 12, 90, 166, 24, 78, SPR_SELECT_SUB_ARCTIC, STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE},
074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	766	{ WWT_IMGBTN_2, RESIZE_NONE, 12, 170, 246, 24, 78, SPR_SELECT_SUB_TROPICAL, STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE},
074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	767	{ WWT_IMGBTN_2, RESIZE_NONE, 12, 250, 326, 24, 78, SPR_SELECT_TOYLAND, STR_0311_SELECT_TOYLAND_LANDSCAPE},
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	768
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	769	{ WWT_TEXTBTN, RESIZE_NONE, 6, 12, 115, 95, 124, STR_SE_FLAT_WORLD, STR_SE_FLAT_WORLD_TIP}, // Empty (sea-level) map
d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	770	{ WWT_TEXTBTN, RESIZE_NONE, 6, 12, 115, 131, 160, STR_SE_RANDOM_LAND, STR_022A_GENERATE_RANDOM_LAND}, // Generate
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	771
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	772	{ WWT_TEXT, RESIZE_NONE, 12, 182, 212, 96, 106, STR_MAPSIZE, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	773	{ WWT_DROPDOWN, RESIZE_NONE, 12, 216, 263, 95, 106, STR_NUM_1, STR_NULL}, // Mapsize X
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	774	{ WWT_TEXT, RESIZE_NONE, 12, 268, 276, 96, 106, STR_BY, STR_NULL},
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	775	{ WWT_DROPDOWN, RESIZE_NONE, 12, 279, 326, 95, 106, STR_NUM_2, STR_NULL}, // Mapsize Y
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	776
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	777	{ WWT_TEXT, RESIZE_NONE, 0, 182, 212, 114, 124, STR_DATE, STR_NULL},
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	778	{ WWT_IMGBTN, RESIZE_NONE, 12, 216, 227, 113, 124, SPR_ARROW_DOWN, STR_029E_MOVE_THE_STARTING_DATE},
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	779	{ WWT_TEXTBTN, RESIZE_NONE, 12, 228, 314, 113, 124, STR_GENERATE_DATE, STR_NULL},
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	780	{ WWT_IMGBTN, RESIZE_NONE, 12, 315, 326, 113, 124, SPR_ARROW_UP, STR_029F_MOVE_THE_STARTING_DATE},
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	781
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	782	{ WWT_TEXT, RESIZE_NONE, 0, 182, 278, 132, 142, STR_FLAT_WORLD_HEIGHT, STR_NULL},
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	783	{ WWT_IMGBTN, RESIZE_NONE, 12, 282, 293, 131, 142, SPR_ARROW_DOWN, STR_FLAT_WORLD_HEIGHT_DOWN},
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	784	{ WWT_TEXTBTN, RESIZE_NONE, 12, 294, 314, 131, 142, STR_NUM_3, STR_NULL},
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	785	{ WWT_IMGBTN, RESIZE_NONE, 12, 315, 326, 131, 142, SPR_ARROW_UP, STR_FLAT_WORLD_HEIGHT_UP},
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	786	{ WIDGETS_END},
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	787	};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	788
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	789	static const WindowDesc _create_scenario_desc = {
9694 e72987579514 (svn r10775) [NoAI] -Sync: with trunk r10535:r10774. rubidium parents: 9631 diff changeset	790	WDP_CENTER, WDP_CENTER, 338, 170, 338, 170,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 6143 diff changeset	791	WC_GENERATE_LANDSCAPE, WC_NONE,
6145 d34703513ed0 (svn r8512) -Codechange: From the intro window enter the scenario editor. From the scenario editor dialog, remove the 'load heightmap' option and put that with the other options like 'load scenario', 'save scenario', etc. Play a little bit with positioning of elements inside the scenario editor dialog so it looks better. Darkvater parents: 6144 diff changeset	792	WDF_STD_TOOLTIPS \| WDF_DEF_WIDGET \| WDF_STD_BTN \| WDF_UNCLICK_BUTTONS,
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	793	_create_scenario_widgets,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	794	CreateScenarioWndProc,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	795	};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	796
6573 7624f942237f (svn r9050) -Codechange: Foo(void) -> Foo() rubidium parents: 6505 diff changeset	797	void ShowCreateScenario()
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	798	{
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	799	DeleteWindowByClass(WC_GENERATE_LANDSCAPE);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	800	AllocateWindowDescFront(&_create_scenario_desc, GLWP_SCENARIO);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	801	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	802
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	803
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	804	static const Widget _show_terrain_progress_widgets[] = {
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	805	{ WWT_CAPTION, RESIZE_NONE, 14, 0, 180, 0, 13, STR_GENERATION_WORLD, STR_018C_WINDOW_TITLE_DRAG_THIS},
4938 074f734a91ca (svn r6925) -Codechange: Be more strict with widget distinctions. WWT_PANEL is only plain panel, Darkvater parents: 4937 diff changeset	806	{ WWT_PANEL, RESIZE_NONE, 14, 0, 180, 14, 96, 0x0, STR_NULL},
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	807	{ WWT_TEXTBTN, RESIZE_NONE, 15, 20, 161, 74, 85, STR_GENERATION_ABORT, STR_NULL}, // Abort button
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	808	{ WIDGETS_END},
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	809	};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	810
6574 e1d1a12faaf7 (svn r9051) -Codechange: typedef [enum\|struct] Y {} X; -> [enum\|struct] X {}; rubidium parents: 6573 diff changeset	811	struct tp_info {
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	812	uint percent;
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	813	StringID cls;
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	814	uint current;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	815	uint total;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	816	int timer;
6574 e1d1a12faaf7 (svn r9051) -Codechange: typedef [enum\|struct] Y {} X; -> [enum\|struct] X {}; rubidium parents: 6573 diff changeset	817	};
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	818
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	819	static tp_info _tp;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	820
5669 ea25407ffa55 (svn r7621) -Codechange: Rework ShowQuery into a general modal popup window. It gets passed Darkvater parents: 5568 diff changeset	821	static void AbortGeneratingWorldCallback(Window *w, bool confirmed)
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	822	{
5669 ea25407ffa55 (svn r7621) -Codechange: Rework ShowQuery into a general modal popup window. It gets passed Darkvater parents: 5568 diff changeset	823	if (confirmed) {
ea25407ffa55 (svn r7621) -Codechange: Rework ShowQuery into a general modal popup window. It gets passed Darkvater parents: 5568 diff changeset	824	AbortGeneratingWorld();
ea25407ffa55 (svn r7621) -Codechange: Rework ShowQuery into a general modal popup window. It gets passed Darkvater parents: 5568 diff changeset	825	} else if (IsGeneratingWorld() && !IsGeneratingWorldAborted()) {
5919 2b58160d667d (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 parents: 5838 diff changeset	826	SetMouseCursor(SPR_CURSOR_ZZZ, PAL_NONE);
5669 ea25407ffa55 (svn r7621) -Codechange: Rework ShowQuery into a general modal popup window. It gets passed Darkvater parents: 5568 diff changeset	827	}
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	828	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	829
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	830	static void ShowTerrainProgressProc(Window* w, WindowEvent* e)
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	831	{
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	832	switch (e->event) {
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	833	case WE_CLICK:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	834	switch (e->we.click.widget) {
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	835	case 2:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	836	if (_cursor.sprite == SPR_CURSOR_ZZZ) SetMouseCursor(SPR_CURSOR_MOUSE, PAL_NONE);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	837	ShowQuery(
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	838	STR_GENERATION_ABORT_CAPTION,
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	839	STR_GENERATION_ABORT_MESSAGE,
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	840	w,
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	841	AbortGeneratingWorldCallback
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	842	);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	843	break;
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	844	}
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	845	break;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	846
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	847	case WE_PAINT:
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	848	DrawWindowWidgets(w);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	849
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	850	/* Draw the % complete with a bar and a text */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	851	DrawFrameRect(19, 20, (w->width - 18), 37, 14, FR_BORDERONLY);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	852	DrawFrameRect(20, 21, (int)((w->width - 40) * _tp.percent / 100) + 20, 36, 10, FR_NONE);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	853	SetDParam(0, _tp.percent);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	854	DrawStringCentered(90, 25, STR_PROGRESS, TC_FROMSTRING);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	855
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	856	/* Tell which class we are generating */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	857	DrawStringCentered(90, 46, _tp.cls, TC_FROMSTRING);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	858
9724 b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	859	/* And say where we are in that class */
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	860	SetDParam(0, _tp.current);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	861	SetDParam(1, _tp.total);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	862	DrawStringCentered(90, 58, STR_GENERATION_PROGRESS, TC_FROMSTRING);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	863
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	864	SetWindowDirty(w);
b39bc69bb2f2 (svn r12051) [NoAI] -Sync: with trunk (r11795:12050). rubidium parents: 9723 diff changeset	865	break;
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	866	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	867	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	868
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	869	static const WindowDesc _show_terrain_progress_desc = {
9694 e72987579514 (svn r10775) [NoAI] -Sync: with trunk r10535:r10774. rubidium parents: 9631 diff changeset	870	WDP_CENTER, WDP_CENTER, 181, 97, 181, 97,
6144 5a0ffbf27ced (svn r8511) -Codechange: make WindowClass an enumerated value. rubidium parents: 6143 diff changeset	871	WC_GENERATE_PROGRESS_WINDOW, WC_NONE,
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	872	WDF_DEF_WIDGET \| WDF_UNCLICK_BUTTONS,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	873	_show_terrain_progress_widgets,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	874	ShowTerrainProgressProc
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	875	};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	876
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	877	/**
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	878	* Initializes the progress counters to the starting point.
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	879	*/
6573 7624f942237f (svn r9050) -Codechange: Foo(void) -> Foo() rubidium parents: 6505 diff changeset	880	void PrepareGenerateWorldProgress()
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	881	{
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	882	_tp.cls = STR_WORLD_GENERATION;
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	883	_tp.current = 0;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	884	_tp.total = 0;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	885	_tp.percent = 0;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	886	_tp.timer = 0; // Forces to paint the progress window immediatelly
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	887	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	888
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	889	/**
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	890	* Show the window where a user can follow the process of the map generation.
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	891	*/
6573 7624f942237f (svn r9050) -Codechange: Foo(void) -> Foo() rubidium parents: 6505 diff changeset	892	void ShowGenerateWorldProgress()
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	893	{
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	894	AllocateWindowDescFront(&_show_terrain_progress_desc, 0);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	895	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	896
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	897	static void _SetGeneratingWorldProgress(gwp_class cls, uint progress, uint total)
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	898	{
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	899	static const int percent_table[GWP_CLASS_COUNT + 1] = {0, 5, 15, 20, 40, 60, 65, 80, 85, 99, 100 };
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	900	static const StringID class_table[GWP_CLASS_COUNT] = {
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	901	STR_WORLD_GENERATION,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	902	STR_022E_LANDSCAPE_GENERATION,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	903	STR_CLEARING_TILES,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	904	STR_022F_TOWN_GENERATION,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	905	STR_0230_INDUSTRY_GENERATION,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	906	STR_UNMOVABLE_GENERATION,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	907	STR_TREE_GENERATION,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	908	STR_SETTINGUP_GAME,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	909	STR_PREPARING_TILELOOP,
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	910	STR_PREPARING_GAME
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	911	};
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	912
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	913	assert(cls < GWP_CLASS_COUNT);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	914
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	915	/* Do not run this function if we aren't in a thread */
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	916	if (!IsGenerateWorldThreaded() && !_network_dedicated) return;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	917
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	918	if (IsGeneratingWorldAborted()) HandleGeneratingWorldAbortion();
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	919
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	920	if (total == 0) {
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	921	assert(_tp.cls == class_table[cls]);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	922	_tp.current += progress;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	923	} else {
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	924	_tp.cls = class_table[cls];
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	925	_tp.current = progress;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	926	_tp.total = total;
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	927	_tp.percent = percent_table[cls];
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	928	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	929
9629 66dde6412125 (svn r10350) [NoAI] -Sync with trunk r10194:10349 glx parents: 9620 diff changeset	930	/* Don't update the screen too often. So update it once in every 200ms */
66dde6412125 (svn r10350) [NoAI] -Sync with trunk r10194:10349 glx parents: 9620 diff changeset	931	if (!_network_dedicated && _tp.timer != 0 && _realtime_tick - _tp.timer < 200) return;
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	932
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	933	/* Percentage is about the number of completed tasks, so 'current - 1' */
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	934	_tp.percent = percent_table[cls] + (percent_table[cls + 1] - percent_table[cls]) * (_tp.current == 0 ? 0 : _tp.current - 1) / _tp.total;
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	935
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	936	if (_network_dedicated) {
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	937	static uint last_percent = 0;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	938
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	939	/* Never display 0% */
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	940	if (_tp.percent == 0) return;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	941	/* Reset if percent is lower then the last recorded */
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	942	if (_tp.percent < last_percent) last_percent = 0;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	943	/* Display every 5%, but 6% is also very valid.. just not smaller steps then 5% */
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	944	if (_tp.percent % 5 != 0 && _tp.percent <= last_percent + 5) return;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	945	/* Never show steps smaller then 2%, even if it is a mod 5% */
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	946	if (_tp.percent <= last_percent + 2) return;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	947
5568 75f13d7bfaed (svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to Darkvater parents: 5228 diff changeset	948	DEBUG(net, 1, "Map generation percentage complete: %d", _tp.percent);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	949	last_percent = _tp.percent;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	950
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	951	/* Don't continue as dedicated never has a thread running */
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	952	return;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	953	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	954
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	955	InvalidateWindow(WC_GENERATE_PROGRESS_WINDOW, 0);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	956	MarkWholeScreenDirty();
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	957	SetGeneratingWorldPaintStatus(true);
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	958
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	959	/* We wait here till the paint is done, so we don't read and write
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	960	* on the same tile at the same moment. Nasty hack, but that happens
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	961	* if you implement threading afterwards */
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	962	while (IsGeneratingWorldReadyForPaint()) { CSleep(10); }
9631 8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	963
8a2d1c2ceb88 (svn r10461) [NoAI] -Sync with trunk r10349:r10460. rubidium parents: 9629 diff changeset	964	_tp.timer = _realtime_tick;
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	965	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	966
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	967	/**
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	968	* Set the total of a stage of the world generation.
9601 b499fdd106d5 (svn r9713) [NoAI] -Sync with trunk (r9631:9712). rubidium parents: 9517 diff changeset	969	* @param cls the current class we are in.
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	970	* @param total Set the total expected items for this class.
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	971	*
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	972	* Warning: this function isn't clever. Don't go from class 4 to 3. Go upwards, always.
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	973	* Also, progress works if total is zero, total works if progress is zero.
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	974	*/
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	975	void SetGeneratingWorldProgress(gwp_class cls, uint total)
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	976	{
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	977	if (total == 0) return;
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	978
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	979	_SetGeneratingWorldProgress(cls, 0, total);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	980	}
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	981
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	982	/**
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	983	* Increases the current stage of the world generation with one.
9601 b499fdd106d5 (svn r9713) [NoAI] -Sync with trunk (r9631:9712). rubidium parents: 9517 diff changeset	984	* @param cls the current class we are in.
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	985	*
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	986	* Warning: this function isn't clever. Don't go from class 4 to 3. Go upwards, always.
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	987	* Also, progress works if total is zero, total works if progress is zero.
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	988	*/
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	989	void IncreaseGeneratingWorldProgress(gwp_class cls)
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	990	{
687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	991	/* In fact the param 'class' isn't needed.. but for some security reasons, we want it around */
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5835 diff changeset	992	_SetGeneratingWorldProgress(cls, 1, 0);
4300 687a17c9c557 (svn r5946) -Add: merged the TGP branch to mainline. TGP adds: truelight parents: diff changeset	993	}

author	rubidium
	Sun, 03 Feb 2008 20:17:54 +0000
branch	noai
changeset 9724	b39bc69bb2f2
parent 9723	eee46cb39750
child 9826	9707ad4c9b60
permissions	-rw-r--r--