engine: Fix clear save dir from old saves, do mode switch saves (broken in 43738e9)

Author: dimhotepus

engine/host_saverestore.cpp

@@ -503,7 +503,7 @@ char *CSaveRestore::GetSaveDir()
 	if ( szDirectory[0] ) return szDirectory;
 
 	// dimhotepus: Dropped / at the end to unify all places.
-	V_sprintf_safe(szDirectory, "save" PLATFORM_DIR, MOD_DIR);
+	V_strcpy_safe(szDirectory, "save" PLATFORM_DIR);
 
 	return szDirectory;
 }
@@ -530,7 +530,6 @@ void CSaveRestore::AgeSaveFile( const char *pName, const char *ext, int count )
 {
 	char newName[MAX_OSPATH], oldName[MAX_OSPATH];
 
-	// dimhotepus: Use MOD inside GetSaveDir.
 	if ( count == 1 )
 	{
 		V_sprintf_safe( oldName, "%s/%s.%s", GetSaveDir(), pName, ext );	// quick.sav.
@@ -540,9 +539,9 @@ void CSaveRestore::AgeSaveFile( const char *pName, const char *ext, int count )
 		V_sprintf_safe( oldName, "%s/%s%02d.%s", GetSaveDir(), pName, count-1, ext );	// quick04.sav, etc.
 	}
 
-	// dimhotepus: Use MOD inside GetSaveDir.
 	V_sprintf_safe( newName, "%s/%s%02d.%s", GetSaveDir(), pName, count, ext );
-
+	
+	// dimhotepus: Use MOD for fs.
 	// Scroll the name list down (rename quick04.sav to quick05.sav)
 	if ( g_pFileSystem->FileExists( oldName, MOD_DIR ) )
 	{
@@ -1022,8 +1021,6 @@ bool CSaveRestore::LoadGame( const char *pName )
 
 	m_bClearSaveDir = false;
 	DoClearSaveDir();
-
-	bool bLoadedToMemory = false;
 
 	int iElapsedMinutes = 0;
 	int iElapsedSeconds = 0;
@@ -1055,10 +1052,6 @@ bool CSaveRestore::LoadGame( const char *pName )
 		}
 		else
 		{
-			if ( bLoadedToMemory )
-			{
-				g_pSaveRestoreFileSystem->RemoveFile( name );
-			}
 			return NULL;
 		}
 
@@ -1076,11 +1069,6 @@ bool CSaveRestore::LoadGame( const char *pName )
 			Warning( "Map '%s' missing or invalid\n", gameHeader.mapName );
 			validload = false;
 		}
-		
-		if ( bLoadedToMemory )
-		{
-			g_pSaveRestoreFileSystem->RemoveFile( name );
-		}
 	}
 	else
 	{
@@ -2579,7 +2567,7 @@ void CSaveRestore::DirectoryCount( const char *pPath, int *pResult )
 //-----------------------------------------------------------------------------
 void CSaveRestore::DirectoryClear( const char *pPath )
 {
-	g_pSaveRestoreFileSystem->DirectoryClear( pPath, false );
+	g_pSaveRestoreFileSystem->DirectoryClear( pPath );
 }
 
 
@@ -2603,6 +2591,8 @@ void CSaveRestore::DoClearSaveDir()
 	char szName[MAX_OSPATH];
 
 	V_strcpy_safe( szName, GetSaveDir() );
+	// dimhotepus: GetSaveDir after changes missed separator, readd it.
+	V_strcat_safe( szName, CORRECT_PATH_SEPARATOR_S );
 	Q_FixSlashes( szName );
 	// Create save directory if it doesn't exist
 	Sys_mkdir( szName );

engine/matsys_interface.cpp

@@ -139,16 +139,16 @@ static void NukeModeSwitchSaveGames( void )
 
 	V_sprintf_safe( modeswitch, "%s/modeswitchsave.sav", saveDir );
 
-	if (g_pFileSystem->FileExists(modeswitch ))
+	if (g_pFileSystem->FileExists(modeswitch, "MOD" ))
 	{
-		g_pFileSystem->RemoveFile( modeswitch );
+		g_pFileSystem->RemoveFile( modeswitch, "MOD" );
 	}
 
 	V_sprintf_safe( modeswitch, "%s/modeswitchsave.tga", saveDir );
 
-	if (g_pFileSystem->FileExists(modeswitch ))
+	if (g_pFileSystem->FileExists(modeswitch, "MOD" ))
 	{
-		g_pFileSystem->RemoveFile( modeswitch );
+		g_pFileSystem->RemoveFile( modeswitch, "MOD" );
 	}
 }
 

engine/saverestore_filesystem.cpp

@@ -209,7 +209,8 @@ class CSaveRestoreFileSystemPassthrough : public ISaveRestoreFileSystem
 			Q_snprintf( szName, sizeof( szName ), "%s/%s", saverestore->GetSaveDir(), list[i].szFileName );
 			Q_FixSlashes( szName );
 
-			unsigned fileSize = g_pFileSystem->Size( szName );
+			// dimhotepus: Correctly check file size.
+			unsigned fileSize = g_pFileSystem->Size( szName, "MOD" );
 			if ( fileSize )
 			{
 				Assert( sizeof(list[i].szFileName) == MAX_PATH );
@@ -282,22 +283,15 @@ class CSaveRestoreFileSystemPassthrough : public ISaveRestoreFileSystem
 	//-----------------------------------------------------------------------------
 	// Purpose: Clears the save directory of all temporary files (*.hl)
 	//-----------------------------------------------------------------------------
-	void DirectoryClear( const char *pPath, bool bIsXSave )
+	void DirectoryClear( const char *pPath )
 	{
 		char		szPath[ MAX_PATH ];
 
 		const char *findfn = Sys_FindFirstEx( pPath, "DEFAULT_WRITE_PATH", NULL, 0 );
 		RunCodeAtScopeExit(Sys_FindClose());
 		while ( findfn != NULL )
 		{
-			if ( !bIsXSave )
-			{
-				Q_snprintf( szPath, sizeof( szPath ), "%s/%s", saverestore->GetSaveDir(), findfn );
-			}
-			else
-			{
-				Q_snprintf( szPath, sizeof( szPath ), "%s:\\%s", GetCurrentMod(), findfn );
-			}
+			Q_snprintf( szPath, sizeof( szPath ), "%s/%s", saverestore->GetSaveDir(), findfn );
 
 			// Delete the temporary save file
 			g_pFileSystem->RemoveFile( szPath, "MOD" );

engine/saverestore_filesystem.h

@@ -52,7 +52,7 @@ abstract_class ISaveRestoreFileSystem
 	virtual void			DirectoryCopy( const char *pPath, const char *pDestFileName ) = 0;
 	virtual	bool			DirectoryExtract( FileHandle_t pFile, int fileCount ) = 0;
 	virtual int				DirectoryCount( const char *pPath ) = 0;
-	virtual void			DirectoryClear( const char *pPath, bool bIsXSave ) = 0;
+	virtual void			DirectoryClear( const char *pPath ) = 0;
 
 	virtual void			AuditFiles( void ) = 0;
 	virtual bool			LoadFileFromDisk( const char *pFilename ) = 0;