mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Zips: Don't print redundant message if file not found

Browse source 
Let's say you have a zip named LEVELNAME.zip, but the only .vvvvvv file
it contains is NOTLEVELNAME.vvvvvv. This zip would end up printing both
the 'LEVELNAME.vvvvvv is missing' and 'It has .vvvvvv file(s) other than
LEVELNAME.vvvvvv' messages, even though we already know there's
something wrong with the zip, and the 'other level files' message is
redundant, since in this case the problem here is simply just the
.vvvvvv file being named the wrong way.

The 'other level files' message is only intended to be printed when
LEVELNAME.vvvvvv *does* exist, but there's additional .vvvvvv files in
the zip on top of that, so don't print this message if LEVELNAME.vvvvvv
exists.
This commit is contained in:
Misa 2021-08-06 23:30:20 -07:00 committed by Ethan Lee
parent 8f70cb8667
commit 4a07e98015
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
desktop_version/src/FileSystemUtils.cpp
View file

@ -365,6 +365,7 @@ static bool checkZipStructure(const char* filename)
char check_path[MAX_PATH]; char check_path[MAX_PATH];
char random_str[6 + 1]; char random_str[6 + 1];
bool success; bool success;
bool file_exists;
struct ArchiveState zip_state; struct ArchiveState zip_state;
if (real_dir == NULL) if (real_dir == NULL)
@ -408,7 +409,8 @@ static bool checkZipStructure(const char* filename)
base_name_suffixed base_name_suffixed
); );
success = PHYSFS_exists(check_path); file_exists = PHYSFS_exists(check_path);
success = file_exists;
SDL_zero(zip_state); SDL_zero(zip_state);
zip_state.filename = base_name_suffixed; zip_state.filename = base_name_suffixed;
@ -429,7 +431,8 @@ static bool checkZipStructure(const char* filename)
success &= !zip_state.other_level_files; success &= !zip_state.other_level_files;
/* ...But if other .vvvvvv file(s), do print warning. */ /* ...But if other .vvvvvv file(s), do print warning. */
if (zip_state.other_level_files) /* This message is redundant if the correct file already DOESN'T exist. */
if (file_exists && zip_state.other_level_files)
{ {
/* FIXME: How do we print this for non-terminal users? */ /* FIXME: How do we print this for non-terminal users? */
printf( printf(