Disabled broken savegame and profile storage checks for the PC

This commit is contained in:
Robert Beckebans 2012-12-19 23:56:20 +01:00
parent a95f5811b6
commit 6b918aef86
5 changed files with 30 additions and 14 deletions

View file

@ -1,10 +1,9 @@
____________________________ _____________________________________ ____ ____ ____ _____ ____ ______ ______
\______ \______ \______ \ ____ ____ _____ \_____ \______ \_ _____/ _____/ / __ \ / __ ) / __ \ ____ ____ ____ ___ |__ / / __ ) / ____// ____/
| _/| | _/| | \ / _ \ / _ \ / \ _(__ <| | _/| __)/ \ ___ / /_/ // __ |/ / / // __ \ / __ \ / __ `__ \ /_ < / __ |/ /_ / / __
| | \| | \| ` ( <_> | <_> ) Y Y \/ \ | \| \ \ \_\ \ / _, _// /_/ // /_/ // /_/ // /_/ // / / / / /___/ // /_/ // __/ / /_/ /
|____|_ /|______ /_______ /\____/ \____/|__|_| /______ /______ /\___ / \______ / /_/ |_|/_____//_____/ \____/ \____//_/ /_/ /_//____//_____//_/ \____/
\/ \/ \/ \/ \/ \/ \/
_________________________________________ _________________________________________
@ -150,14 +149,14 @@ _________________________
On Debian or Ubuntu: On Debian or Ubuntu:
> apt-get install libsdl1.2-dev cmake > apt-get install cmake libsdl1.2-dev
On Fedora On Fedora
> yum install SDL-devel cmake > yum install cmake SDL-devel
3. Generate the Makefiles using Premake: 3. Generate the Makefiles using CMake:
> cd neo/ > cd neo/
> ./cmake-eclipse-linux-profile.sh > ./cmake-eclipse-linux-profile.sh
@ -191,7 +190,9 @@ ___________________________________________________
__________________________________________ __________________________________________
* Sound engine does not work on Linux * Sound engine does not work on Linux
* Doomclassic is not supported on Linux (yet)
* There are some issues with the binary format loaders/writers on 64 bit platforms * There are some issues with the binary format loaders/writers on 64 bit platforms
* The intel open source drivers to not support OpenGL 3.2 yet
___________________________________________________ ___________________________________________________

View file

@ -634,7 +634,10 @@ idCommonLocal::CheckStartupStorageRequirements
*/ */
void idCommonLocal::CheckStartupStorageRequirements() void idCommonLocal::CheckStartupStorageRequirements()
{ {
// RB: disabled savegame and profile storage checks, because it fails sometimes without any clear reason
#if 0
int64 availableSpace = 0; int64 availableSpace = 0;
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
// Savegame and Profile required storage // Savegame and Profile required storage
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -711,7 +714,8 @@ void idCommonLocal::CheckStartupStorageRequirements()
common->Dialog().AddDynamicDialog( GDM_INSUFFICENT_STORAGE_SPACE, callbacks, optionText, true, msg ); common->Dialog().AddDynamicDialog( GDM_INSUFFICENT_STORAGE_SPACE, callbacks, optionText, true, msg );
} }
#endif
// RB end
session->GetAchievementSystem().Start(); session->GetAchievementSystem().Start();
} }

View file

@ -89,18 +89,22 @@ void idLocalUser::ResetStorageDevice()
idLocalUser::StorageSizeAvailable idLocalUser::StorageSizeAvailable
======================== ========================
*/ */
// RB: disabled savegame and profile storage checks, because it fails sometimes without any clear reason
/*
bool idLocalUser::StorageSizeAvailable( uint64 minSizeInBytes, int64& neededBytes ) bool idLocalUser::StorageSizeAvailable( uint64 minSizeInBytes, int64& neededBytes )
{ {
int64 size = Sys_GetDriveFreeSpaceInBytes( fs_savepath.GetString() ); int64 size = Sys_GetDriveFreeSpaceInBytes( fs_savepath.GetString() );
neededBytes = minSizeInBytes - size; neededBytes = minSizeInBytes - size;
if( neededBytes < 0 ) if( neededBytes < 0 )
{ {
neededBytes = 0; neededBytes = 0;
} }
return neededBytes == 0; return neededBytes == 0;
} }
*/
// RB end
/* /*
======================== ========================

View file

@ -125,7 +125,10 @@ public:
// Storage related // Storage related
virtual bool IsStorageDeviceAvailable() const; // Only false if the player has chosen to play without a storage device, only possible on 360, if available, everything needs to check for available space virtual bool IsStorageDeviceAvailable() const; // Only false if the player has chosen to play without a storage device, only possible on 360, if available, everything needs to check for available space
virtual void ResetStorageDevice(); virtual void ResetStorageDevice();
virtual bool StorageSizeAvailable( uint64 minSizeInBytes, int64& neededBytes );
// RB: disabled savegame and profile storage checks, because it fails sometimes without any clear reason
//virtual bool StorageSizeAvailable( uint64 minSizeInBytes, int64& neededBytes );
// RB end
// These set stats within the profile as a enum/value pair // These set stats within the profile as a enum/value pair
virtual void SetStatInt( int stat, int value ); virtual void SetStatInt( int stat, int value );

View file

@ -132,6 +132,8 @@ int idSaveGameThread::Save()
} }
} }
// RB: disabled savegame and profile storage checks, because it fails sometimes without any clear reason
/*
// Inform user about size required if necessary // Inform user about size required if necessary
if( requiredSizeBytes > 0 && !callback->cancelled ) if( requiredSizeBytes > 0 && !callback->cancelled )
{ {
@ -143,7 +145,7 @@ int idSaveGameThread::Save()
directory += "\\"; // so it doesn't think the last part is a file and ignores in the directory creation directory += "\\"; // so it doesn't think the last part is a file and ignores in the directory creation
fileSystem->CreateOSPath( directory ); // we can't actually check FileExists in production builds, so just try to create it fileSystem->CreateOSPath( directory ); // we can't actually check FileExists in production builds, so just try to create it
user->StorageSizeAvailable( requiredSizeBytes, callback->requiredSpaceInBytes ); user->StorageSizeAvailable( requiredSizeBytes, callback->requiredSpaceInBytes );
if( callback->requiredSpaceInBytes > 0 ) if( callback->requiredSpaceInBytes > 0 )
{ {
callback->errorCode = SAVEGAME_E_INSUFFICIENT_ROOM; callback->errorCode = SAVEGAME_E_INSUFFICIENT_ROOM;
@ -152,6 +154,8 @@ int idSaveGameThread::Save()
} }
} }
} }
*/
// RB end
// Delete all previous files if needed // Delete all previous files if needed
// ALL THE FILES RIGHT NOW---- could use pattern later... // ALL THE FILES RIGHT NOW---- could use pattern later...