forked from cafeberry/cafeberry
fix: non High Def resolutions not showing splitscreen hint & fix missing string
This commit is contained in:
@@ -6257,7 +6257,6 @@ void CMinecraftApp::InitialiseTips()
|
||||
ZeroMemory(m_TipIDA,sizeof(UINT)*MAX_TIPS_GAMETIP+MAX_TIPS_TRIVIATIP);
|
||||
|
||||
// Make the first tip tell you that you can play splitscreen in HD modes if you are in SD
|
||||
//str1k3r - this doesnt work on Windows64, can someone help me with this? please.
|
||||
if(!RenderManager.IsHiDef())
|
||||
{
|
||||
m_GameTipA[0].uiStringID=IDS_TIPS_GAMETIP_0;
|
||||
@@ -6322,27 +6321,31 @@ void CMinecraftApp::InitialiseTips()
|
||||
UINT CMinecraftApp::GetNextTip()
|
||||
{
|
||||
static bool bShowSkinDLCTip=true;
|
||||
// don't display the DLC tip in the trial game
|
||||
if(ProfileManager.IsFullVersion() && app.GetNewDLCAvailable() && app.DisplayNewDLCTip())
|
||||
//str1k3r - if uiStringID is IDS_TIPS_GAMETIP_0 then dont do this, fixes a bug with IDS_TIPS_GAMETIP_0 not showing on Windows64 if not high def
|
||||
if(m_GameTipA[0].uiStringID != IDS_TIPS_GAMETIP_0)
|
||||
{
|
||||
return IDS_TIPS_GAMETIP_NEWDLC;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(bShowSkinDLCTip && ProfileManager.IsFullVersion())
|
||||
// don't display the DLC tip in the trial game
|
||||
if(ProfileManager.IsFullVersion() && app.GetNewDLCAvailable() && app.DisplayNewDLCTip())
|
||||
{
|
||||
bShowSkinDLCTip=false;
|
||||
if( app.DLCInstallProcessCompleted() )
|
||||
return IDS_TIPS_GAMETIP_NEWDLC;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(bShowSkinDLCTip && ProfileManager.IsFullVersion())
|
||||
{
|
||||
if(app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin)==0)
|
||||
bShowSkinDLCTip=false;
|
||||
if( app.DLCInstallProcessCompleted() )
|
||||
{
|
||||
if(app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin)==0)
|
||||
{
|
||||
return IDS_TIPS_GAMETIP_SKINPACKS;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return IDS_TIPS_GAMETIP_SKINPACKS;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return IDS_TIPS_GAMETIP_SKINPACKS;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Binary file not shown.
@@ -1,6 +1,6 @@
|
||||
<root>
|
||||
<data name="IDS_TIPS_GAMETIP_0">
|
||||
<value>NOT USED</value>
|
||||
<value>If you play this game in High Definition mode, you can have up to four players in split-screen on the same system!</value>
|
||||
</data>
|
||||
|
||||
<data name="IDS_TIPS_GAMETIP_1">
|
||||
|
||||
@@ -540,10 +540,10 @@ HRESULT InitDevice()
|
||||
hr = D3D11CreateDeviceAndSwapChain( NULL, g_driverType, NULL, createDeviceFlags, featureLevels, numFeatureLevels,
|
||||
D3D11_SDK_VERSION, &sd, &g_pSwapChain, &g_pd3dDevice, &g_featureLevel, &g_pImmediateContext );
|
||||
|
||||
if (hr == E_INVALIDARG && numFeatureLevels > 1 && featureLevels[0] == D3D_FEATURE_LEVEL_11_1)
|
||||
{
|
||||
hr = D3D11CreateDeviceAndSwapChain( NULL, g_driverType, NULL, createDeviceFlags, &featureLevels[1], numFeatureLevels - 1,
|
||||
D3D11_SDK_VERSION, &sd, &g_pSwapChain, &g_pd3dDevice, &g_featureLevel, &g_pImmediateContext );
|
||||
if (hr == E_INVALIDARG && numFeatureLevels > 1 && featureLevels[0] == D3D_FEATURE_LEVEL_11_1)
|
||||
{
|
||||
hr = D3D11CreateDeviceAndSwapChain( NULL, g_driverType, NULL, createDeviceFlags, &featureLevels[1], numFeatureLevels - 1,
|
||||
D3D11_SDK_VERSION, &sd, &g_pSwapChain, &g_pd3dDevice, &g_featureLevel, &g_pImmediateContext );
|
||||
}
|
||||
|
||||
if( SUCCEEDED( hr ) )
|
||||
@@ -599,7 +599,7 @@ HRESULT InitDevice()
|
||||
vp.TopLeftY = 0;
|
||||
g_pImmediateContext->RSSetViewports( 1, &vp );
|
||||
|
||||
RenderManager.Initialise(g_pd3dDevice, g_pSwapChain);
|
||||
//RenderManager.Initialise(g_pd3dDevice, g_pSwapChain); //str1k3r - this was getting ran twice, keeping this commented out just incase
|
||||
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user