mirror of
https://github.com/rlabrecque/SteamworksSDK.git
synced 2026-10-10 09:33:04 +08:00
v1.38a
This commit is contained in:
@@ -80,10 +80,6 @@ void CRemoteStorageSyncMenu::ShowConflict()
|
||||
// Description
|
||||
AddMenuItem( CRemoteStorageSyncMenu::MenuItem_t( "There is a conflict between the local & server versions of your files:", k_EMenuCommandNone ) );
|
||||
|
||||
// options
|
||||
AddMenuItem( CRemoteStorageSyncMenu::MenuItem_t( "- Keep the local client versions", k_EMenuCommandKeepClient ) );
|
||||
AddMenuItem( CRemoteStorageSyncMenu::MenuItem_t( "- Keep the remote server versions", k_EMenuCommandKeepServer ) );
|
||||
|
||||
PopSelectedItem();
|
||||
}
|
||||
|
||||
@@ -96,8 +92,7 @@ CRemoteStorageSync::CRemoteStorageSync( IGameEngine *pGameEngine ) :
|
||||
m_menu( pGameEngine ),
|
||||
m_callbackAppSyncClientComplete( this, &CRemoteStorageSync::OnAppSyncClientComplete ),
|
||||
m_callbackAppSyncServerComplete( this, &CRemoteStorageSync::OnAppSyncServerComplete ),
|
||||
m_callbackAppSyncProgress( this, &CRemoteStorageSync::OnAppSyncProgress ),
|
||||
m_callbackConflictResolution( this, &CRemoteStorageSync::OnConflictResolution )
|
||||
m_callbackAppSyncProgress( this, &CRemoteStorageSync::OnAppSyncProgress )
|
||||
{
|
||||
}
|
||||
|
||||
@@ -217,20 +212,6 @@ void CRemoteStorageSync::OnAppSyncServerComplete( RemoteStorageAppSyncedServer_t
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: Called by Steam when a conflict resolution has completed
|
||||
//-----------------------------------------------------------------------------
|
||||
void CRemoteStorageSync::OnConflictResolution( RemoteStorageConflictResolution_t *pParam )
|
||||
{
|
||||
// make sure the update is for us
|
||||
if ( pParam->m_nAppID != SteamUtils()->GetAppID() )
|
||||
return;
|
||||
|
||||
// check for errors
|
||||
m_menu.ShowSyncComplete( m_eSyncOperation, pParam->m_eResult == k_EResultOK );
|
||||
}
|
||||
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: A sync menu item has been selected
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -241,16 +222,6 @@ void CRemoteStorageSync::OnMenuSelection( ERemoteStorageSyncMenuCommand selectio
|
||||
case k_EMenuCommandSyncComplete:
|
||||
m_eSyncOperation = k_ESyncOperationIdle;
|
||||
break;
|
||||
|
||||
case k_EMenuCommandKeepClient:
|
||||
m_menu.ShowSyncProgress( m_eSyncOperation, 0.0 );
|
||||
//SteamRemoteStorage()->ResolveSyncConflict( k_EResolveConflictKeepClient );
|
||||
break;
|
||||
|
||||
case k_EMenuCommandKeepServer:
|
||||
m_menu.ShowSyncProgress( m_eSyncOperation, 0.0 );
|
||||
//SteamRemoteStorage()->ResolveSyncConflict( k_EResolveConflictKeepServer );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user