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

woops forgot some stuff :P :/ 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5467 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
luisr142004 2010-05-23 02:59:36 +00:00
parent 1648b84f08
commit 1883b32f33
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Plugins/Plugin_VideoDX9/Src/D3DBase.h
View File

@ -21,7 +21,7 @@
#include <vector> #include <vector>
#include <set> #include <set>
#include <d3d9.h> #include <d3dx9.h>
#include "Common.h" #include "Common.h"
@ -51,7 +51,7 @@ void Close();
void Shutdown(); void Shutdown();
// Direct access to the device. // Direct access to the device.
extern IDirect3DDevice9 *dev; extern LPDIRECT3DDEVICE9 dev;
extern bool bFrameInProgress; extern bool bFrameInProgress;
void Reset(); void Reset();
@ -115,7 +115,7 @@ struct AALevel
ms_setting = m; ms_setting = m;
qual_setting = q; qual_setting = q;
} }
char name[32]; char name[32];
D3DMULTISAMPLE_TYPE ms_setting; D3DMULTISAMPLE_TYPE ms_setting;
int qual_setting; int qual_setting;
}; };
@ -140,4 +140,4 @@ int GetNumAdapters();
} // namespace } // namespace
#endif #endif

4
Source/Plugins/Plugin_VideoDX9/Src/DlgSettings.cpp
View File

@ -46,7 +46,7 @@ struct TabDirect3D : public W32Util::Tab
for (int i = 0; i < D3D::GetNumAdapters(); i++) for (int i = 0; i < D3D::GetNumAdapters(); i++)
{ {
const D3D::Adapter &adapter = D3D::GetAdapter(i); const D3D::Adapter &adapter = D3D::GetAdapter(i);
stprintf_s( tempstr, _T("%hs"), adapter.ident.Description ); swprintf_s( tempstr, _T("%hs"), adapter.ident.Description );
ComboBox_AddString(GetDlgItem(hDlg, IDC_ADAPTER), tempstr); ComboBox_AddString(GetDlgItem(hDlg, IDC_ADAPTER), tempstr);
} }
@ -55,7 +55,7 @@ struct TabDirect3D : public W32Util::Tab
for (int i = 0; i < (int)adapter.aa_levels.size(); i++) for (int i = 0; i < (int)adapter.aa_levels.size(); i++)
{ {
stprintf_s( tempstr, _T("%hs"), adapter.aa_levels[i].name ); swprintf_s( tempstr, _T("%hs"), adapter.aa_levels[i].name );
ComboBox_AddString(GetDlgItem(hDlg, IDC_ANTIALIASMODE), tempstr); ComboBox_AddString(GetDlgItem(hDlg, IDC_ANTIALIASMODE), tempstr);
} }