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

Various minor fixes. Corrected a few misspellings, fixed a console message or two, and got Linux to compile again. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2222 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-11-19 05:55:54 +00:00
parent 4ba3fd07dc
commit 0aae87e8fd
7 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/include/Utilities/pxCheckBox.h
View File

@ -63,7 +63,7 @@ static void operator+=( wxSizer& target, pxCheckBox* src )
}
template<>
static void operator+=( wxSizer& target, const pxWindowAndFlags<pxCheckBox>& src )
void operator+=( wxSizer& target, const pxWindowAndFlags<pxCheckBox>& src )
{
target.Add( src.window, src.flags );
}

4
common/include/Utilities/pxStaticText.h
View File

@ -48,7 +48,7 @@
// Note that if another control in the window has extends that blow the window size larger
// than the "ideal" width, then the pxStaticText will remain consistent in it's size. It
// will not attempt to grow to fit the expanded area. That might be fixable behavior, but
// it was hard enough for m to get this much working. ;)
// it was hard enough for me to get this much working. ;)
//
class pxStaticText : public wxStaticText
{
@ -91,7 +91,7 @@ static void operator+=( wxSizer& target, pxStaticText* src )
}
template<>
static void operator+=( wxSizer& target, const pxWindowAndFlags<pxStaticText>& src )
void operator+=( wxSizer& target, const pxWindowAndFlags<pxStaticText>& src )
{
target.Add( src.window, src.flags );
}

4
pcsx2/Elfheader.cpp
View File

@ -635,14 +635,14 @@ int GetPS2ElfName( wxString& name )
if( parts.lvalue == L"BOOT2" )
{
Console.WriteLn( Color_StrongBlue, L"(GetElfName) Detected PS2 Disc = " + name );
name = parts.rvalue;
Console.WriteLn( Color_StrongBlue, L"(GetElfName) Detected PS2 Disc = " + name );
retype = 2;
}
else if( parts.lvalue == L"BOOT" )
{
Console.WriteLn( Color_StrongBlue, L"(GetElfName) Detected PSX/PSone Disc = " + name );
name = parts.rvalue;
Console.WriteLn( Color_StrongBlue, L"(GetElfName) Detected PSX/PSone Disc = " + name );
retype = 1;
}
else if( parts.lvalue == L"VMODE" )

2
pcsx2/IopDma.cpp
View File

@ -59,7 +59,7 @@ static void __fastcall psxDmaGeneric(u32 madr, u32 bcr, u32 chcr, u32 spuCore, _
g_psxNextBranchCycle = psxNextsCounter + psxNextCounter;
}
}
switch (chcr)
{
case 0x01000201: //cpu to spu2 transfer

2
pcsx2/Vif0Dma.cpp
View File

@ -86,7 +86,7 @@ static __forceinline void vif0UNPACK(u32 *data)
}
vif0.cl = 0;
vif0.tag.cmd = vif0.cmd;
vif0.tag.cmd = vif0.cmd;
vif0Regs->offset = 0;
}

3
pcsx2/VifDma.cpp
View File

@ -549,8 +549,7 @@ template<const u32 VIFdmanum> void VIFunpack(u32 *data, vifCode *v, u32 size)
if (tempsize > memlimit)
{
if (((vifRegs->cycle.cl != vifRegs->cycle.wl) &&
((memlimit + (vifRegs->cycle.cl - vifRegs->cycle.wl) * 16) == tempsize) ||
(tempsize == memlimit)))
((memlimit + (vifRegs->cycle.cl - vifRegs->cycle.wl) * 16) == tempsize)))
{
//It's a red herring, so ignore it! SSE unpacks will be much quicker.
tempsize = 0;

4
pcsx2/gui/Panels/SpeedhacksPanel.cpp
View File

@ -44,7 +44,7 @@ const wxChar* Panels::SpeedHacksPanel::GetEEcycleSliderMsg( int val )
case 3:
return pxE( ".Panels:Speedhacks:EECycleX3",
L"3 - Reduces the EE's cyclerate by about 50%. Moderate speedup, but *will* cause studdering "
L"3 - Reduces the EE's cyclerate by about 50%. Moderate speedup, but *will* cause stuttering "
L"audio on many FMVs."
);
@ -201,7 +201,7 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) :
m_check_intc->SetToolTip( pxE( ".Tooltips:Speedhacks:INTC",
L"This hack works best for games that use the INTC Status register to wait for vsyncs, which includes primarily non-3D "
L"RPG titles. Games that do not use this method of vsync will see little or no speeup from this hack."
L"RPG titles. Games that do not use this method of vsync will see little or no speedup from this hack."
) );
m_check_b1fc0->SetToolTip( pxE( ".Tooltips:Speedhacks:BIFC0",