(svn r19984) -Feature: Show some savegame details when selecting items in saveload GUIs.

src/fios.h

@@ -48,6 +48,24 @@ struct LoadCheckData {
 		this->Clear();
 	}
 
+	/**
+	 * Check whether loading the game resulted in errors.
+	 * @return true if errors were encountered.
+	 */
+	bool HasErrors()
+	{
+		return this->checkable && this->error != INVALID_STRING_ID;
+	}
+
+	/**
+	 * Check whether the game uses any NewGrfs.
+	 * @return true if NewGrfs are used.
+	 */
+	bool HasNewGrfs()
+	{
+		return this->checkable && this->error == INVALID_STRING_ID && this->grfconfig != NULL;
+	}
+
 	void Clear();
 };
 

src/fios_gui.cpp

@@ -24,6 +24,8 @@
 #include "tilehighlight_func.h"
 #include "querystring_gui.h"
 #include "engine_func.h"
+#include "landscape_type.h"
+#include "date_func.h"
 
 #include "table/sprites.h"
 #include "table/strings.h"
@@ -73,6 +75,9 @@ enum SaveLoadWindowWidgets {
 	SLWW_DELETE_SELECTION,     ///< same in here
 	SLWW_SAVE_GAME,            ///< not to mention in here too
 	SLWW_CONTENT_DOWNLOAD_SEL, ///< Selection 'stack' to 'hide' the content download
+	SLWW_DETAILS,              ///< Panel with game details
+	SLWW_NEWGRF_INFO,          ///< Button to open NewGgrf configuration
+	SLWW_LOAD_BUTTON,          ///< Button to load game/scenario
 };
 
 /** Load game/scenario with optional content download */
@@ -82,6 +87,7 @@ static const NWidgetPart _nested_load_dialog_widgets[] = {
 		NWidget(WWT_CAPTION, COLOUR_GREY, SLWW_WINDOWTITLE),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, SLWW_BACKGROUND), SetFill(1, 0), SetResize(1, 0), EndContainer(),
+	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
 		NWidget(NWID_VERTICAL),
 			NWidget(NWID_HORIZONTAL),
 				NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
@@ -92,18 +98,24 @@ static const NWidgetPart _nested_load_dialog_widgets[] = {
 			EndContainer(),
 			NWidget(WWT_PANEL, COLOUR_GREY, SLWW_FILE_BACKGROUND),
 				NWidget(NWID_HORIZONTAL),
-				NWidget(NWID_VERTICAL),
 					NWidget(WWT_INSET, COLOUR_GREY, SLWW_DRIVES_DIRECTORIES_LIST), SetFill(1, 1), SetPadding(2, 1, 2, 2),
 							SetDataTip(0x0, STR_SAVELOAD_LIST_TOOLTIP), SetResize(1, 10), EndContainer(),
+					NWidget(WWT_SCROLLBAR, COLOUR_GREY, SLWW_SCROLLBAR),
+				EndContainer(),
 				NWidget(NWID_SELECTION, INVALID_COLOUR, SLWW_CONTENT_DOWNLOAD_SEL),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_CONTENT_DOWNLOAD), SetResize(1, 0),
 							SetDataTip(STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT),
 				EndContainer(),
 			EndContainer(),
-				NWidget(NWID_VERTICAL),
-					NWidget(WWT_SCROLLBAR, COLOUR_GREY, SLWW_SCROLLBAR),
-					NWidget(WWT_RESIZEBOX, COLOUR_GREY),
 		EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_GREY),
+			NWidget(WWT_EMPTY, INVALID_COLOUR, SLWW_DETAILS), SetResize(1, 1), SetFill(1, 1),
+			NWidget(NWID_HORIZONTAL),
+				NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_NEWGRF_INFO), SetDataTip(STR_INTRO_NEWGRF_SETTINGS, STR_NULL), SetFill(1, 0), SetResize(1, 0),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_LOAD_BUTTON), SetDataTip(STR_SAVELOAD_LOAD_BUTTON, STR_SAVELOAD_LOAD_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
+				EndContainer(),
+				NWidget(WWT_RESIZEBOX, COLOUR_GREY),
 			EndContainer(),
 		EndContainer(),
 	EndContainer(),
@@ -146,6 +158,7 @@ static const NWidgetPart _nested_save_dialog_widgets[] = {
 		NWidget(WWT_CAPTION, COLOUR_GREY, SLWW_WINDOWTITLE),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, SLWW_BACKGROUND), SetFill(1, 0), SetResize(1, 0), EndContainer(),
+	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
 		NWidget(NWID_VERTICAL),
 			NWidget(NWID_HORIZONTAL),
 				NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
@@ -166,9 +179,16 @@ static const NWidgetPart _nested_save_dialog_widgets[] = {
 			NWidget(NWID_HORIZONTAL),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_DELETE_SELECTION), SetDataTip(STR_SAVELOAD_DELETE_BUTTON, STR_SAVELOAD_DELETE_TOOLTIP), SetFill(1, 0), SetResize(1, 0),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_SAVE_GAME),        SetDataTip(STR_SAVELOAD_SAVE_BUTTON, STR_SAVELOAD_SAVE_TOOLTIP),     SetFill(1, 0), SetResize(1, 0),
