Fix for issue 831, add .gcz to the cache file of compressed iso and corrected fullscreen tool tip message
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2929 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
7dccebfef2
commit
5c56066519
|
@ -172,6 +172,11 @@ std::string GameListItem::CreateCacheFilename()
|
|||
{
|
||||
std::string Filename;
|
||||
SplitPath(m_FileName, NULL, &Filename, NULL);
|
||||
|
||||
// We add gcz to the cache file if the file is compressed to avoid it reading
|
||||
// the uncompressed file's cache if it has the same name, but not the same ext.
|
||||
if (DiscIO::IsCompressedBlob(m_FileName.c_str()))
|
||||
Filename.append(".gcz");
|
||||
Filename.append(".cache");
|
||||
|
||||
std::string fullname(FULL_CACHE_DIR);
|
||||
|
|
|
@ -925,7 +925,7 @@ void CISOProperties::ActionReplayButtonClicked(wxCommandEvent& event)
|
|||
break;
|
||||
case ID_ADDCHEAT:
|
||||
{
|
||||
CARCodeAddEdit dlg(-1, this, 1, _("Add AR Code"));
|
||||
CARCodeAddEdit dlg(-1, this, 1, _("Add ActionReplay Code"));
|
||||
if (dlg.ShowModal() == wxID_OK)
|
||||
{
|
||||
Cheats->Append(wxString::FromAscii(arCodes.back().name.c_str()));
|
||||
|
|
|
@ -205,9 +205,8 @@ void ConfigDialog::CreateGUIControls()
|
|||
|
||||
// Tool tips
|
||||
m_Fullscreen->SetToolTip(wxT(
|
||||
"This option use a separate rendering window and can only be used when"
|
||||
" 'Render to main window' is unchecked. The only way to exit this mode\n"
|
||||
" is with Alt + F4 (that also close Dolphin)."
|
||||
"This will create a Fullscreen window using the chosen Fullscreen resolution."
|
||||
"\nPress Esc key to switch between Fullscreen and Windowed mode."
|
||||
));
|
||||
m_NativeResolution->SetToolTip(wxT(
|
||||
"This will use the game's native resolution and stretch it to fill the"
|
||||
|
|
|
@ -165,16 +165,16 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
|
|||
{
|
||||
// Get out of fullscreen
|
||||
g_Config.bFullscreen = false;
|
||||
RECT rc = {0, 0, w_fs, h_fs};
|
||||
|
||||
if (strlen(g_Config.iWindowedRes) > 1)
|
||||
sscanf(g_Config.iWindowedRes, "%dx%d", &w_fs, &h_fs);
|
||||
RECT rcdesktop;
|
||||
RECT rc = {0, 0, w_fs, h_fs};
|
||||
GetWindowRect(GetDesktopWindow(), &rcdesktop);
|
||||
|
||||
// FullScreen -> Desktop
|
||||
ChangeDisplaySettings(NULL, 0);
|
||||
|
||||
RECT rcdesktop; // Get desktop resolution
|
||||
GetWindowRect(GetDesktopWindow(), &rcdesktop);
|
||||
|
||||
// Re-Enable the cursor
|
||||
ShowCursor(TRUE);
|
||||
|
||||
|
|
Loading…
Reference in New Issue