mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r27639) -Codechange: Also always set the abstract FileToSaveLoad::filetype when setting a mode.

release/1.7
alberth 2016-09-04 12:47:39 +00:00
parent 2fa0fdb176
commit c6ac071619
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fileio_type.h
View File

@ -20,6 +20,8 @@ enum AbstractFileType {
FT_SAVEGAME, ///< old or new savegame FT_SAVEGAME, ///< old or new savegame
FT_SCENARIO, ///< old or new scenario FT_SCENARIO, ///< old or new scenario
FT_HEIGHTMAP, ///< heightmap file FT_HEIGHTMAP, ///< heightmap file
FT_INVALID = 7, ///< Invalid or unknown file type.
}; };
/** Elements of a file system that are recognized. */ /** Elements of a file system that are recognized. */

27
src/saveload/saveload.cpp
View File

@ -2893,7 +2893,7 @@ void GenerateDefaultSaveName(char *buf, const char *last)
} }
/** /**
* Set the mode of the file to save or load based on the type of file entry at the file system. * Set the mode and file type of the file to save or load based on the type of file entry at the file system.
* @param ft Type of file entry of the file system. * @param ft Type of file entry of the file system.
*/ */
void FileToSaveLoad::SetMode(FiosType ft) void FileToSaveLoad::SetMode(FiosType ft)
@ -2923,6 +2923,31 @@ void FileToSaveLoad::SetMode(FiosType ft)
this->mode = SL_INVALID; this->mode = SL_INVALID;
break; break;
} }
switch (ft) {
case FIOS_TYPE_OLDFILE:
case FIOS_TYPE_FILE:
this->filetype = FT_SAVEGAME;
break;
case FIOS_TYPE_OLD_SCENARIO:
case FIOS_TYPE_SCENARIO:
this->filetype = FT_SCENARIO;
break;
#ifdef WITH_PNG
case FIOS_TYPE_PNG:
/* FALL THROUGH */
#endif /* WITH_PNG */
case FIOS_TYPE_BMP:
this->filetype = FT_HEIGHTMAP;
break;
default:
this->filetype = FT_INVALID;
break;
}
} }
#if 0 #if 0