diff -r 1ac8aac92385 -r e79cd19772dd src/misc_gui.cpp --- a/src/misc_gui.cpp Wed Jun 13 12:05:56 2007 +0000 +++ b/src/misc_gui.cpp Tue Jun 19 07:21:01 2007 +0000 @@ -35,7 +35,9 @@ #include "date.h" #include "cargotype.h" #include "player_face.h" +#include "fileio.h" +#include "fileio.h" #include "fios.h" /* Variables to display file lists */ FiosItem *_fios_list; @@ -120,7 +122,7 @@ GetString(_landinfo_data[1], STR_01A7_OWNER, lastof(_landinfo_data[1])); str = STR_01A4_COST_TO_CLEAR_N_A; - if (!CmdFailed(costclear)) { + if (CmdSucceeded(costclear)) { SetDParam(0, costclear); str = STR_01A5_COST_TO_CLEAR; } @@ -1396,6 +1398,7 @@ SetDParam(1, p->name_2); SetDParam(2, _date); GetString(_edit_str_buf, STR_4004, lastof(_edit_str_buf)); + SanitizeFilename(_edit_str_buf); } extern void StartupEngines(); @@ -1405,28 +1408,27 @@ static FiosItem o_dir; switch (e->event) { - case WE_CREATE: { // Set up OPENTTD button + case WE_CREATE: // Set up OPENTTD button o_dir.type = FIOS_TYPE_DIRECT; switch (_saveload_mode) { case SLD_SAVE_GAME: case SLD_LOAD_GAME: - ttd_strlcpy(&o_dir.name[0], _paths.save_dir, sizeof(o_dir.name)); + FioGetDirectory(o_dir.name, lengthof(o_dir.name), SAVE_DIR); break; case SLD_SAVE_SCENARIO: case SLD_LOAD_SCENARIO: - ttd_strlcpy(&o_dir.name[0], _paths.scenario_dir, sizeof(o_dir.name)); + FioGetDirectory(o_dir.name, lengthof(o_dir.name), SCENARIO_DIR); break; case SLD_LOAD_HEIGHTMAP: - ttd_strlcpy(&o_dir.name[0], _paths.heightmap_dir, sizeof(o_dir.name)); + FioGetDirectory(o_dir.name, lengthof(o_dir.name), HEIGHTMAP_DIR); break; default: - ttd_strlcpy(&o_dir.name[0], _paths.personal_dir, sizeof(o_dir.name)); + ttd_strlcpy(o_dir.name, _personal_dir, lengthof(o_dir.name)); } break; - } case WE_PAINT: { int pos;