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

Minor additions. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5776 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2.code 2013-12-28 21:24:25 +00:00
parent d6bb242042
commit be185275c9
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcsx2/gui/FrameForGS.cpp
View File

@ -26,6 +26,8 @@
static const KeyAcceleratorCode FULLSCREEN_TOGGLE_ACCELERATOR_GSPANEL=KeyAcceleratorCode( WXK_RETURN ).Alt(); static const KeyAcceleratorCode FULLSCREEN_TOGGLE_ACCELERATOR_GSPANEL=KeyAcceleratorCode( WXK_RETURN ).Alt();
#define GSWindowScaleDebug
void GSPanel::InitDefaultAccelerators() void GSPanel::InitDefaultAccelerators()
{ {
// Note! These don't really work yet due to some hacks to get things working for // Note! These don't really work yet due to some hacks to get things working for
@ -175,6 +177,9 @@ void GSPanel::DoResize()
GetPosition(&cx, &cy); GetPosition(&cx, &cy);
float unit = .01*(float)min(viewport.x, viewport.y); float unit = .01*(float)min(viewport.x, viewport.y);
SetPosition( wxPoint( cx + unit*g_Conf->GSWindow.OffsetX.ToFloat(), cy + unit*g_Conf->GSWindow.OffsetY.ToFloat() ) ); SetPosition( wxPoint( cx + unit*g_Conf->GSWindow.OffsetX.ToFloat(), cy + unit*g_Conf->GSWindow.OffsetY.ToFloat() ) );
#ifdef GSWindowScaleDebug
Console.WriteLn(Color_Yellow, "GSWindowScaleDebug: zoom %f, viewport.x %d, viewport.y %d", zoom, viewport.GetX(), viewport.GetY());
#endif
} }
void GSPanel::OnResize(wxSizeEvent& event) void GSPanel::OnResize(wxSizeEvent& event)

3
plugins/spu2-x/src/spu2sys.cpp
View File

@ -798,7 +798,8 @@ static void __fastcall RegWrite_VoiceParams( u16 value )
{ {
thisvol.Mode = (value & 0xF000)>>12; thisvol.Mode = (value & 0xF000)>>12;
thisvol.Increment = (value & 0x7F); thisvol.Increment = (value & 0x7F);
//printf("slides Mode = %x, Increment = %x\n",thisvol.Mode,thisvol.Increment); // We're not sure slides work 100%
if( IsDevBuild ) ConLog("* SPU2: Voice uses Slides in Mode = %x, Increment = %x\n",thisvol.Mode,thisvol.Increment);
} }
else else
{ {