+			EndContainer(),
+		EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_GREY),
+			NWidget(WWT_EMPTY, INVALID_COLOUR, SLWW_DETAILS), SetResize(1, 1), SetFill(1, 1),
+			NWidget(NWID_HORIZONTAL),
+				NWidget(NWID_SPACER), SetResize(1, 0), SetFill(1, 1),
 				NWidget(WWT_RESIZEBOX, COLOUR_GREY),
 			EndContainer(),
 		EndContainer(),
+	EndContainer(),
 };
 
 /* Colours for fios types */
@@ -219,6 +239,7 @@ static void MakeSortedSaveGameList()
 struct SaveLoadWindow : public QueryStringBaseWindow {
 private:
 	FiosItem o_dir;
+	const FiosItem *selected;
 public:
 
 	void GenerateFileName()
@@ -334,11 +355,107 @@ public:
 				for (uint pos = this->vscroll.GetPosition(); pos < _fios_items.Length(); pos++) {
 					const FiosItem *item = _fios_items.Get(pos);
 
+					if (item == this->selected) {
+						GfxFillRect(r.left + 1, y, r.right, y + this->resize.step_height, 156);
+					}
 					DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, item->title, _fios_colours[item->type]);
 					y += this->resize.step_height;
 					if (y >= this->vscroll.GetCapacity() * this->resize.step_height + r.top + WD_FRAMERECT_TOP) break;
 				}
 			} break;
+
+			case SLWW_DETAILS: {
+				GfxFillRect(r.left + WD_FRAMERECT_LEFT, r.top + WD_FRAMERECT_TOP,
+						r.right - WD_FRAMERECT_RIGHT, r.top + FONT_HEIGHT_NORMAL * 2 + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM, 0x0A);
+				DrawString(r.left, r.right, r.top + FONT_HEIGHT_NORMAL / 2 + WD_FRAMERECT_TOP, STR_SAVELOAD_DETAIL_CAPTION, TC_FROMSTRING, SA_CENTER);
+
+				if (this->selected == NULL) break;
+
+				uint y = r.top + FONT_HEIGHT_NORMAL * 2 + WD_PAR_VSEP_NORMAL + WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
+				uint y_max = r.bottom - FONT_HEIGHT_NORMAL - WD_FRAMERECT_BOTTOM;
+
+				if (y > y_max) break;
+				if (!_load_check_data.checkable) {
+					/* Old savegame, no information available */
+					DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_SAVELOAD_DETAIL_NOT_AVAILABLE);
+					y += FONT_HEIGHT_NORMAL;
+				} else if (_load_check_data.error != INVALID_STRING_ID) {
+					/* Incompatible / broken savegame */
+					SetDParamStr(0, _load_check_data.error_data);
+					y = DrawStringMultiLine(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT,
+							y, r.bottom - WD_FRAMERECT_BOTTOM, _load_check_data.error, TC_RED);
+				} else {
+					/* Mapsize */
+					SetDParam(0, _load_check_data.map_size_x);
+					SetDParam(1, _load_check_data.map_size_y);
+					DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_SERVER_LIST_MAP_SIZE);
+					y += FONT_HEIGHT_NORMAL;
+					if (y > y_max) break;
+
+					/* Climate */
+					byte landscape = _load_check_data.settings.game_creation.landscape;
+					if (landscape < NUM_LANDSCAPE) {
+						SetDParam(0, STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE + landscape);
+						DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_SERVER_LIST_LANDSCAPE);
+						y += FONT_HEIGHT_NORMAL;
+					}
+
+					y += WD_PAR_VSEP_NORMAL;
+					if (y > y_max) break;
+
+					/* Start date (if available) */
+					if (_load_check_data.settings.game_creation.starting_year != 0) {
+						SetDParam(0, ConvertYMDToDate(_load_check_data.settings.game_creation.starting_year, 0, 1));
+						DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_SERVER_LIST_START_DATE);
+						y += FONT_HEIGHT_NORMAL;
+					}
+					if (y > y_max) break;
+
+					/* Hide current date for scenarios */
+					if (_saveload_mode != SLD_LOAD_SCENARIO && _saveload_mode != SLD_SAVE_SCENARIO) {
+						/* Current date */
+						SetDParam(0, _load_check_data.current_date);
+						DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_NETWORK_SERVER_LIST_CURRENT_DATE);
+						y += FONT_HEIGHT_NORMAL;
+					}
+
+					/* Hide the NewGRF stuff when saving. We also hide the button. */
+					if (_saveload_mode == SLD_LOAD_GAME || _saveload_mode == SLD_LOAD_SCENARIO) {
+						y += WD_PAR_VSEP_NORMAL;
+						if (y > y_max) break;
+
+						/* NewGrf compatibility */
+						SetDParam(0, _load_check_data.grfconfig == NULL ? STR_NEWGRF_LIST_NONE :
+								STR_NEWGRF_LIST_ALL_FOUND + _load_check_data.grf_compatibility);
+						DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_SAVELOAD_DETAIL_GRFSTATUS);
+						y += FONT_HEIGHT_NORMAL;
+					}
+					if (y > y_max) break;
+
+					/* Hide the company stuff for scenarios */
+					if (_saveload_mode != SLD_LOAD_SCENARIO && _saveload_mode != SLD_SAVE_SCENARIO) {
+						y += FONT_HEIGHT_NORMAL;
+						if (y > y_max) break;
+
+						/* Companies / AIs */
+						CompanyPropertiesMap::const_iterator end = _load_check_data.companies.End();
+						for (CompanyPropertiesMap::const_iterator it = _load_check_data.companies.Begin(); it != end; it++) {
+							SetDParam(0, it->first + 1);
+							const CompanyProperties &c = *it->second;
+							if (c.name != NULL) {
+								SetDParam(1, STR_JUST_RAW_STRING);
+								SetDParamStr(2, c.name);
+							} else {
+								SetDParam(1, c.name_1);
+								SetDParam(2, c.name_2);
+							}
+							DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, y, STR_SAVELOAD_DETAIL_COMPANY_INDEX);
+							y += FONT_HEIGHT_NORMAL;
+							if (y > y_max) break;
+						}
+					}
+				}
+			} break;
 		}
 	}
 
