ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
sl1nk3.s 2009-04-08 16:38:41 +00:00
parent 7dccebfef2
commit 5c56066519
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinWX/Src/ISOFile.cpp
View File

@ -172,6 +172,11 @@ std::string GameListItem::CreateCacheFilename()
{ {
std::string Filename; std::string Filename;
SplitPath(m_FileName, NULL, &Filename, NULL); 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"); Filename.append(".cache");
std::string fullname(FULL_CACHE_DIR); std::string fullname(FULL_CACHE_DIR);

2
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -925,7 +925,7 @@ void CISOProperties::ActionReplayButtonClicked(wxCommandEvent& event)
break; break;
case ID_ADDCHEAT: case ID_ADDCHEAT:
{ {
CARCodeAddEdit dlg(-1, this, 1, _("Add AR Code")); CARCodeAddEdit dlg(-1, this, 1, _("Add ActionReplay Code"));
if (dlg.ShowModal() == wxID_OK) if (dlg.ShowModal() == wxID_OK)
{ {
Cheats->Append(wxString::FromAscii(arCodes.back().name.c_str())); Cheats->Append(wxString::FromAscii(arCodes.back().name.c_str()));

2
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -283,7 +283,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
dwStyle = WS_OVERLAPPEDWINDOW; dwStyle = WS_OVERLAPPEDWINDOW;
} }
RECT rc = {0, 0, s_backbuffer_width, s_backbuffer_height}; RECT rc = {0, 0, s_backbuffer_width, s_backbuffer_height};
AdjustWindowRectEx(&rc, dwStyle, FALSE, dwExStyle); AdjustWindowRectEx(&rc, dwStyle, FALSE, dwExStyle);
int X = (rcdesktop.right-rcdesktop.left)/2 - (rc.right-rc.left)/2; int X = (rcdesktop.right-rcdesktop.left)/2 - (rc.right-rc.left)/2;

5
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
View File

@ -205,9 +205,8 @@ void ConfigDialog::CreateGUIControls()
// Tool tips // Tool tips
m_Fullscreen->SetToolTip(wxT( m_Fullscreen->SetToolTip(wxT(
"This option use a separate rendering window and can only be used when" "This will create a Fullscreen window using the chosen Fullscreen resolution."
" 'Render to main window' is unchecked. The only way to exit this mode\n" "\nPress Esc key to switch between Fullscreen and Windowed mode."
" is with Alt + F4 (that also close Dolphin)."
)); ));
m_NativeResolution->SetToolTip(wxT( m_NativeResolution->SetToolTip(wxT(
"This will use the game's native resolution and stretch it to fill the" "This will use the game's native resolution and stretch it to fill the"

8
Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp
View File

@ -165,16 +165,16 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
{ {
// Get out of fullscreen // Get out of fullscreen
g_Config.bFullscreen = false; g_Config.bFullscreen = false;
RECT rc = {0, 0, w_fs, h_fs};
if (strlen(g_Config.iWindowedRes) > 1) if (strlen(g_Config.iWindowedRes) > 1)
sscanf(g_Config.iWindowedRes, "%dx%d", &w_fs, &h_fs); 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 // FullScreen -> Desktop
ChangeDisplaySettings(NULL, 0); ChangeDisplaySettings(NULL, 0);
RECT rcdesktop; // Get desktop resolution
GetWindowRect(GetDesktopWindow(), &rcdesktop);
// Re-Enable the cursor // Re-Enable the cursor
ShowCursor(TRUE); ShowCursor(TRUE);