@@ -393,6 +510,26 @@ public:
 				this->InvalidateData();
 				break;
 
+			case SLWW_LOAD_BUTTON:
+				if (this->selected != NULL && !_load_check_data.HasErrors()) {
+					_switch_mode = (_game_mode == GM_EDITOR) ? SM_LOAD_SCENARIO : SM_LOAD;
+
+					const char *name = FiosBrowseTo(this->selected);
+					SetFiosType(this->selected->type);
+
+					strecpy(_file_to_saveload.name, name, lastof(_file_to_saveload.name));
+					strecpy(_file_to_saveload.title, this->selected->title, lastof(_file_to_saveload.title));
+
+					delete this;
+				}
+				break;
+
+			case SLWW_NEWGRF_INFO:
+				if (_load_check_data.HasNewGrfs()) {
+					ShowNewGRFSettings(false, false, false, &_load_check_data.grfconfig);
+				}
+				break;
+
 			case SLWW_DRIVES_DIRECTORIES_LIST: { // Click the listbox
 				int y = (pt.y - this->GetWidget<NWidgetBase>(SLWW_DRIVES_DIRECTORIES_LIST)->pos_y - WD_FRAMERECT_TOP) / this->resize.step_height;
 
@@ -402,14 +539,27 @@ public:
 
 				const char *name = FiosBrowseTo(file);
 				if (name != NULL) {
+					if (click_count == 1) {
+						if (this->selected != file) {
+							this->selected = file;
+							_load_check_data.Clear();
+
+							if (file->type == FIOS_TYPE_FILE || file->type == FIOS_TYPE_SCENARIO) {
+								SaveOrLoad(name, SL_LOAD_CHECK, NO_DIRECTORY, false);
+							}
+
+							this->InvalidateData(1);
+						}
+						if (_saveload_mode == SLD_SAVE_GAME || _saveload_mode == SLD_SAVE_SCENARIO) {
+							/* Copy clicked name to editbox */
+							ttd_strlcpy(this->text.buf, file->title, this->text.maxsize);
+							UpdateTextBufferSize(&this->text);
+							this->SetWidgetDirty(SLWW_SAVE_OSK_TITLE);
+						}
+					} else if (!_load_check_data.HasErrors()) {
+						this->selected = file;
 						if (_saveload_mode == SLD_LOAD_GAME || _saveload_mode == SLD_LOAD_SCENARIO) {
-						_switch_mode = (_game_mode == GM_EDITOR) ? SM_LOAD_SCENARIO : SM_LOAD;
+							this->OnClick(pt, SLWW_LOAD_BUTTON, 1);
-
-						SetFiosType(file->type);
-						strecpy(_file_to_saveload.name, name, lastof(_file_to_saveload.name));
-						strecpy(_file_to_saveload.title, file->title, lastof(_file_to_saveload.title));
-
-						delete this;
 						} else if (_saveload_mode == SLD_LOAD_HEIGHTMAP) {
 							SetFiosType(file->type);
 							strecpy(_file_to_saveload.name, name, lastof(_file_to_saveload.name));
@@ -417,11 +567,7 @@ public:
 
 							delete this;
 							ShowHeightmapLoad();
-					} else {
+						}
-						/* SLD_SAVE_GAME, SLD_SAVE_SCENARIO copy clicked name to editbox */
-						ttd_strlcpy(this->text.buf, file->title, this->text.maxsize);
-						UpdateTextBufferSize(&this->text);
-						this->SetWidgetDirty(SLWW_SAVE_OSK_TITLE);
 					}
 				} else {
 					/* Changed directory, need refresh. */
@@ -504,13 +650,29 @@ public:
 
 	virtual void OnInvalidateData(int data)
 	{
+		switch (data) {
+			case 0:
+				/* Rescan files */
+				this->selected = NULL;
+				_load_check_data.Clear();
 				BuildFileList();
+			/* FALL THROUGH */
+			case 1:
+				/* Selection changes */
+				if (_saveload_mode == SLD_LOAD_GAME || _saveload_mode == SLD_LOAD_SCENARIO) {
+					this->SetWidgetDisabledState(SLWW_LOAD_BUTTON,
+							this->selected == NULL || _load_check_data.HasErrors());
+					this->SetWidgetDisabledState(SLWW_NEWGRF_INFO,
+							!_load_check_data.HasNewGrfs());
+				}
+				break;
+		}
 	}
 };
 
 /** Load game/scenario */
 static const WindowDesc _load_dialog_desc(
-	WDP_CENTER, 257, 294,
+	WDP_CENTER, 500, 294,
 	WC_SAVELOAD, WC_NONE,
 	WDF_UNCLICK_BUTTONS,
 	_nested_load_dialog_widgets, lengthof(_nested_load_dialog_widgets)
@@ -518,7 +680,7 @@ static const WindowDesc _load_dialog_desc(
 
 /** Load heightmap */
 static const WindowDesc _load_heightmap_dialog_desc(
-	WDP_CENTER, 257, 294,
+	WDP_CENTER, 257, 320,
 	WC_SAVELOAD, WC_NONE,
 	WDF_UNCLICK_BUTTONS,
 	_nested_load_heightmap_dialog_widgets, lengthof(_nested_load_heightmap_dialog_widgets)
@@ -526,7 +688,7 @@ static const WindowDesc _load_heightmap_dialog_desc(
 
 /** Save game/scenario */
 static const WindowDesc _save_dialog_desc(
-	WDP_CENTER, 257, 320,
+	WDP_CENTER, 500, 294,
 	WC_SAVELOAD, WC_NONE,
 	WDF_UNCLICK_BUTTONS,
 	_nested_save_dialog_widgets, lengthof(_nested_save_dialog_widgets)

src/lang/english.txt

@@ -2246,6 +2246,12 @@ STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Delete
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Delete the currently selected saved-game
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Save
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Save the current game, using the selected name
+STR_SAVELOAD_LOAD_BUTTON                                        :{BLACK}Load
+STR_SAVELOAD_LOAD_TOOLTIP                                       :{BLACK}Load the selected game
+STR_SAVELOAD_DETAIL_CAPTION                                     :{BLACK}Game Details
+STR_SAVELOAD_DETAIL_NOT_AVAILABLE                               :{BLACK}No information available.
+STR_SAVELOAD_DETAIL_COMPANY_INDEX                               :{SILVER}{COMMA}: {WHITE}{STRING1}
+STR_SAVELOAD_DETAIL_GRFSTATUS                                   :{SILVER}NewGRF: {WHITE}{STRING}
 
 STR_SAVELOAD_OSKTITLE                                           :{BLACK}Enter a name for the savegame
 
@@ -2424,6 +2430,12 @@ STR_NEWGRF_DISABLED_WARNING                                     :{WHITE}Missing
 STR_NEWGRF_UNPAUSE_WARNING_TITLE                                :{YELLOW}Missing GRF file(s)
 STR_NEWGRF_UNPAUSE_WARNING                                      :{WHITE}Unpausing can crash OpenTTD. Do not file bug reports for subsequent crashes.{}Do you really want to unpause?
 
+# NewGRF status
+STR_NEWGRF_LIST_NONE                                            :None
+STR_NEWGRF_LIST_ALL_FOUND                                       :All files present
+STR_NEWGRF_LIST_COMPATIBLE                                      :{YELLOW}Found compatible files
+STR_NEWGRF_LIST_MISSING                                         :{RED}Missing files
+
 # NewGRF 'it's broken' warnings
 STR_NEWGRF_BROKEN                                               :{WHITE}Behaviour of NewGRF '{0:RAW_STRING}' is likely to cause desyncs and/or crashes.
 STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}It changes vehicle length for '{1:ENGINE}' when not inside a depot.